paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated WebDAV filtering. Filters resulting in empty results are not available anymore.

Browse Source
This commit is contained in:
Jonas Winkler 2018-07-05 17:21:13 +02:00
parent a53e30e0a5
commit 22da848be4
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/paperless/dav.py
View File

@ -104,7 +104,12 @@ class PaperlessDavResource(MetaEtagMixIn, BaseDavResource):
def __init__(self, path, **kwargs): def __init__(self, path, **kwargs):
super(PaperlessDavResource, self).__init__(path) super(PaperlessDavResource, self).__init__(path)
self.documents, self.document, self.children = parse_path(path) if 'document' in kwargs:
print("using document from kwargs")
# this greatly reduces the amount of database requests.
self.document = kwargs.pop('document')
else:
self.documents, self.document, self.children = parse_path(path)
@property @property
def getcontentlength(self): def getcontentlength(self):
@ -144,7 +149,7 @@ class PaperlessDavResource(MetaEtagMixIn, BaseDavResource):
yield PaperlessDavResource(url_join(*(self.path + [child]))) yield PaperlessDavResource(url_join(*(self.path + [child])))
for doc in self.documents: for doc in self.documents:
yield PaperlessDavResource(url_join(*(self.path + [doc.title])), document=doc) yield PaperlessDavResource(url_join(*(self.path + [doc.title + "." + doc.file_type])), document=doc)
def write(self, content, temp_file=None): def write(self, content, temp_file=None):
raise NotImplementedError raise NotImplementedError
@ -167,7 +172,7 @@ class PaperlessDavResource(MetaEtagMixIn, BaseDavResource):
def parse_path(path): def parse_path(path):
used_tags = [] used_tags = []
used_correspondents = [] used_correspondent = None
year_selected = False year_selected = False
month_selected = False month_selected = False
day_selected = False day_selected = False
@ -181,7 +186,8 @@ def parse_path(path):
filters.append('month') filters.append('month')
elif not day_selected: elif not day_selected:
filters.append('day') filters.append('day')
filters.append('correspondent') if used_correspondent is None:
filters.append('correspondent')
filters.append('tag') filters.append('tag')
return filters return filters
@ -196,13 +202,6 @@ def parse_path(path):
print("path",path_queue) print("path",path_queue)
while len(path_queue) > 0: while len(path_queue) > 0:
path_segment = path_queue.pop(0) path_segment = path_queue.pop(0)
# 1. check if path_segment exists / is allowed
# 2. determine what path_segment does
# 3. determine
print("segment", path_segment)
print("rule ", current_rule)
print("---")
if current_rule == 'select_filter': if current_rule == 'select_filter':
show_documents = False show_documents = False
@ -217,10 +216,10 @@ def parse_path(path):
children = [str(d.day) for d in filter.dates('created', 'day')] children = [str(d.day) for d in filter.dates('created', 'day')]
elif path_segment == 'correspondent': elif path_segment == 'correspondent':
next_rule = 'select_correspondent' next_rule = 'select_correspondent'
children = [c.name for c in Correspondent.objects.all()] children = [c.name for c in Correspondent.objects.filter(documents__in=filter)]
elif path_segment == 'tag': elif path_segment == 'tag':
next_rule = 'select_tag' next_rule = 'select_tag'
children = [t.name for t in Tag.objects.all()] children = [t.name for t in Tag.objects.filter(documents__in=filter) if t.name not in used_tags]
else: else:
next_rule = 'document' next_rule = 'document'
children = [] children = []
@ -234,7 +233,7 @@ def parse_path(path):
elif current_rule == 'select_correspondent': elif current_rule == 'select_correspondent':
next_rule = 'select_filter' next_rule = 'select_filter'
filter = filter.filter(correspondent__name=path_segment) filter = filter.filter(correspondent__name=path_segment)
used_tags.append(path_segment) used_correspondent = path_segment
children = get_filter_children() children = get_filter_children()
show_documents = True show_documents = True
elif current_rule == 'select_year': elif current_rule == 'select_year':
@ -262,4 +261,5 @@ def parse_path(path):
print("ok") print("ok")
print("children", children) print("children", children)
print("used tags", used_tags)
return filter if show_documents else [], document, children return filter if show_documents else [], document, children