fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for non-unique galleries
[redakcja.git]
/
apps
/
catalogue
/
helpers.py
diff --git
a/apps/catalogue/helpers.py
b/apps/catalogue/helpers.py
index
7b1f44a
..
d340b46
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
@@
-82,8
+80,10
@@
class GalleryMerger(object):
return self.dest
files = listdir(self.path(self.dest))
return self.dest
files = listdir(self.path(self.dest))
+ files.sort()
self.dest_size = len(files)
files_other = listdir(self.path(self.src))
self.dest_size = len(files)
files_other = listdir(self.path(self.src))
+ files_other.sort()
self.src_size = len(files_other)
if files and files_other:
self.src_size = len(files_other)
if files and files_other:
@@
-137,8
+137,6
@@
class GalleryMerger(object):
renamed_files_other[f] = self.set_prefix(f, 1, True)
# finally, move / rename files.
renamed_files_other[f] = self.set_prefix(f, 1, True)
# finally, move / rename files.
- from nose.tools import set_trace
- # set_trace()
for frm, to in renamed_files.items():
move(join(self.path(self.dest), frm),
join(self.path(self.dest), to))
for frm, to in renamed_files.items():
move(join(self.path(self.dest), frm),
join(self.path(self.dest), to))