From 81c60487613f5f3e836e2c3383f6237a709e5dba Mon Sep 17 00:00:00 2001 From: Stefan Hynek <stefan.hynek@uni-goettingen.de> Date: Wed, 16 Feb 2022 15:11:51 +0100 Subject: [PATCH] fix(textgrid_dav_provider): use tgclients for `TextgridAuth` --- src/repdav/textgrid_dav_provider.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/repdav/textgrid_dav_provider.py b/src/repdav/textgrid_dav_provider.py index 844df4f..b13f8a6 100644 --- a/src/repdav/textgrid_dav_provider.py +++ b/src/repdav/textgrid_dav_provider.py @@ -5,6 +5,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 wsgidav.dav_provider import DAVCollection, DAVNonCollection, DAVProvider @@ -12,7 +13,7 @@ from wsgidav.util import join_uri, pop_path from repdav.stream_tools import FileLikeQueue -from .tgapi import TextgridAuth, TextgridSearch +from .tgapi import TextgridSearch _logger = logging.getLogger(__name__) @@ -32,7 +33,9 @@ class TextgridRoot(DAVCollection): def get_member_names(self): _logger.debug("Called TextgridRoot.get_member_names(self).") - projects = tuple(TextgridAuth().assigned_projects(self._sid)) + config = TextgridConfig() + auth = TextgridAuth(config) + projects = tuple(auth.list_assigned_projects(self._sid)) _logger.debug("MY PROJECTS: %s", projects) return projects @@ -152,7 +155,9 @@ class TextgridProject(DAVCollection): class TextgridAggregation(DAVCollection): def __init__(self, path, environ, info): - _logger.debug("Called TextgridAggregation.__init__(self, %s, environ, info).", path) + _logger.debug( + "Called TextgridAggregation.__init__(self, %s, environ, info).", path + ) DAVCollection.__init__(self, path, environ) self._sid = environ["wsgidav.auth.user_name"] self._info = info -- GitLab