degal: comparison degal.py

equal deleted inserted replaced

-:d46ab092d2b2
+:156cdfffef8e
 THUMB_GEOM = (160, 120)
 PREVIEW_GEOM = (640, 480)
 DEFAULT_TITLE = 'Image gallery'
+# how many image/page
+IMAGE_COUNT = 50
 def isImage (fname) :
 """
 Is the given filename likely to be an image file?
 """
 def getObjInfo (self) :
 """
 Metadata for shorturls2.db
 """
-return 'dir', self.path, ''
+return 'dir', self.path, 'index'
 def linkTag (self) :
 """
 A text-link to this dir
 """
 """
 c = len(self.path.split('/')) - 1
 return os.path.join(*((['..']*c) + list(fnames)))
+def _page_fname (self, page) :
+assert page >= 0
+if page > 0 :
+return  'index_%d.html' % page
+else :
+return 'index.html'
 def render (self) :
 """
 Render the index.html, Images, and recurse into subdirs
 """
 directories = "<ul>\n\t<li>%s</li>\n</ul>" % "</li>\n\t<li>".join(subdir_linkTags)
 else :
 directories = ''
 render.info("Rendering %s", self.path)
-# render to index.html
+# paginate!
-gallery_tpl.renderTo(self.pathFor('index.html'),
+images = self.sorted_images
-STYLE_URL=self.inRoot('style.css'),
+image_count = len(images)
-BREADCRUMB=" &raquo; ".join([link(u, t) for (u, t) in self.breadcrumb()]),
+pages = []
-TITLE=self.title,
-DIRECTORIES=directories,
+while images :
-CONTENT="".join([i.thumbImgTag() for i in self.sorted_images]),
+pages.append(images[:IMAGE_COUNT])
-DESCR=self.descr,
+images = images[IMAGE_COUNT:]
-SHORTURL=self.inRoot('s', self.shorturl_code),
-SHORTURL_CODE=self.shorturl_code,
+pagination_required = len(pages) > 1
-)
+if pagination_required :
+render.info("Index split into %d pages of %d images each", len(pages), IMAGE_COUNT)
+for cur_page, page in enumerate(pages) :
+if pagination_required :
+pagination = "<ul>" # <li>Showing Images %d - %d of %d</li>" % (cur_page*IMAGE_COUNT, cur_page*IMAGE_COUNT+len(page), image_count)
+if cur_page > 0 :
+pagination += '<li><a href="%s">&laquo; Prev</a></li>' % (self._page_fname(cur_page - 1))
+else :
+pagination += '<li><span>&laquo; Prev</span></li>'
+for x in xrange(0, len(pages)) :
+if x == cur_page :
+pagination += '<li><strong>%s</strong></li>' % (x + 1)
+else :
+pagination += '<li><a href="%s">%s</a></li>' % (self._page_fname(x), x+1)
+if cur_page < len(pages) - 1 :
+pagination += '<li><a href="%s">Next &raquo;</a></li>' % (self._page_fname(cur_page + 1))
+else :
+pagination += '<li><span>Next &raquo;</span></li>'
+pagination += "</ul>"
+else :
+pagination = ''
+# render to index.html
+gallery_tpl.renderTo(self.pathFor(self._page_fname(cur_page)),
+STYLE_URL=self.inRoot('style.css'),
+BREADCRUMB=" &raquo; ".join([link(u, t) for (u, t) in self.breadcrumb()]),
+TITLE=self.title,
+DIRECTORIES=directories,
+PAGINATION=pagination,
+CONTENT="".join([i.thumbImgTag() for i in page]),
+DESCR=self.descr,
+SHORTURL=self.inRoot('s', self.shorturl_code),
+SHORTURL_CODE=self.shorturl_code,
+)
 # render images
 for img in self.images.itervalues() :
 img.render()
 def thumbImgTag (self) :
 """
 a <a><img /></a> of this image's thumbnail. Path relative to directory we are in
 """
-return link(self.html_name, "<img src='%s' alt='%s' title='%s'>" % (os.path.join(THUMB_DIR, self.name), self.descr, self.title))
+return link(self.html_name, "<img src='%s' alt='%s' title='%s' />" % (os.path.join(THUMB_DIR, self.name), self.descr, self.title))
 def previewImgTag (self) :
 """
 a <a><img /></a> of this image's preview. Path relative to directory we are in
 """
-return link(self.name, "<img src='%s' alt='%s' title='%s'>" % (os.path.join(PREVIEW_DIR, self.name), self.descr, self.title))
+return link(self.name, "<img src='%s' alt='%s' title='%s' />" % (os.path.join(PREVIEW_DIR, self.name), self.descr, self.title))
 def linkTag (self) :
 """
 a <a></a> text-link to this image
 """
 type    - one of 'img', 'dir'
 dirpath - the path to the directory, e.g. '.', './foobar', './foobar/quux'
 fname   - the filename, one of '', 'DSC9839.JPG', 'this.png', etc.
 """
-db = shelve.open('shorturls2', 'c')
+db = shelve.open('shorturls2', 'c', writeback=True)
 id = db.get('_id', 1)
 dirqueue = [root]
 # dict of path -> obj
 paths = {}
+index.info("Processing ShortURLs...")
 while dirqueue :
 dir = dirqueue.pop(0)
 dirqueue.extend(dir.subdirs.itervalues())
 if dir.alive :
 paths[dir.path] = dir
 for img in dir.images.itervalues() :
-paths[img.html_path] = img
+paths[img.path] = img
 for key in db.keys() :
 if key.startswith('_') :
 continue
 type, dirpath, fname = db[key]
-path = os.path.join(dirpath, fname)
+path = os.path.join(dirpath, fname).rstrip('/')
 try :
 paths.pop(path).shorturl_code = key
 index.debug("Code for `%s' is %s", path, key)

changeset 5	156cdfffef8e
parent 1	740133ab6353
child 6	d9d1f8e5f384