diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2011-05-06 02:43:54 -0400 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2011-05-06 02:43:54 -0400 |
| commit | e11da0e96372bb04bf1f512ccb90e601e950fd0f (patch) | |
| tree | 059507ee1609ae1a681ce01d228c35318a097fba | |
| parent | Gettin functional, baby (diff) | |
| download | PhotoFloat-e11da0e96372bb04bf1f512ccb90e601e950fd0f.tar.xz PhotoFloat-e11da0e96372bb04bf1f512ccb90e601e950fd0f.zip | |
Hash tag back. Garbage collection.
| -rw-r--r-- | scanner/PhotoAlbum.py | 2 | ||||
| -rw-r--r-- | web/js/010-debugger.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scanner/PhotoAlbum.py b/scanner/PhotoAlbum.py index 023158f..4fd9f0d 100644 --- a/scanner/PhotoAlbum.py +++ b/scanner/PhotoAlbum.py @@ -4,6 +4,7 @@ import json import os.path from PIL import Image from PIL.ExifTags import TAGS +import gc class Album(object): def __init__(self, path): @@ -127,6 +128,7 @@ class Photo(object): pass self._attributes[decoded] = value def _thumbnail(self, image, thumb_path, size, square=False): + gc.collect() thumb_path = os.path.join(thumb_path, image_cache(self._path, size, square)) print "Thumbing %s" % thumb_path if os.path.exists(thumb_path) and file_mtime(thumb_path) >= self._attributes["DateTimeFile"]: diff --git a/web/js/010-debugger.js b/web/js/010-debugger.js index 8af0305..ecac65a 100644 --- a/web/js/010-debugger.js +++ b/web/js/010-debugger.js @@ -66,7 +66,7 @@ $(document).ready(function() { $(document.body).html("Wrong picture."); return; } - $("#photo").html("<a href=\"javascript:history.back(-1)\"><img src=\"" + imagePath(current_album.photos[index].name, current_album.path, 640, false) + "\"></a>"); + $("#photo").html("<a href=\"#" + current_album_cache + "\"><img src=\"" + imagePath(current_album.photos[index].name, current_album.path, 640, false) + "\"></a>"); $("#album").fadeOut(); $("#photo").fadeIn(); } |