Skip to content
Snippets Groups Projects
Commit d49486e8 authored by Stefan Hynek's avatar Stefan Hynek :drooling_face:
Browse files

Merge branch '33-update-textgrid-python-clients-0-5-2' into 'main'

Resolve "update textgrid-python-clients >= 0.5.2"

Closes #33

See merge request !25
parents 1661eb30 c04f4616
No related branches found
No related tags found
1 merge request!25Resolve "update textgrid-python-clients >= 0.5.2"
Pipeline #343822 passed
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
-e ../tgclients/ -e ../tgclients[icu]
bandit==1.7.0 bandit==1.7.0
black==22.1.0 black==22.1.0
commitizen==2.20.0 commitizen==2.20.0
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
https://gitlab.gwdg.de/dariah-de/textgridrep/textgrid-python-clients/-/archive/ce076d15a29aeb13a87cc33d343b6730a2ec22ec/textgrid-python-clients-1d58717eb0175514eba5dec759c07c4be3090f16.tar.gz tgclients[icu]==0.8.0
cheroot==9.0.0 cheroot==9.0.0
sentry-sdk==1.11.1 sentry-sdk==1.11.1
WsgiDAV==4.1.0 WsgiDAV==4.1.0
...@@ -9,10 +9,7 @@ import logging ...@@ -9,10 +9,7 @@ import logging
import threading import threading
from pprint import pformat from pprint import pformat
from tgclients.auth import TextgridAuth from tgclients import TextgridAuth, TextgridConfig, TextgridCrudRequest, TextgridSearch
from tgclients.config import TextgridConfig
from tgclients.crud import TextgridCRUD
from tgclients.search import TextgridSearch
from wsgidav.dav_provider import DAVCollection, DAVNonCollection, DAVProvider from wsgidav.dav_provider import DAVCollection, DAVNonCollection, DAVProvider
from wsgidav.util import join_uri, pop_path from wsgidav.util import join_uri, pop_path
...@@ -95,7 +92,7 @@ class TextgridProject(DAVCollection): ...@@ -95,7 +92,7 @@ class TextgridProject(DAVCollection):
DAVCollection.__init__(self, path, environ) DAVCollection.__init__(self, path, environ)
self._sid = environ["wsgidav.auth.user_name"] self._sid = environ["wsgidav.auth.user_name"]
config = tg_config(environ) config = tg_config(environ)
self._tgsearch = TextgridSearch(config.search) self._tgsearch = TextgridSearch(config, nonpublic=True)
self._project_id = self.path.split("/")[-1] self._project_id = self.path.split("/")[-1]
def create_empty_resource(self, name): def create_empty_resource(self, name):
...@@ -187,7 +184,7 @@ class TextgridAggregation(DAVCollection): ...@@ -187,7 +184,7 @@ class TextgridAggregation(DAVCollection):
self._sid = environ["wsgidav.auth.user_name"] self._sid = environ["wsgidav.auth.user_name"]
self._info = info self._info = info
config = tg_config(environ) config = tg_config(environ)
self._tgsearch = TextgridSearch(config.search) self._tgsearch = TextgridSearch(config, nonpublic=True)
self._tguri = self.path.split("/")[-1] self._tguri = self.path.split("/")[-1]
def create_empty_resource(self, name): def create_empty_resource(self, name):
...@@ -273,7 +270,7 @@ class TextgridResource(DAVNonCollection): ...@@ -273,7 +270,7 @@ class TextgridResource(DAVNonCollection):
self._info = info self._info = info
self.upload_thread = None self.upload_thread = None
config = tg_config(environ) config = tg_config(environ)
self._crud = TextgridCRUD(config.crud) self._crud = TextgridCrudRequest(config, nonpublic=True)
def get_content_length(self): def get_content_length(self):
_logger.debug("Called TextgridResource.get_content_length(self).") _logger.debug("Called TextgridResource.get_content_length(self).")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment