gcrkrause
/
mglib
mirror of https://github.com/papermerge/mglib
1
0
Fork 0
Code Issues Releases Wiki Activity

change to support versioning

master
Eugen Ciur 2020-12-11 10:44:53 +01:00
parent 06be42542a
commit 1b86732056
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mglib/path.py
View File

@ -32,12 +32,16 @@ class DocumentPath:
self.version = version self.version = version
self.pages = "pages" self.pages = "pages"
def url(self): def url(self, version=None):
return f"{self.dirname}{self.file_name}" if version:
version = int(version)
@property return f"{self.dirname(version=version)}{self.file_name}"
def path(self):
return self.url() def path(self, version=None):
if version:
version = int(version)
return self.url(version=version)
@property @property
def dirname_docs(self): def dirname_docs(self):
@ -57,21 +61,23 @@ class DocumentPath:
return _path return _path
@property def dirname(self, version=None):
def dirname(self):
if version is None:
version = self.version
full_path = ( full_path = (
f"{self.aux_dir}/user_{self.user_id}/" f"{self.aux_dir}/user_{self.user_id}/"
f"document_{self.document_id}/" f"document_{self.document_id}/"
) )
if self.version > 0: if version > 0:
full_path = f"{full_path}v{self.version}/" full_path = f"{full_path}v{version}/"
return full_path return full_path
@property def pages_dirname(self, version=None):
def pages_dirname(self): return f"{self.dirname(version=version)}{self.pages}/"
return f"{self.dirname}{self.pages}/"
def __repr__(self): def __repr__(self):
message = ( message = (
@ -144,7 +150,7 @@ class PagePath:
@property @property
def ppmroot(self): def ppmroot(self):
# returns schema://.../<doc_id>/pages/<page_num>/<step>/page # returns schema://.../<doc_id>/pages/<page_num>/<step>/page
pages_dirname = self.results_document_ep.pages_dirname pages_dirname = self.results_document_ep.pages_dirname()
result = ( result = (
f"{pages_dirname}page_{self.page_num}/" f"{pages_dirname}page_{self.page_num}/"
f"{self.step.percent}/page" f"{self.step.percent}/page"
@ -153,7 +159,7 @@ class PagePath:
@property @property
def pages_dirname(self): def pages_dirname(self):
return self.document_path.pages_dirname return self.document_path.pages_dirname()
@property @property
def path(self): def path(self):
@ -167,7 +173,7 @@ class PagePath:
return self.txt_url() return self.txt_url()
def txt_url(self): def txt_url(self):
pages_dirname = self.results_document_ep.pages_dirname pages_dirname = self.results_document_ep.pages_dirname()
return f"{pages_dirname}page_{self.page_num}.txt" return f"{pages_dirname}page_{self.page_num}.txt"
@property @property