alx/procat2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

markup: simplify resource ctors

Browse Source
This commit is contained in:
Seth Ladygo
2020-03-06 14:50:12 -08:00
parent 0076605084
commit b2cf52c882
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
markup/webdav.py
View File

@ -84,8 +84,9 @@ class RootFolderResource(MarkupDavResource):
return None return None
def get_children(self): def get_children(self):
children = [CatalogFolderResource(CatalogFolderResource.PATH, self.user), children = [CatalogFolderResource(user=self.user),
MarkupResource(MarkupResource.PATH, self.user)] MarkupResource(user=self.user),
]
for child in children: for child in children:
yield child yield child
@ -115,8 +116,9 @@ class RootFolderResource(MarkupDavResource):
class CatalogFolderResource(MarkupDavResource): class CatalogFolderResource(MarkupDavResource):
NAME = 'My Catalogs' NAME = 'My Catalogs'
PATH = f'/{NAME}/' PATH = f'/{NAME}/'
MARKUP_SUBMIT_NAME = 'For Markup'
MARKUP_SUBMIT_PATH = f'/{MARKUP_SUBMIT_NAME}/' def __init__(self, path=PATH, user=None):
super().__init__(path=path, user=user)
def get_parent(self): def get_parent(self):
return RootFolderResource(user=self.user) return RootFolderResource(user=self.user)
@ -156,7 +158,7 @@ class CatalogFolderResource(MarkupDavResource):
class CatalogResource(MarkupDavResource): class CatalogResource(MarkupDavResource):
def get_parent(self): def get_parent(self):
return CatalogFolderResource(path=CatalogFolderResource.PATH, user=self.user) return CatalogFolderResource(user=self.user)
def get_children(self): def get_children(self):
return return
@ -238,6 +240,9 @@ class MarkupResource(MarkupDavResource, DummyFSDAVResource):
PATH = f'/{NAME}/' PATH = f'/{NAME}/'
SUBDIR = 'markup' SUBDIR = 'markup'
def __init__(self, path=PATH, user=None):
super().__init__(path=path, user=user)
def get_parent(self): def get_parent(self):
parent_path = self.path[:-1] parent_path = self.path[:-1]
if len(parent_path): if len(parent_path):