Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 18-implement-textgridlockmanager
  • 5-initial-setup-integration-junit-tests-for-tgapi
  • main
  • 1.0.0
  • 1.0.1
  • 1.0.2
  • 1.1.0
  • 1.1.1
  • 1.1.2
  • 1.1.3
  • 1.2.0
  • 1.2.1
  • 1.2.2
  • 1.2.3
  • 1.2.4
  • 1.2.5
  • 1.3.0
  • 1.3.1
  • 1.4.0
  • 1.4.1
  • 1.4.2
21 results

Target

Select target project
No results found
Select Git revision
  • 18-implement-textgridlockmanager
  • 5-initial-setup-integration-junit-tests-for-tgapi
  • main
  • 1.0.0
  • 1.0.1
  • 1.0.2
  • 1.1.0
  • 1.1.1
  • 1.1.2
  • 1.1.3
  • 1.2.0
  • 1.2.1
  • 1.2.2
  • 1.2.3
  • 1.2.4
  • 1.2.5
  • 1.3.0
  • 1.3.1
  • 1.4.0
  • 1.4.1
  • 1.4.2
21 results
Show changes

Commits on Source 8

5 files
+ 14
− 41
Compare changes
  • Side-by-side
  • Inline

Files

.gitlab-ci.yml

+1 −32
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ build container image: 
    entrypoint: [""]

  script:

    # use tag for version if not empty; else commit sha

    - "[[ -n ${CI_COMMIT_TAG} ]] && export version=${CI_COMMIT_TAG} || export version=${CI_COMMIT_SHORT_SHA}"

    - echo $version

    - "test -n \"$CI_COMMIT_TAG\"  && export version=$CI_COMMIT_TAG || export version=$CI_COMMIT_SHORT_SHA"

    - mkdir -p /kaniko/.docker

    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64 | tr -d '\n')\"},\"$harbor_registry\":{\"auth\":\"$HARBOR_ROBOT_TOKEN64\"}}}" > /kaniko/.docker/config.json

    - /kaniko/executor
@@ -77,36 +76,6 @@ build container image: 
    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_COMMIT_TAG



generate pipfile:

  stage: build

  image: docker.io/python:3.8-alpine

  before_script:

    - pip install pipenv

  script:

    - pipenv lock

  artifacts:

    paths:

      - Pipfile*

  needs: []

  rules:

    - if: $CI_COMMIT_TAG



generate app sbom:

  stage: deploy

  image: docker.io/node:18.12

  before_script:

    - npm ci --ignore-scripts

  script:

    - npx cdxgen

      --type python

      --server-url https://deps.sub.uni-goettingen.de

      --api-key ${DEPS_UPLOAD_TOKEN}

      --project-name ${project_name}

      --project-version ${CI_COMMIT_TAG}

  needs: ["generate pipfile"]

  rules:

    - if: $CI_COMMIT_TAG



generate container sbom:

  stage: deploy

  image: docker.io/alpine:3.16

CHANGELOG.md

+7 −0
Original line number Diff line number Diff line 
## [1.2.2](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/compare/1.2.1...1.2.2) (2023-01-13)





### Bug Fixes



* **TextgridResource:** TextgridCrudRequest is used for low level access without databinding now ([c04f461](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/commit/c04f4616cfcd7e8e7a339ea18f29efaf4068e884))



## [1.2.1](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/compare/1.2.0...1.2.1) (2023-01-10)

requirements.dev.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#

# SPDX-License-Identifier: CC0-1.0



-e ../tgclients/

-e ../tgclients[icu]

bandit==1.7.0

black==22.1.0

commitizen==2.20.0

src/repdav/textgrid_dav_provider.py

+4 −7
Original line number Diff line number Diff line
@@ -9,10 +9,7 @@ import logging 
import threading

from pprint import pformat



from tgclients.auth import TextgridAuth

from tgclients.config import TextgridConfig

from tgclients.crud import TextgridCRUD

from tgclients.search import TextgridSearch

from tgclients import TextgridAuth, TextgridConfig, TextgridCrudRequest, TextgridSearch

from wsgidav.dav_provider import DAVCollection, DAVNonCollection, DAVProvider

from wsgidav.util import join_uri, pop_path
@@ -95,7 +92,7 @@ class TextgridProject(DAVCollection): 
        DAVCollection.__init__(self, path, environ)

        self._sid = environ["wsgidav.auth.user_name"]

        config = tg_config(environ)

        self._tgsearch = TextgridSearch(config.search)

        self._tgsearch = TextgridSearch(config, nonpublic=True)

        self._project_id = self.path.split("/")[-1]



    def create_empty_resource(self, name):
@@ -187,7 +184,7 @@ class TextgridAggregation(DAVCollection): 
        self._sid = environ["wsgidav.auth.user_name"]

        self._info = info

        config = tg_config(environ)

        self._tgsearch = TextgridSearch(config.search)

        self._tgsearch = TextgridSearch(config, nonpublic=True)

        self._tguri = self.path.split("/")[-1]



    def create_empty_resource(self, name):
@@ -273,7 +270,7 @@ class TextgridResource(DAVNonCollection): 
        self._info = info

        self.upload_thread = None

        config = tg_config(environ)

        self._crud = TextgridCRUD(config.crud)

        self._crud = TextgridCrudRequest(config, nonpublic=True)



    def get_content_length(self):

        _logger.debug("Called TextgridResource.get_content_length(self).")