author | Tero Marttila <terom@fixme.fi> |
Sun, 14 Jun 2009 23:57:50 +0300 | |
changeset 121 | 3bed35e79f41 |
parent 120 | 55cb7fc9c8fb |
child 122 | 292aaba6d6ec |
permissions | -rw-r--r-- |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
1 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
2 |
Per-image gallery state |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
3 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
4 |
|
120
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
5 |
import filesystem, format, thumbnail, exif |
76 | 6 |
from utils import lazy_load |
12
c2d8e9a754a1
Major code restructuring. Version is now 0.5, templates use Mako, and the code is split off into several files under lib/
terom
parents:
diff
changeset
|
7 |
|
c2d8e9a754a1
Major code restructuring. Version is now 0.5, templates use Mako, and the code is split off into several files under lib/
terom
parents:
diff
changeset
|
8 |
import PIL.Image |
33
4943047bfcb5
merged http://pajukanta.fi/temp/degal_exif_r33.tar.bz2 patch from Japsu
terom
parents:
28
diff
changeset
|
9 |
|
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
10 |
class Image (filesystem.File) : |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
11 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
12 |
An Image is a filesystem File that represents an image that can be thumbnailed, and handled. |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
13 |
""" |
44
533b7e8b5d3b
strip copyright/license boilerplate from modules, except dexif and formatbytes
Tero Marttila <terom@fixme.fi>
parents:
41
diff
changeset
|
14 |
|
76 | 15 |
def __init__ (self, *args, **kwargs) : |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
16 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
17 |
Initialize as an Image based on the given Node, linked with the given previous node |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
18 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
19 |
|
77
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
20 |
super(Image, self).__init__(*args, **kwargs) |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
21 |
|
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
22 |
# links |
76 | 23 |
self.prev = None |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
24 |
self.next = None |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
25 |
|
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
26 |
# the .html file for this image |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
27 |
self.html = self.parent.subfile(self.basename + '.html') |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
28 |
|
85
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
29 |
# our preview/thumbnail |
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
30 |
self.preview = thumbnail.Thumbnail(self, self.parent.preview_dir, self.config.preview_size) |
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
31 |
self.thumb = thumbnail.Thumbnail(self, self.parent.thumb_dir, self.config.thumb_size) |
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
32 |
|
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
33 |
# info |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
34 |
self.title = self.name |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
35 |
self.description = None |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
36 |
|
77
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
37 |
@lazy_load |
115
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
38 |
def img (self) : |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
39 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
40 |
Loads the image as a PIL.Image |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
41 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
42 |
|
77
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
43 |
# open it up |
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
44 |
return PIL.Image.open(self.path) |
115
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
45 |
|
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
46 |
@property |
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
47 |
def img_size (self) : |
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
48 |
""" |
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
49 |
Returns the pixel (width, height) resolution tuple of this image. |
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
50 |
""" |
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
51 |
|
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
52 |
return self.img.size |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
53 |
|
77
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
54 |
@lazy_load |
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
55 |
def exif (self) : |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
56 |
""" |
120
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
57 |
Loads the ExifHandler object for this image. |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
58 |
|
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
59 |
Returns None if no exif data was found |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
60 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
61 |
|
120
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
62 |
# look up using exif |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
63 |
return exif.load(self.config, self) |
77
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
64 |
|
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
65 |
@lazy_load |
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
66 |
def metadata (self) : |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
67 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
68 |
Load and return the metadata for the image as a dictionary |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
69 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
70 |
|
77
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
71 |
# load stuff |
85
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
72 |
stat = self.stat() |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
73 |
|
77
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
74 |
# XXX: avoid having to open the image? |
115
d5aa320697df
rename Image.pil_image -> Image.img, and shave off ~30ms per image by using Image.resize instead of Image.copy/Image.thumbnail
Tero Marttila <terom@fixme.fi>
parents:
111
diff
changeset
|
75 |
size = self.img_size |
77
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
76 |
|
2a53c5ade434
misc. fixes, it runs now, but HTML output is corrupt (no flattening)
Tero Marttila <terom@fixme.fi>
parents:
76
diff
changeset
|
77 |
# build |
120
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
78 |
metadata = [ |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
79 |
("File name", self.name), |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
80 |
("Resolution", "%dx%d" % size), |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
81 |
("File size", format.filesize(stat.st_size)), |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
82 |
("Last modified", format.filetime(stat.st_mtime)), |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
83 |
] |
111
ecceaf23c969
make loading exif metadata optional
Tero Marttila <terom@fixme.fi>
parents:
91
diff
changeset
|
84 |
|
ecceaf23c969
make loading exif metadata optional
Tero Marttila <terom@fixme.fi>
parents:
91
diff
changeset
|
85 |
# optionally load Exif metadata |
120
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
86 |
if self.config.with_exif and self.exif : |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
87 |
exif_tag_name = dict(self.config.exif_tags) |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
88 |
exif_tags = (tag for tag, name in self.config.exif_tags) |
111
ecceaf23c969
make loading exif metadata optional
Tero Marttila <terom@fixme.fi>
parents:
91
diff
changeset
|
89 |
|
120
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
90 |
# merge the wanted tags |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
91 |
metadata.extend(( |
55cb7fc9c8fb
add new exif.py to abstract between different exif libraries, and add partially working support for pyexiv2 and EXIFpy
Tero Marttila <terom@fixme.fi>
parents:
118
diff
changeset
|
92 |
(exif_tag_name[tag], value) for tag, value in self.exif.image_tags(exif_tags) |
111
ecceaf23c969
make loading exif metadata optional
Tero Marttila <terom@fixme.fi>
parents:
91
diff
changeset
|
93 |
)) |
ecceaf23c969
make loading exif metadata optional
Tero Marttila <terom@fixme.fi>
parents:
91
diff
changeset
|
94 |
|
ecceaf23c969
make loading exif metadata optional
Tero Marttila <terom@fixme.fi>
parents:
91
diff
changeset
|
95 |
return metadata |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
96 |
|
85
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
97 |
def stale (self) : |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
98 |
""" |
85
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
99 |
Tests if this Image is stale, based on preview/thumb. |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
100 |
""" |
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
101 |
|
85
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
102 |
return self.preview.stale() or self.thumb.stale() |
70
67dd32adf159
remove old Folder, Image code, wrap up both
Tero Marttila <terom@fixme.fi>
parents:
57
diff
changeset
|
103 |
|
85
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
104 |
def update (self) : |
70
67dd32adf159
remove old Folder, Image code, wrap up both
Tero Marttila <terom@fixme.fi>
parents:
57
diff
changeset
|
105 |
""" |
85
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
106 |
Updates this Image's thumb/preview |
70
67dd32adf159
remove old Folder, Image code, wrap up both
Tero Marttila <terom@fixme.fi>
parents:
57
diff
changeset
|
107 |
""" |
85
7da934333469
move thumbnail rendering from render.py to thumbnail.py, and implement staleness checking for Images, plus index_images for Folder
Tero Marttila <terom@fixme.fi>
parents:
77
diff
changeset
|
108 |
|
91
17ae33501289
change Image.update to unconditionally update the thumb/preview
Tero Marttila <terom@fixme.fi>
parents:
85
diff
changeset
|
109 |
self.preview.update() |
17ae33501289
change Image.update to unconditionally update the thumb/preview
Tero Marttila <terom@fixme.fi>
parents:
85
diff
changeset
|
110 |
self.thumb.update() |
57
8d06e0283b88
start implementing new Image stuff, tie in RenderMachine into the new Image class, assoicated config stuff
Tero Marttila <terom@fixme.fi>
parents:
44
diff
changeset
|
111 |