X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/88dbb13a387b1e3a2b45fde672179ed552c269c1..41e4e58d2d389558b91565c16b0c7c0ec7c558fa:/lib/vstorage/__init__.py?ds=sidebyside diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py index 8d22e10c..84d8ee7b 100644 --- a/lib/vstorage/__init__.py +++ b/lib/vstorage/__init__.py @@ -147,10 +147,18 @@ class VersionedStorage(object): self.repo = mercurial.hg.repository(self.ui, self.repo_path) def _file_path(self, title, type='.xml'): - return os.path.join(self.path, urlquote(title, safe='')) + type + """ Return plain version if exists in repo, add extension otherwise. """ + path = os.path.join(self.path, urlquote(title, safe='')) + if type and self._title_to_file(title, '') not in self.repo['tip']: + path += type + return path def _title_to_file(self, title, type=".xml"): - return os.path.join(self.repo_prefix, urlquote(title, safe='')) + type + """ Return plain version if exists in repo, add extension otherwise. """ + path = os.path.join(self.repo_prefix, urlquote(title, safe='')) + if type and path not in self.repo['tip']: + path += type + return path def _file_to_title(self, filename): assert filename.startswith(self.repo_prefix) @@ -354,11 +362,11 @@ class VersionedStorage(object): try: return tree_search(tip, self._title_to_file(title)) - except (IndexError, LookupError) as e: + except (IndexError, LookupError): logging.info("XML file not found, trying plain") try: return tree_search(tip, self._title_to_file(title, type='')) - except (IndexError, LookupError) as e: + except (IndexError, LookupError): raise DocumentNotFound(title) def page_history(self, title):