X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3d61fc117d9e5274189d16be83d4489cd4b36d7f..3e1aff21cb6131f52bc4ef17187af665b31654a8:/apps/wiki/models.py diff --git a/apps/wiki/models.py b/apps/wiki/models.py index 7693da4e..b4adba4a 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -3,18 +3,17 @@ import vstorage from vstorage import DocumentNotFound from wiki import settings - class DocumentStorage(object): def __init__(self, path): self.vstorage = vstorage.VersionedStorage(path) - - def get(self, name, revision=None): + + def get(self, name, revision = None): if revision is None: text = self.vstorage.page_text(name) else: text = self.vstorage.revision_text(name, revision) - return Document(self, name=name, text=text) - + return Document(self, name = name, text = text) + def put(self, document, author, comment, parent): self.vstorage.save_text(document.name, document.text, author, comment, parent) @@ -29,25 +28,25 @@ class DocumentStorage(object): class Document(object): - META_REGEX = re.compile(r'\s*', re.DOTALL | re.MULTILINE) - + META_REGEX = re.compile(r'\s*', re.DOTALL | re.MULTILINE) + def __init__(self, storage, **kwargs): self.storage = storage for attr, value in kwargs.iteritems(): setattr(self, attr, value) - + def revision(self): try: return self.storage._info(self.name)[0] except DocumentNotFound: - return -1 + return - 1 def plain_text(self): return re.sub(self.META_REGEX, '', self.text, 1) - + def meta(self): result = {} - + m = re.match(self.META_REGEX, self.text) if m: for line in m.group(1).split('\n'): @@ -56,9 +55,8 @@ class Document(object): result[k.strip()] = v.strip() except ValueError: continue - - return result + return result +# Every time somebody says "let's have a global variable", God kills a kitten. storage = DocumentStorage(settings.REPOSITORY_PATH) -