fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes
[redakcja.git]
/
apps
/
catalogue
/
helpers.py
diff --git
a/apps/catalogue/helpers.py
b/apps/catalogue/helpers.py
index
0009c6d
..
7e4ce52
100644
(file)
--- a/
apps/catalogue/helpers.py
+++ b/
apps/catalogue/helpers.py
@@
-46,8
+46,6
@@
def parse_isodate(isodate):
class GalleryMerger(object):
def __init__(self, dest_gallery, src_gallery):
class GalleryMerger(object):
def __init__(self, dest_gallery, src_gallery):
- assert isinstance(dest_gallery, str)
- assert isinstance(src_gallery, str)
self.dest = dest_gallery
self.src = src_gallery
self.dest_size = None
self.dest = dest_gallery
self.src = src_gallery
self.dest_size = None
@@
-89,7
+87,6
@@
class GalleryMerger(object):
self.src_size = len(files_other)
if files and files_other:
self.src_size = len(files_other)
if files and files_other:
- print "compare %s with %s" % (files[-1], files_other[0])
if filecmp.cmp(
join(self.path(self.dest), files[-1]),
join(self.path(self.src), files_other[0]),
if filecmp.cmp(
join(self.path(self.dest), files[-1]),
join(self.path(self.src), files_other[0]),
@@
-148,3
+145,13
@@
class GalleryMerger(object):
rmtree(join(self.path(self.src)))
return self.dest
rmtree(join(self.path(self.src)))
return self.dest
+
+
+# Maybe subclass?
+def sstdocument(text):
+ #from catalogue.ebook_utils import RedakcjaDocProvider
+ from librarian.document import Document
+
+ return Document.from_string(
+ text,
+ )