Mercurial > emacs
annotate lisp/tumme.el @ 68725:e59bf34a8b21
* mh-e.el (mh-invisible-header-fields-internal): Added entries
"X-BrightmailFiltered:", "X-Brightmail-Tracker:" and "X-Hashcash"
author | Peter Galbraith <galbraith@mixing.qc.dfo.ca> |
---|---|
date | Wed, 08 Feb 2006 14:32:40 +0000 |
parents | 23eaa0d773ea |
children | 9c1ca2e3695c |
rev | line source |
---|---|
67302 | 1 ;;; tumme.el --- use dired to browse and manipulate your images |
2 ;; | |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68404
diff
changeset
|
3 ;; Copyright (C) 2005, 2006 Free Software Foundation, Inc. |
67302 | 4 ;; |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
5 ;; Version: 0.4.11 |
68404 | 6 ;; Keywords: multimedia |
67302 | 7 ;; Author: Mathias Dahl <mathias.rem0veth1s.dahl@gmail.com> |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
24 ;; Boston, MA 02110-1301, USA. | |
25 | |
26 ;;; Commentary: | |
27 ;; | |
28 ;; BACKGROUND | |
29 ;; ========== | |
30 ;; | |
31 ;; I needed a program to browse, organize and tag my pictures. I got | |
32 ;; tired of the old gallery program I used as it did not allow | |
33 ;; multi-file operations easily. Also, it put things out of my | |
34 ;; control. Image viewing programs I tested did not allow multi-file | |
35 ;; operations or did not do what I wanted it to. | |
36 ;; | |
37 ;; So, I got the idea to use the wonderful functionality of Emacs and | |
38 ;; `dired' to do it. It would allow me to do almost anything I wanted, | |
39 ;; which is basically just to browse all my pictures in an easy way, | |
40 ;; letting me manipulate and tag them in various ways. `dired' already | |
41 ;; provide all the file handling and navigation facilities; I only | |
42 ;; needed to add some functions to display the images. | |
43 ;; | |
44 ;; I briefly tried out thumbs.el, and although it seemed more | |
45 ;; powerful than this package, it did not work the way I wanted to. It | |
46 ;; was too slow to created thumbnails of all files in a directory (I | |
47 ;; currently keep all my 2000+ images in the same directory) and | |
48 ;; browsing the thumbnail buffer was slow too. tumme.el will not | |
49 ;; create thumbnails until they are needed and the browsing is done | |
50 ;; quickly and easily in dired. I copied a great deal of ideas and | |
51 ;; code from there though... :) | |
52 ;; | |
53 ;; About the name: tumme means thumb in Swedish and it is used for | |
54 ;; working with thumbnails, so... :) If you want to know how to | |
55 ;; pronounce it, go to the page on EmacsWiki and download the .ogg | |
56 ;; file from there. | |
57 ;; | |
58 ;; `tumme' stores the thumbnail files in `tumme-dir' using the file | |
59 ;; name format ORIGNAME.thumb.ORIGEXT. For example | |
60 ;; ~/.tumme/myimage01.thumb.jpg. The "database" is for now just a | |
61 ;; plain text file with the following format: | |
62 ;; | |
63 ;; file-name-non-directory;comment:comment-text;tag1;tag2;tag3;...;tagN | |
64 ;; | |
65 ;; | |
66 ;; PREREQUISITES | |
67 ;; ============= | |
68 ;; | |
69 ;; * The ImageMagick package. Currently, `convert' and `mogrify' are | |
70 ;; used. Find it here: http://www.imagemagick.org. | |
71 ;; | |
72 ;; * For non-lossy rotation of JPEG images, the JpegTRAN program is | |
73 ;; needed. | |
74 ;; | |
75 ;; * For `tumme-get-exif-data' and `tumme-write-exif-data' to work, | |
76 ;; the command line tool `exiftool' is needed. It can be found here: | |
77 ;; http://www.sno.phy.queensu.ca/~phil/exiftool/. These two functions | |
78 ;; are, among other things, used for writing comments to image files | |
79 ;; using `tumme-thumbnail-set-image-description' and to create | |
80 ;; "unique" file names using `tumme-get-exif-file-name' (used by | |
81 ;; `tumme-copy-with-exif-file-name'). | |
82 ;; | |
83 ;; | |
84 ;; USAGE | |
85 ;; ===== | |
86 ;; | |
87 ;; If you plan to use tumme much, setting up key bindings for it in | |
88 ;; dired is a good idea: | |
89 ;; | |
90 ;; (tumme-setup-dired-keybindings) | |
91 ;; | |
92 ;; Next, do M-x tumme-dired RET. This will ask you for a directory | |
93 ;; where image files are stored, setup a useful window configuration | |
94 ;; and enable the two special modes that tumme provides. NOTE: If you | |
95 ;; do not want tumme to split your windows, call it with a prefix | |
96 ;; argument. | |
97 ;; | |
98 ;; Start viewing thumbnails by doing C-S-n and C-S-p to go up and down | |
99 ;; in the dired buffer while at the same time displaying a thumbnail | |
100 ;; image. The thumbnail images will be created on the fly, and | |
101 ;; cached. This means that the first time you browse your images, it | |
102 ;; will be a bit slow because the thumbnails are created. If you want | |
103 ;; to avoid this, you can pre-create the thumbnail images by marking | |
104 ;; all images in dired (% m \.jpg$ RET) and then do M-x | |
105 ;; tumme-create-thumbs. | |
106 ;; | |
107 ;; Next, try `tumme-display-thumbs' (C-t d). If no file is marked, a | |
108 ;; thumbnail for the file at point will show up in | |
109 ;; `tumme-thumbnail-buffer'. If one or more files are marked, | |
110 ;; thumbnails for those files will be displayed. | |
111 ;; | |
112 ;; Pressing TAB will switch to the window containing the | |
113 ;; `tumme-thumbnail-buffer' buffer. In there you can move between | |
114 ;; thumbnail images and display a semi-sized version in an Emacs | |
115 ;; buffer (RET), or the original image in an external viewer | |
116 ;; (C-RET). By pressing SPC or DEL you will navigate back and fort | |
117 ;; while at the same time displaying each image in Emacs. You can also | |
118 ;; navigate using arrow keys. Comment a file by pressing "c". Press | |
119 ;; TAB to get back to dired. | |
120 ;; | |
121 ;; While in dired mode, you can tag and comment files, you can tell | |
122 ;; `tumme' to mark files with a certain tag (using a regexp) etc. | |
123 ;; | |
124 ;; The easiest way to see the available commands is to use the Tumme | |
125 ;; menus added in tumme-thumbnail-mode and dired-mode. | |
126 ;; | |
127 ;; | |
128 ;; LIMITATIONS | |
129 ;; =========== | |
130 ;; | |
131 ;; * Supports all image formats that Emacs and convert supports, but | |
132 ;; the thumbnails are hard-coded to JPEG format. | |
133 ;; | |
134 ;; * WARNING: The "database" format used might be changed so keep a | |
135 ;; backup of `tumme-db-file' when testing new versions. | |
136 ;; | |
137 ;; | |
138 ;;; History: | |
139 ;; ======== | |
140 ;; | |
141 ;; Version 0.1, 2005-04-16 | |
142 ;; | |
143 ;; * First release, only browsing support for now. | |
144 ;; | |
145 ;; Version 0.2, 2005-04-21 | |
146 ;; | |
147 ;; * Changed calls to dired-filename-at-point to dired-get-filename | |
148 ;; | |
149 ;; Version 0.3, 2005-04-25 | |
150 ;; | |
151 ;; Quite a lot of changes: | |
152 ;; | |
153 ;; * Added basic image tagging support. No commands that make use of | |
154 ;; it yet. | |
155 ;; | |
156 ;; * Added text properties for the thumbnail images to be able to | |
157 ;; track where they came from originally. Used in `tumme-mode'. | |
158 ;; | |
159 ;; * Added `tumme-mode' to be used when navigating the thumbnail | |
160 ;; buffer. Currently, there are commands to mark, unmark, flag and | |
161 ;; jump to the original file in associated dired buffer. | |
162 ;; | |
163 ;; * When moving around in the thumbnail buffer (in `tumme-mode'), the | |
164 ;; user can turn on tracking of the movements and let them be | |
165 ;; mirrored in the associated dired buffer. | |
166 ;; | |
167 ;; * In this version I have been looking at some ideas in thumbs.el, | |
168 ;; for example the image margin and relief and the `thumbs-mode' | |
169 ;; which I copied and made the `tumme-mode' from. | |
170 ;; | |
171 ;; Version 0.4, 2005-05-02 | |
172 ;; | |
173 ;; * Renamed the functions that are to be used in `tumme-mode' in the | |
174 ;; thumbnail buffer. | |
175 ;; | |
176 ;; * The mark, unmark and flag commands in `tumme-mode' now also moves | |
177 ;; to next thumbnail, like how dired normally works. | |
178 ;; | |
179 ;; * Added `tumme-mode-line-up', `tumme-display-thumbs-append' and | |
180 ;; `tumme-mode-delete-char'. | |
181 ;; | |
182 ;; * Each thumbnail's tags is now displayed when navigating among the | |
183 ;; thumbnails in the thumbnail buffer. | |
184 ;; | |
185 ;; * Added simple slideshow functionality. | |
186 ;; | |
187 ;; Version 0.4.1, 2005-05-05 | |
188 ;; | |
189 ;; * Fixed bug in `tumme-flag-thumb-original-file' | |
190 ;; | |
191 ;; * Added commands to display original image in external viewer | |
192 ;; (`tumme-display-external') and in a Emacs buffer | |
193 ;; (`tumme-display-image'). | |
194 ;; | |
195 ;; * Minor code clean-up | |
196 ;; | |
197 ;; * Renamed some functions back again... | |
198 ;; | |
199 ;; * Added rotation of thumbnail images (90 degrees left and right) | |
200 ;; | |
201 ;; Version 0.4.2, 2005-05-06 | |
202 ;; | |
203 ;; * Removed need for `tumme-display-image-size' in | |
204 ;; `tumme-display-image'. Now, the maximum image size that fits in | |
205 ;; `tumme-display-buffer' is calculated automatically. Introduced | |
206 ;; two correction variables, `tumme-display-window-width-correction' | |
207 ;; and `tumme-display-window-height-correction' to be used to | |
208 ;; correct width and height depending on width and height of window | |
209 ;; decorations, fringes etc. This works really well! | |
210 ;; | |
211 ;; Version 0.4.3, 2005-05-07 | |
212 ;; | |
213 ;; * Added menus to `dired-mode' and `tumme-mode' | |
214 ;; | |
215 ;; * Added `tumme-mark-and-display-next' | |
216 ;; | |
217 ;; * Added `tumme-jump-thumbnail-buffer' | |
218 ;; | |
219 ;; * Bound TAB in `dired-mode-map' and `tumme-mode-map' to | |
220 ;; `tumme-jump-thumbnail-buffer' and | |
221 ;; `tumme-jump-original-dired-buffer', respectively. | |
222 ;; | |
223 ;; * Changed `tumme-display-image' to be more general. Now, it can be | |
224 ;; used from both thumbnail buffer and dired buffer by calling | |
225 ;; `tumme-display-thumbnail-original-image' and | |
226 ;; `tumme-display-dired-image', respectively. | |
227 ;; | |
228 ;; Version 0.4.4, 2005-05-10 | |
229 ;; | |
230 ;; * Added `tumme-get-exif-file-name' and | |
231 ;; `tumme-copy-with-exif-file-name'. These commands might not be | |
232 ;; useful for all people because they are very specific. See the | |
233 ;; documentation for each function for more information. | |
234 ;; | |
235 ;; * Added `tumme-display-next-thumbnail-original' and | |
236 ;; `tumme-display-previous-thumbnail-original' to be used for easy | |
237 ;; image browsing in thumbnail buffer. | |
238 ;; | |
239 ;; * Added support for comments. New function | |
240 ;; `tumme-comment-thumbnail' added, to be used in thumbnail buffer. | |
241 ;; | |
242 ;; * Added `tumme-mark-tagged-files'. Use it in dired buffer to mark | |
243 ;; tagged files. | |
244 ;; | |
245 ;; * Added `mouse-face' property `highlight' for mouse highlighting | |
246 ;; and had to add a space between each thumbnail to avoid whole rows | |
247 ;; to be highlighted. Doing this meant that I had to update | |
248 ;; `tumme-line-up' too... | |
249 ;; | |
250 ;; * Added `tumme-mouse-display-image'. Use mouse-2 to display image | |
251 ;; thumbnail when is highlighted. | |
252 ;; | |
253 ;; * As suggested by Ehud Karni on gnu.emacs.help, changed | |
254 ;; `tumme-window-DIMENSION-pixels' to use `frame-char-DIMENSION' | |
255 ;; instead of `frame-pixel-DIMENSION'. Feels better | |
256 ;; | |
257 ;; * Corrected a bug in `tumme-window-height-pixels'. I did not know | |
258 ;; that the mode-line consumed one line. Also, after experimenting, it | |
259 ;; seems that the only correction needed for the image display width | |
260 ;; is one single pixel. I left the corection variables in there, just | |
261 ;; in case someone has a system that differs. | |
262 ;; | |
263 ;; Version 0.4.5, 2005-05-19 | |
264 ;; | |
265 ;; * Added `tumme-line-up-dynamic' that calculates the number of | |
266 ;; thumbnails that will fit in the thumbnail buffer's window and | |
267 ;; `tumme-line-up-interactive' that asks the user. | |
268 ;; | |
269 ;; * Changed `tumme-display-thumbs' to call one of the `tumme-line-up' | |
270 ;; functions instead of doing the line-up itself. | |
271 ;; | |
272 ;; * Finally! Added experimental gallery creation. See customizable | |
273 ;; variables `tumme-gallery-dir', `tumme-gallery-image-root-url' and | |
274 ;; `tumme-gallery-thumb-image-root-url' and new command | |
275 ;; `tumme-gallery-generate'. Not beatiful, but it works quite | |
276 ;; well. Probably needs some CSS-stuff in it eventually. Also, I'm not | |
277 ;; sure this is the way I want to generate my image galleries in the | |
278 ;; future. After all, static pages cannot do what dynamic pages using | |
279 ;; PHP et al can do. Serves like a proof-of-concept of the tagging | |
280 ;; though. | |
281 ;; | |
282 ;; * Added option to hide images with certain tags. See | |
283 ;; `tumme-gallery-hidden-tags'. | |
284 ;; | |
285 ;; * Added `tumme-tag-thumbnail' for tagging files from thumbnail | |
286 ;; buffer. | |
287 ;; | |
288 ;; * Added `tumme-tag-remove' and `tumme-tag-thumbnail-remove' so that | |
289 ;; you can remove tags. Sorry if I have kept you waiting for | |
290 ;; this... :) | |
291 ;; | |
292 ;; * Added option `tumme-append-when-browsing' and new command | |
293 ;; `tumme-toggle-append-browsing'. | |
294 ;; | |
295 ;; Version 0.4.6, 2005-05-21 | |
296 ;; | |
297 ;; * Changed `tumme-thumb-name' to always use ".jpg" as file extension | |
298 ;; for thumbnail files, instead of using the extension from the | |
299 ;; original file's name. This was a very easy way to open up for | |
300 ;; allowing browsing of all image file types that Emacs support, | |
301 ;; assuming ImageMagick supports it too. | |
302 ;; | |
303 ;; * Fixed bug in `tumme-create-thumb' `tumme-rotate-thumbnail' and | |
304 ;; `tumme-display-image' by adding quotes around the file names. The | |
305 ;; conversion failed if the file name, or path, contained a | |
306 ;; space. Also expanded the file name, as convert (or is it bash?) | |
307 ;; does not work as expected for paths like "~/.tumme...". | |
308 ;; | |
309 ;; * Fixed another "space bug" :) in `tumme-display-external'. | |
310 ;; | |
311 ;; * In call to convert, added "jpeg:" in front of the output file | |
312 ;; name, so that all generated files becomes JPEG files. For now, only | |
313 ;; useful if `tumme-temp-image-file' does not end in .jpg. | |
314 ;; | |
315 ;; Version 0.4.7, 2005-05-26 | |
316 ;; | |
317 ;; * Change header line of tumme.el so that it does not wrap and cause | |
318 ;; evaluation problems for people getting the source from Usenet. | |
319 ;; | |
320 ;; * Changed `tumme-write-tag' slightly to get better performance when | |
321 ;; tagging many files. | |
322 ;; | |
323 ;; * Fixed bug in `tumme-create-gallery-lists' that made it puke if | |
324 ;; there was empty lines in the database. Changed the code so that it | |
325 ;; does not car about that. Also, fixed `tumme-remove-tag' so that it | |
326 ;; tries not to add empty lines at the end of the database. | |
327 ;; | |
328 ;; * Changed all commands that execute shell commands to be | |
329 ;; configurable using the `tumme-cmd-x' custom variables. This makes | |
330 ;; it easier to switch among different image conversion tools which | |
331 ;; might use different syntax and options. | |
332 ;; | |
333 ;; * Added `tumme-toggle-dired-display-properties'. | |
334 ;; | |
335 ;; * Added `tumme-thumb-file-name-format' and changed | |
336 ;; `tumme-thumb-name' to make it possible to configure the format of | |
337 ;; thumbnail files. Did not make it customizable yet though. It might | |
338 ;; be a bad idea to be able to switch between formats... | |
339 ;; | |
340 ;; * Changed `tumme-display-window' so that it looks for tumme's | |
341 ;; display window in all frames. Useful if you want to create an own | |
342 ;; frame for displaying the temporary image. | |
343 ;; | |
344 ;; * After changing the call to `get-window-with-predicate' to scan | |
345 ;; all frames for tumme's special buffers in visible windows, and also | |
346 ;; changing the way tumme tracks thumbnail movement in the dired | |
347 ;; buffer (now using `set-buffer' together with `set-window-point'), | |
348 ;; tumme now works quite happily with all three buffers in different | |
349 ;; frames. This empowers the user to setup the special buffers the way | |
350 ;; that best fits his need at the time. Jumping between dired and | |
351 ;; `tumme-thumbnail-buffer' work independent on in which frames they | |
352 ;; are. | |
353 ;; | |
354 ;; * Renamed `tumme-track-movement-in-dired' to | |
355 ;; `tumme-toggle-movement-tracking'. | |
356 ;; | |
357 ;; * Added `tumme-track-thumbnail' for movement tracking from dired | |
358 ;; buffer, analoguous to the tracking done in thumbnail buffer. Both | |
359 ;; uses the same custom variable `tumme-track-movement' which can be | |
360 ;; toggled on and off with `tumme-toggle-movement-tracking'. This is | |
361 ;; neat. :) Changed `tumme-setup-dired-keybindings' to make use of | |
362 ;; this in the best way. Read more about this there. | |
363 ;; | |
364 ;; Version 0.4.8, 2005-06-05 | |
365 ;; | |
366 ;; * Changed `tumme-display-dired-image' and | |
367 ;; `tumme-display-thumbnail-original-image' so that when called with a | |
368 ;; prefix argument, the image is not resized in the display | |
369 ;; buffer. This will be useful for later additions of image | |
370 ;; manipulation commands. | |
371 ;; | |
372 ;; * Added `tumme-kill-buffer-and-window' to make it easy to kill the | |
373 ;; tumme buffers. | |
374 ;; | |
375 ;; * Renamed `tumme-mode' to `tumme-thumbnail-mode'. | |
376 ;; | |
377 ;; * `tumme-tag-thumbnail' and `tumme-tag-thumbnail-remove' now | |
378 ;; updates the tags property for the thumbnail. | |
379 ;; | |
380 ;; * Added `tumme-dired-display-external' to display images in | |
381 ;; external viewer from dired buffer. | |
382 ;; | |
383 ;; * Added support for multiple files in `tumme-remove-tag' to | |
384 ;; increase performance. | |
385 ;; | |
386 ;; * Added `tumme-display-image-mode' so that we can add image | |
387 ;; manipulation commands there. | |
388 ;; | |
389 ;; * Added call to `tumme-display-thumb-properties' in | |
390 ;; `tumme-track-thumbnail'. | |
391 ;; | |
392 ;; * Added command `tumme-display-current-image-in-full-size' to be | |
393 ;; used in `tumme-display-image-mode'. | |
394 ;; | |
395 ;; * Changed `tumme-display-image' to call | |
396 ;; `tumme-create-display-image-buffer' so that we are sure that | |
397 ;; `tumme-display-image-buffer' is always available. | |
398 ;; | |
399 ;; * Added optional prefix argument to `tumme-dired-folder' that tells | |
400 ;; it to skip the window splitting and just creates the needed | |
401 ;; buffers. | |
402 ;; | |
403 ;; * Fixed bug somewhere that relied on `tumme-dired-folder' having | |
404 ;; created the `tumme-display-image-buffer'. Now `tumme-dired-folder' | |
405 ;; *should* not be necessary to call at all, just convenient. | |
406 ;; | |
407 ;; * Added tracking to `tumme-mouse-display-image'. | |
408 ;; | |
409 ;; * Added `tumme-mouse-select-thumbnail' and bound mouse-1 to it, so | |
410 ;; that selecting a thumbnail will track the original file. | |
411 ;; | |
412 ;; * Added three new custom variables, `tumme-cmd-ACTION-program' to | |
413 ;; make the command options cleaner and easier to read. | |
414 ;; | |
415 ;; * Added `tumme-display-properties-format' and | |
416 ;; `tumme-format-properties-string' to make it possible to configure | |
417 ;; the display format of the image file's properties. | |
418 ;; | |
419 ;; * Added missing (require 'format-spec) | |
420 ;; | |
421 ;; Version 0.4.9, 2005-09-25 | |
422 ;; | |
423 ;; * Fixed bug in `tumme-display-thumbs'. If a thumbnail file could | |
424 ;; not be created for some reason (bad file for example), even if | |
425 ;; several other thumbnails was created sucessfully, the code | |
426 ;; generated an error and never continued doing the line-up. | |
427 ;; | |
428 ;; * Made tumme.el pass the M-x checkdoc test, phew! | |
429 ;; | |
430 ;; * Added `tumme-rotate-original', `tumme-rotate-original-left' and | |
431 ;; `tumme-rotate-original-right' to rotate the original image from | |
432 ;; thumbnail view. By default it uses JpegTRAN to rotate the images | |
433 ;; non-lossy. Only works on JPEG images. The two new commands were | |
434 ;; added to thumbnail mode. Thanks to Colin Marquardt who told me | |
435 ;; about the "-copy all" option to jpegtran. | |
436 ;; | |
437 ;; * Added the functions `tumme-get-exif-data' and | |
438 ;; `tumme-set-exif-data' for reading and writing EXIF data to image files. | |
439 ;; | |
440 ;; * Rewrote `tumme-get-exif-file-name': now uses | |
441 ;; `tumme-get-exif-data'. Slight change to replace spaces with | |
442 ;; underscores (tt seems not all cameras use the exact same format for | |
443 ;; DateTimeOriginal). Added code for handling files that has no | |
444 ;; EXIF-data (use file's timestamp instead). | |
445 ;; | |
446 ;; * Changed from using the exif program to exiftool because exiftool | |
447 ;; also handles writing of EXIF data, which is very useful. | |
448 ;; | |
449 ;; * Added the command `tumme-thumbnail-set-image-description' that | |
450 ;; can be used to set the EXIF tag ImageDescription. Thanks to Colin | |
451 ;; Marquardt for the suggestion. | |
452 ;; | |
453 ;; * Added `tumme-toggle-mark-thumb-original-file' and | |
454 ;; `tumme-mouse-toggle-mark' and changed | |
455 ;; `tumme-modify-mark-on-thumb-original-file' to support toggling of | |
456 ;; mark of original image file in dired, from | |
457 ;; `tumme-thumbnail-mode'. Bound C-down-mouse-1 | |
458 ;; `tumme-mouse-toggle-mark' to in `tumme-thumbnail-mode'. | |
459 ;; | |
460 ;; * Changed `tumme-mouse-select-thumbnail' to also display properties | |
461 ;; after the file is selected. | |
462 ;; | |
463 ;; Version 0.4.10, 2005-11-07 | |
464 ;; | |
465 ;; * Renamed `tumme-dired-folder' to `tumme-dired'. | |
466 ;; | |
467 ;; * Changed format of the database file slightly, now the full path | |
468 ;; and file name is used. Had to change most of the tag functions | |
469 ;; (writing, reading, searching) slightly to cope with the change. If | |
470 ;; you are an old tumme user, you have to update your database | |
471 ;; manually, probably you only need to prefix all rows with a | |
472 ;; directory name to get the full path and file name. | |
473 ;; | |
474 ;; * Removed `tumme-thumb-file-name-format'. Added | |
475 ;; `tumme-thumbnail-storage' and changed `tumme-thumb-name' to provide | |
476 ;; two different thumbnail storage schemes. It is no longer necessary | |
477 ;; to have unique image file names to use tumme fully. | |
478 ;; | |
479 ;; * As a consequence of the above, gallery generation is currently | |
480 ;; not supported if per-directory thumbnail file storage is used. | |
481 ;; | |
482 ;; * Changed parameters to `tumme-create-thumb'. | |
483 ;; | |
484 ;; * To be included in Emacs 22. | |
485 ;; | |
486 ;; | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
487 ;; Version 0.4.11, 2006-MM-DD |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
488 ;; |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
489 ;; * Changed `tumme-display-thumbs' so that it calls `display-buffer' |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
490 ;; after generating the thumbnails and changed |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
491 ;; `tumme-display-thumbnail-original-image' to display the image |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
492 ;; buffer. These small changes should make it easier for a user to |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
493 ;; start using tumme. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
494 ;; |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
495 ;; * Added `tumme-show-all-from-dir' to mimic thumbs.el's easy-to-use |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
496 ;; `thumbs' command. A new customize option, |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
497 ;; `tumme-show-all-from-dir-max-files' was added too. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
498 ;; |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
499 ;; * Renamed `tumme-dired' to `tumme-dired-with-window-configuration' |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
500 ;; and added code to save the window configuration before messing it |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
501 ;; up. The saved window configuration can be restored using the new |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
502 ;; command `tumme-restore-window-configuration'. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
503 ;; |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
504 ;; * Added `tumme-get-thumbnail-image', created by Chong Yidong. His |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
505 ;; own comments: ..., that just takes the original filename and |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
506 ;; returns a thumbnail image descriptor. Then third-party libraries |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
507 ;; won't have to muck around with tumme.el's internal functions like |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
508 ;; `thumme-thumb-name', `tumme-create-thumb', etc. His code to get |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
509 ;; speedbar display tumme thumbnails, might be integrated soon. |
67302 | 510 ;; |
511 ;; TODO | |
512 ;; ==== | |
513 ;; | |
514 ;; * Support gallery creation when using per-directory thumbnail | |
515 ;; storage. | |
516 ;; | |
517 ;; * Some sort of auto-rotate function based on rotate info in the | |
518 ;; EXIF data. | |
519 ;; | |
520 ;; * Check if exiftool exist before trying to call it to give a better | |
521 ;; error message. | |
522 ;; | |
523 ;; * Investigate if it is possible to also write the tags to the image | |
524 ;; files. | |
525 ;; | |
526 ;; * From thumbs.el: Add an option for clean-up/max-size functionality | |
527 ;; for thumbnail directory. | |
528 ;; | |
529 ;; * From thumbs.el: Add setroot function. | |
530 ;; | |
531 ;; * Asynchronous creation of thumbnails. | |
532 ;; | |
533 ;; * Add `tumme-display-thumbs-ring' and functions to cycle that. Find | |
534 ;; out which is best, saving old batch just before inserting new, or | |
535 ;; saving the current batch in the ring when inserting it. Adding it | |
536 ;; probably needs rewriting `tumme-display-thumbs' to be more general. | |
537 ;; | |
538 ;; * Find some way of toggling on and off really nice keybindings in | |
539 ;; dired (for example, using C-n or <down> instead of C-S-n). Richard | |
540 ;; suggested that we could keep C-t as prefix for tumme commands as it | |
541 ;; is currently not used in dired. He also suggested that | |
542 ;; `dired-next-line' and `dired-previous-line' figure out if tumme is | |
543 ;; enabled in the current buffer and, if it is, call | |
544 ;; `tumme-dired-next-line' and `tumme-dired-previous-line', | |
545 ;; respectively. | |
546 ;; | |
547 ;; * Enhanced gallery creation with basic CSS-support and pagination | |
548 ;; of tag pages with many pictures. | |
549 ;; | |
550 ;; * Rewrite `tumme-modify-mark-on-thumb-original-file' to be less | |
551 ;; ugly. | |
552 ;; | |
553 ;; * In some way keep track of buffers and windows and stuff so that | |
554 ;; it works as the user expects. | |
555 ;; | |
556 ;; * More/better documentation | |
557 ;; | |
558 ;; | |
559 ;;; Code: | |
560 | |
561 (require 'dired) | |
562 (require 'format-spec) | |
563 | |
564 (defgroup tumme nil | |
565 "Use dired to browse your images as thumbnails, and more." | |
566 :prefix "tumme-" | |
567 :group 'files) | |
568 | |
569 (defcustom tumme-dir "~/.tumme/" | |
570 "*Directory where thumbnail images for are stored." | |
571 :type 'string | |
572 :group 'tumme) | |
573 | |
574 (defcustom tumme-thumbnail-storage 'use-tumme-dir | |
575 "*How to store tumme's thumbnail files. | |
576 Tumme can store thumbnail files in one of two ways and this is | |
577 controlled by this variable. \"Use tumme dir\" means that the | |
578 thumbnails are stored in a central directory. \"Per directory\" | |
579 means that each thumbnail is stored in a subdirectory called | |
580 \".tumme\" in the same directory where the image file is." | |
581 :type '(choice :tag "How to store thumbnail files" | |
582 (const :tag "Use tumme-dir" use-tumme-dir) | |
583 (const :tag "Per-directory" per-directory)) | |
584 :group 'tumme) | |
585 | |
586 (defcustom tumme-db-file "~/.tumme/.tumme_db" | |
587 "*Database file where file names and their associated tags are stored." | |
588 :type 'string | |
589 :group 'tumme) | |
590 | |
591 (defcustom tumme-temp-image-file "~/.tumme/.tumme_temp" | |
592 "*Name of temporary image file used by various commands." | |
593 :type 'string | |
594 :group 'tumme) | |
595 | |
596 (defcustom tumme-gallery-dir "~/.tumme/.tumme_gallery" | |
597 "*Directory to store generated gallery html pages. | |
598 This path needs to be \"shared\" to the public so that it can access | |
599 the index.html page that tumme creates." | |
600 :type 'string | |
601 :group 'tumme) | |
602 | |
603 (defcustom tumme-gallery-image-root-url | |
604 "http://your.own.server/tummepics" | |
605 "*URL where the full size images are to be found. | |
606 Note that this path has to be configured in your web server. Tumme | |
607 expects to find pictures in this directory." | |
608 :type 'string | |
609 :group 'tumme) | |
610 | |
611 (defcustom tumme-gallery-thumb-image-root-url | |
612 "http://your.own.server/tummethumbs" | |
613 "*URL where the thumbnail images are to be found. | |
614 Note that this path has to be configured in your web server. Tumme | |
615 expects to find pictures in this directory." | |
616 :type 'string | |
617 :group 'tumme) | |
618 | |
619 (defcustom tumme-cmd-create-thumbnail-program | |
620 "convert" | |
621 "*Executable used to create thumbnail. | |
622 Used together with `tumme-cmd-create-thumbnail-options'." | |
623 :type 'string | |
624 :group 'tumme) | |
625 | |
626 (defcustom tumme-cmd-create-thumbnail-options | |
627 "%p -size %sx%s \"%f\" -resize %sx%s +profile \"*\" jpeg:\"%t\"" | |
628 "*Format of command used to create thumbnail image. | |
629 Available options are %p which is replaced by | |
630 `tumme-cmd-create-thumbnail-program', %s which is replaced by | |
631 `tumme-thumb-size', %f which is replaced by the file name of the | |
632 original image and %t which is replaced by the file name of the | |
633 thumbnail file." | |
634 :type 'string | |
635 :group 'tumme) | |
636 | |
637 (defcustom tumme-cmd-create-temp-image-program | |
638 "convert" | |
639 "*Executable used to create temporary image. | |
640 Used together with `tumme-cmd-create-temp-image-options'." | |
641 :type 'string | |
642 :group 'tumme) | |
643 | |
644 (defcustom tumme-cmd-create-temp-image-options | |
645 "%p -size %xx%y \"%f\" -resize %xx%y +profile \"*\" jpeg:\"%t\"" | |
646 "*Format of command used to create temporary image for display window. | |
647 Available options are %p which is replaced by | |
648 `tumme-cmd-create-temp-image-program', %x and %y which is replaced by | |
649 the calculated max size for x and y in the image display window, %f | |
650 which is replaced by the file name of the original image and %t which | |
651 is replaced by the file name of the temporary file." | |
652 :type 'string | |
653 :group 'tumme) | |
654 | |
655 (defcustom tumme-cmd-rotate-thumbnail-program | |
656 "mogrify" | |
657 "*Executable used to rotate thumbnail. | |
658 Used together with `tumme-cmd-rotate-thumbnail-options'." | |
659 :type 'string | |
660 :group 'tumme) | |
661 | |
662 (defcustom tumme-cmd-rotate-thumbnail-options | |
663 "%p -rotate %d \"%t\"" | |
664 "*Format of command used to rotate thumbnail image. | |
665 Available options are %p which is replaced by | |
666 `tumme-cmd-rotate-thumbnail-program', %d which is replaced by the | |
667 number of (positive) degrees to rotate the image, normally 90 or 270 | |
668 \(for 90 degrees right and left), %t which is replaced by the file name | |
669 of the thumbnail file." | |
670 :type 'string | |
671 :group 'tumme) | |
672 | |
673 (defcustom tumme-cmd-rotate-original-program | |
674 "jpegtran" | |
675 "*Executable used to rotate original image. | |
676 Used together with `tumme-cmd-rotate-original-options'." | |
677 :type 'string | |
678 :group 'tumme) | |
679 | |
680 (defcustom tumme-cmd-rotate-original-options | |
681 "%p -rotate %d -copy all \"%o\" > %t" | |
682 "*Format of command used to rotate original image. | |
683 Available options are %p which is replaced by | |
684 `tumme-cmd-rotate-original-program', %d which is replaced by the | |
685 number of (positive) degrees to rotate the image, normally 90 or | |
686 270 \(for 90 degrees right and left), %o which is replaced by the | |
687 original image file name and %t which is replaced by | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
688 `tumme-temp-image-file'." |
67302 | 689 :type 'string |
690 :group 'tumme) | |
691 | |
692 (defcustom tumme-temp-rotate-image-file | |
693 "~/.tumme/.tumme_rotate_temp" | |
694 "*Temporary file for rotate operations." | |
695 :type 'string | |
696 :group 'tumme) | |
697 | |
698 (defcustom tumme-rotate-original-ask-before-overwrite t | |
699 "Confirm overwrite of original file after rotate operation. | |
700 If non-nil, ask user for confirmation before overwriting the | |
701 original file with `tumme-temp-rotate-image-file'." | |
702 :type 'boolean | |
703 :group 'tumme) | |
704 | |
705 (defcustom tumme-cmd-write-exif-data-program | |
706 "exiftool" | |
707 "*Program used to write EXIF data to image. | |
708 Used together with `tumme-cmd-write-exif-data-options'." | |
709 :type 'string | |
710 :group 'tumme) | |
711 | |
712 (defcustom tumme-cmd-write-exif-data-options | |
713 "%p -%t=\"%v\" \"%f\"" | |
714 "*Format of command used to write EXIF data. | |
715 Available options are %p which is replaced by | |
716 `tumme-cmd-write-exif-data-program', %f which is replaced by the | |
717 image file name, %t which is replaced by the tag name and %v | |
718 which is replaced by the tag value." | |
719 :type 'string | |
720 :group 'tumme) | |
721 | |
722 (defcustom tumme-cmd-read-exif-data-program | |
723 "exiftool" | |
724 "*Program used to read EXIF data to image. | |
725 Used together with `tumme-cmd-read-exif-data-program-options'." | |
726 :type 'string | |
727 :group 'tumme) | |
728 | |
729 (defcustom tumme-cmd-read-exif-data-options | |
730 "%p -s -s -s -%t \"%f\"" | |
731 "*Format of command used to read EXIF data. | |
732 Available options are %p which is replaced by | |
733 `tumme-cmd-write-exif-data-options', %f which is replaced | |
734 by the image file name and %t which is replaced by the tag name." | |
735 :type 'string | |
736 :group 'tumme) | |
737 | |
738 (defcustom tumme-gallery-hidden-tags | |
739 (list "private" "hidden" "pending") | |
740 "*List of \"hidden\" tags. | |
741 Used by `tumme-gallery-generate' to leave out \"hidden\" images." | |
742 :type '(repeat string) | |
743 :group 'tumme) | |
744 | |
745 (defcustom tumme-thumb-size 100 | |
746 "Size of thumbnails, in pixels." | |
747 :type 'integer | |
748 :group 'tumme) | |
749 | |
750 (defcustom tumme-thumb-relief 2 | |
751 "*Size of button-like border around thumbnails." | |
752 :type 'integer | |
753 :group 'tumme) | |
754 | |
755 (defcustom tumme-thumb-margin 2 | |
756 "*Size of the margin around thumbnails. | |
757 This is where you see the cursor." | |
758 :type 'integer | |
759 :group 'tumme) | |
760 | |
761 (defcustom tumme-line-up-method 'dynamic | |
762 "*Default method for line-up of thumbnails in thumbnail buffer. | |
763 Used by `tumme-display-thumbs' and other functions that needs to | |
764 line-up thumbnails. Dynamic means to use the available width of the | |
765 window containing the thumbnail buffer, Fixed means to use | |
766 `tumme-thumbs-per-row', Interactive is for asking the user, and No | |
767 line-up means that no automatic line-up will be done." | |
768 :type '(choice :tag "Default line-up method" | |
769 (const :tag "Dynamic" dynamic) | |
770 (const :tag "Fixed" fixed) | |
771 (const :tag "Interactive" interactive) | |
772 (const :tag "No line-up" none)) | |
773 :group 'tumme) | |
774 | |
775 (defcustom tumme-thumbs-per-row 3 | |
776 "*Number of thumbnails to display per row in thumb buffer." | |
777 :type 'integer | |
778 :group 'tumme) | |
779 | |
780 (defcustom tumme-display-window-width-correction 1 | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
781 "*Number to be used to correct image display window width. |
67302 | 782 Change if the default (1) does not work (i.e. if the image does not |
783 completely fit)." | |
784 :type 'integer | |
785 :group 'tumme) | |
786 | |
787 (defcustom tumme-display-window-height-correction 0 | |
788 "*Number to be used to correct image display window height. | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
789 Change if the default (0) does not work (i.e. if the image does not |
67302 | 790 completely fit)." |
791 :type 'integer | |
792 :group 'tumme) | |
793 | |
794 (defcustom tumme-track-movement nil | |
795 "The current state of the tracking and mirroring. | |
796 For more information, see the documentation for | |
797 `tumme-toggle-movement-tracking'." | |
798 :type 'boolean | |
799 :group 'tumme) | |
800 | |
801 (defcustom tumme-append-when-browsing nil | |
802 "Append thumbnails in thumbnail buffer when browsing. | |
803 If non-nil, using `tumme-next-line-and-display' and | |
804 `tumme-previous-line-and-display' will leave a trail of thumbnail | |
805 images in the thumbnail buffer. If you enable this and want to clean | |
806 the thumbnail buffer because it is filled with too many thumbmnails, | |
807 just call `tumme-display-thumb' to display only the image at point. | |
808 This value can be toggled using `tumme-toggle-append-browsing'." | |
809 :type 'boolean | |
810 :group 'tumme) | |
811 | |
812 (defcustom tumme-dired-disp-props t | |
813 "If non-nil, display properties for dired file when browsing. | |
814 Used by `tumme-next-line-and-display', | |
815 `tumme-previous-line-and-display' and `tumme-mark-and-display-next'. | |
816 If the database file is large, this can slow down image browsing in | |
817 dired and you might want to turn it off." | |
818 :type 'boolean | |
819 :group 'tumme) | |
820 | |
821 (defcustom tumme-display-properties-format "%b: %f (%t): %c" | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
822 "*Display format for thumbnail properties. |
67302 | 823 %b is replaced with associated dired buffer name, %f with file name |
824 \(without path) of original image file, %t with the list of tags and %c | |
825 with the comment." | |
826 :type 'string | |
827 :group 'tumme) | |
828 | |
829 (defcustom tumme-external-viewer "qiv -t" | |
830 "*Name of external viewer. | |
831 Including parameters. Used when displaying original image from | |
832 `tumme-thumbnail-mode'." | |
833 :type 'string | |
834 :group 'tumme) | |
835 | |
836 (defcustom tumme-main-image-directory "~/pics/" | |
837 "*Name of main image directory, if any. | |
838 Used by `tumme-copy-with-exif-file-name'." | |
839 :type 'string | |
840 :group 'tumme) | |
841 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
842 (defcustom tumme-show-all-from-dir-max-files 50 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
843 "*Maximum number of files to show using`tumme-show-all-from-dir'. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
844 before warning the user." |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
845 :type 'integer |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
846 :group 'tumme) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
847 |
67302 | 848 (defun tumme-insert-image (file type relief margin) |
849 "Insert image FILE of image TYPE, using RELIEF and MARGIN, at point." | |
850 | |
851 (let ((i `(image :type ,type | |
852 :file ,file | |
853 :relief ,relief | |
854 :margin ,margin))) | |
855 (insert-image i))) | |
856 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
857 (defun tumme-get-thumbnail-image (file) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
858 "Return the image descriptor for a thumbnail of image file FILE." |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
859 (unless (string-match (image-file-name-regexp) file) |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
860 (error "%s is not a valid image file" file)) |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
861 (let ((thumb-file (tumme-thumb-name file))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
862 (unless (and (file-exists-p thumb-file) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
863 (<= (float-time (nth 5 (file-attributes file))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
864 (float-time (nth 5 (file-attributes thumb-file))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
865 (tumme-create-thumb file thumb-file)) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
866 (list 'image :type 'jpeg :file thumb-file |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
867 :relief tumme-thumb-relief :margin tumme-thumb-margin))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
868 |
67302 | 869 (defun tumme-insert-thumbnail (file original-file-name |
870 associated-dired-buffer) | |
871 "Insert thumbnail image FILE. | |
872 Add text properties ORIGINAL-FILE-NAME and ASSOCIATED-DIRED-BUFFER." | |
873 (let (beg end) | |
874 (setq beg (point)) | |
875 (tumme-insert-image file | |
876 'jpeg | |
877 tumme-thumb-relief | |
878 tumme-thumb-margin) | |
879 (setq end (point)) | |
880 (add-text-properties | |
881 beg end | |
882 (list 'tumme-thumbnail t | |
883 'original-file-name original-file-name | |
884 'associated-dired-buffer associated-dired-buffer | |
885 'tags (tumme-list-tags original-file-name) | |
886 'mouse-face 'highlight | |
887 'comment (tumme-get-comment original-file-name))))) | |
888 | |
889 (defun tumme-thumb-name (file) | |
890 "Return thumbnail file name for FILE. | |
891 Depending on the value of `tumme-thumbnail-storage', the file | |
892 name will vary. For central thumbnail file storage, make a | |
893 MD5-hash of the image file's directory name and add that to make | |
894 the thumbnail file name unique. For per-directory storage, just | |
895 add a subdirectory." | |
896 (let ((f (expand-file-name file)) | |
897 md5-hash) | |
898 (format "%s%s%s.thumb.%s" | |
899 (cond ((eq 'use-tumme-dir tumme-thumbnail-storage) | |
900 ;; Is MD5 hashes fast enough? The checksum of a | |
901 ;; thumbnail file name need not be that | |
902 ;; "cryptographically" good so a faster one could | |
903 ;; be used here. | |
904 (setq md5-hash (md5 (file-name-as-directory | |
905 (file-name-directory file)))) | |
906 (file-name-as-directory (expand-file-name tumme-dir))) | |
907 ((eq 'per-directory tumme-thumbnail-storage) | |
908 (format "%s.tumme/" | |
909 (file-name-directory f)))) | |
910 (file-name-sans-extension | |
911 (file-name-nondirectory f)) | |
912 (if md5-hash | |
913 (concat "_" md5-hash) | |
914 "") | |
915 (file-name-extension f)))) | |
916 | |
917 (defun tumme-create-thumb (original-file thumbnail-file) | |
918 "For ORIGINAL-FILE, create thumbnail image named THUMBNAIL-FILE." | |
919 (let* ((size (int-to-string tumme-thumb-size)) | |
920 (command | |
921 (format-spec | |
922 tumme-cmd-create-thumbnail-options | |
923 (list | |
924 (cons ?p tumme-cmd-create-thumbnail-program) | |
925 (cons ?s size) | |
926 (cons ?f original-file) | |
927 (cons ?t thumbnail-file)))) | |
928 thumbnail-dir) | |
929 (when (not (file-exists-p | |
930 (setq thumbnail-dir (file-name-directory thumbnail-file)))) | |
931 (message "Creating thumbnail directory.") | |
932 (make-directory thumbnail-dir)) | |
933 (shell-command command nil))) | |
934 | |
935 (defun tumme-next-line-and-display () | |
936 "Move to next dired line and display thumbnail image." | |
937 (interactive) | |
938 (dired-next-line 1) | |
939 (tumme-display-thumbs | |
940 t (or tumme-append-when-browsing nil)) | |
941 (if tumme-dired-disp-props | |
942 (tumme-dired-display-properties))) | |
943 | |
944 (defun tumme-previous-line-and-display () | |
945 "Move to previous dired line and display thumbnail image." | |
946 (interactive) | |
947 (dired-previous-line 1) | |
948 (tumme-display-thumbs | |
949 t (or tumme-append-when-browsing nil)) | |
950 (if tumme-dired-disp-props | |
951 (tumme-dired-display-properties))) | |
952 | |
953 (defun tumme-toggle-append-browsing () | |
954 "Toggle `tumme-append-when-browsing'." | |
955 (interactive) | |
956 (setq tumme-append-when-browsing | |
957 (not tumme-append-when-browsing)) | |
958 (message "Append browsing %s." | |
959 (if tumme-append-when-browsing | |
960 "on" | |
961 "off"))) | |
962 | |
963 (defun tumme-mark-and-display-next () | |
964 "Mark current file in dired and display next thumbnail image." | |
965 (interactive) | |
966 (dired-mark 1) | |
967 (tumme-display-thumbs | |
968 t (or tumme-append-when-browsing nil)) | |
969 (if tumme-dired-disp-props | |
970 (tumme-dired-display-properties))) | |
971 | |
972 (defun tumme-toggle-dired-display-properties () | |
973 "Toggle `tumme-dired-disp-props'." | |
974 (interactive) | |
975 (setq tumme-dired-disp-props | |
976 (not tumme-dired-disp-props)) | |
977 (message "Dired display properties %s." | |
978 (if tumme-dired-disp-props | |
979 "on" | |
980 "off"))) | |
981 | |
982 (defvar tumme-thumbnail-buffer "*tumme*" | |
983 "Tumme's thumbnail buffer.") | |
984 | |
985 (defun tumme-create-thumbnail-buffer () | |
986 "Create thumb buffer and set `tumme-thumbnail-mode'." | |
987 (let ((buf (get-buffer-create tumme-thumbnail-buffer))) | |
988 (save-excursion | |
989 (set-buffer buf) | |
990 (setq buffer-read-only t) | |
991 (if (not (eq major-mode 'tumme-thumbnail-mode)) | |
992 (tumme-thumbnail-mode))) | |
993 buf)) | |
994 | |
995 (defvar tumme-display-image-buffer "*tumme-display-image*" | |
996 "Where larger versions of the images are display.") | |
997 | |
998 (defun tumme-create-display-image-buffer () | |
999 "Create image display buffer and set `tumme-display-image-mode'." | |
1000 (let ((buf (get-buffer-create tumme-display-image-buffer))) | |
1001 (save-excursion | |
1002 (set-buffer buf) | |
1003 (setq buffer-read-only t) | |
1004 (if (not (eq major-mode 'tumme-display-image-mode)) | |
1005 (tumme-display-image-mode))) | |
1006 buf)) | |
1007 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1008 (defvar tumme-saved-window-configuration nil |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1009 "Saved window configuration.") |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1010 |
68404 | 1011 ;;;###autoload |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1012 (defun tumme-dired-with-window-configuration (dir &optional arg) |
67302 | 1013 "Open directory DIR and create a default window configuration. |
1014 | |
1015 Convenience command that: | |
1016 | |
1017 - Opens dired in folder DIR | |
1018 - Splits windows in most useful (?) way | |
1019 - Set `truncate-lines' to t | |
1020 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1021 After the command has finished, you would typically mark some |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1022 image files in dired and call `tumme-display-thumbs' (by default |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1023 bound to C-t d). |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1024 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1025 If called with prefix argument ARG, skip splitting of windows. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1026 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1027 The current window configuration is saved and can be restored by |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1028 calling `tumme-restore-window-configuration'." |
67302 | 1029 (interactive "DDirectory: \nP") |
1030 (let ((buf (tumme-create-thumbnail-buffer)) | |
1031 (buf2 (tumme-create-display-image-buffer))) | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1032 (setq tumme-saved-window-configuration |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1033 (current-window-configuration)) |
67302 | 1034 (dired dir) |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1035 (delete-other-windows) |
67302 | 1036 (when (not arg) |
1037 (split-window-horizontally) | |
1038 (setq truncate-lines t) | |
1039 (save-excursion | |
1040 (other-window 1) | |
1041 (switch-to-buffer buf) | |
1042 (split-window-vertically) | |
1043 (other-window 1) | |
1044 (switch-to-buffer buf2) | |
1045 (other-window -2))))) | |
1046 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1047 (defun tumme-restore-window-configuration () |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1048 "Restore window configuration. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1049 Restore any changes to the window configuration made by calling |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
1050 `tumme-dired-with-window-configuration'." |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1051 (interactive) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1052 (if tumme-saved-window-configuration |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1053 (set-window-configuration tumme-saved-window-configuration) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1054 (message "No saved window configuration"))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1055 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1056 ;;;###autoload |
67302 | 1057 (defun tumme-display-thumbs (&optional arg append) |
1058 "Display thumbnails of all marked files, in `tumme-thumbnail-buffer'. | |
1059 If a thumbnail image does not exist for a file, it is created on the | |
1060 fly. With prefix argument ARG, display only thumbnail for file at | |
1061 point (this is useful if you have marked some files but want to show | |
1062 another one). | |
1063 | |
1064 Recommended usage is to split the current frame horizontally so that | |
1065 you have the dired buffer in the left window and the | |
1066 `tumme-thumbnail-buffer' buffer in the right window. | |
1067 | |
1068 With optional argument APPEND, append thumbnail to thumbnail buffer | |
1069 instead of erasing it first." | |
1070 (interactive "P") | |
1071 (let ((buf (tumme-create-thumbnail-buffer)) | |
1072 curr-file thumb-name files count dired-buf beg) | |
1073 (if arg | |
1074 (setq files (list (dired-get-filename))) | |
1075 (setq files (dired-get-marked-files))) | |
1076 (setq dired-buf (current-buffer)) | |
1077 (save-excursion | |
1078 (set-buffer buf) | |
1079 (let ((inhibit-read-only t)) | |
1080 (if (not append) | |
1081 (erase-buffer) | |
1082 (goto-char (point-max))) | |
1083 (mapcar | |
1084 (lambda (curr-file) | |
1085 (setq thumb-name (tumme-thumb-name curr-file)) | |
1086 (if (and (not (file-exists-p thumb-name)) | |
1087 (not (= 0 (tumme-create-thumb curr-file thumb-name)))) | |
1088 (message "Thumb could not be created for file %s" curr-file) | |
1089 (tumme-insert-thumbnail thumb-name curr-file dired-buf))) | |
1090 files)) | |
1091 (cond ((eq 'dynamic tumme-line-up-method) | |
1092 (tumme-line-up-dynamic)) | |
1093 ((eq 'fixed tumme-line-up-method) | |
1094 (tumme-line-up)) | |
1095 ((eq 'interactive tumme-line-up-method) | |
1096 (tumme-line-up-interactive)) | |
1097 ((eq 'none tumme-line-up-method) | |
1098 nil) | |
1099 (t | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1100 (tumme-line-up-dynamic)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1101 (pop-to-buffer tumme-thumbnail-buffer))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1102 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1103 (defun tumme-show-all-from-dir (dir) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1104 "Make a preview buffer for all images in DIR and display it. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1105 If the number of files in DIR matching `image-file-name-regexp' |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1106 exceeds `tumme-show-all-from-dir-max-files', a warning will be |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1107 displayed." |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1108 (interactive "DDir: ") |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1109 (dired dir) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1110 (dired-mark-files-regexp (image-file-name-regexp)) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1111 (let ((files (dired-get-marked-files))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1112 (if (or (<= (length files) tumme-show-all-from-dir-max-files) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1113 (and (> (length files) tumme-show-all-from-dir-max-files) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1114 (y-or-n-p |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1115 (format |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1116 "Directory contains more than %d image files. Proceed? " |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1117 tumme-show-all-from-dir-max-files)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1118 (progn |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1119 (tumme-display-thumbs) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1120 (pop-to-buffer tumme-thumbnail-buffer)) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1121 (message "Cancelled.")))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1122 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1123 ;;;###autoload |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1124 (defalias 'tumme 'tumme-show-all-from-dir) |
67302 | 1125 |
1126 (defun tumme-write-tag (files tag) | |
1127 "For all FILES, writes TAG to the image database." | |
1128 (save-excursion | |
1129 (let (end buf) | |
1130 (setq buf (find-file tumme-db-file)) | |
1131 (if (not (listp files)) | |
1132 (if (stringp files) | |
1133 (setq files (list files)) | |
1134 (error "Files must be a string or a list of strings!"))) | |
1135 (mapcar | |
1136 (lambda (file) | |
1137 (goto-char (point-min)) | |
1138 (if (search-forward-regexp | |
1139 (format "^%s" file) nil t) | |
1140 (progn | |
1141 (end-of-line) | |
1142 (setq end (point)) | |
1143 (beginning-of-line) | |
1144 (if (not (search-forward (format ";%s" tag) end t)) | |
1145 (progn | |
1146 (end-of-line) | |
1147 (insert (format ";%s" tag))))) | |
1148 (goto-char (point-max)) | |
1149 (insert (format "\n%s;%s" file tag)))) | |
1150 files) | |
1151 (save-buffer) | |
1152 (kill-buffer buf)))) | |
1153 | |
1154 (defun tumme-remove-tag (files tag) | |
1155 "For all FILES, remove TAG from the image database." | |
1156 (save-excursion | |
1157 (let (end buf start) | |
1158 (setq buf (find-file tumme-db-file)) | |
1159 (if (not (listp files)) | |
1160 (if (stringp files) | |
1161 (setq files (list files)) | |
1162 (error "Files must be a string or a list of strings!"))) | |
1163 (mapcar | |
1164 (lambda (file) | |
1165 (goto-char (point-min)) | |
1166 (if (search-forward-regexp | |
1167 (format "^%s" file) nil t) | |
1168 (progn | |
1169 (end-of-line) | |
1170 (setq end (point)) | |
1171 (beginning-of-line) | |
1172 (if (search-forward-regexp (format "\\(;%s\\)" tag) end t) | |
1173 (progn | |
1174 (delete-region (match-beginning 1) (match-end 1)) | |
1175 ;; Check if file should still be in the database. If | |
1176 ;; it has no tags or comments, it will be removed. | |
1177 (end-of-line) | |
1178 (setq end (point)) | |
1179 (beginning-of-line) | |
1180 (if (not (search-forward ";" end t)) | |
1181 (progn | |
1182 (kill-line 1) | |
1183 ;; If on empty line at end of buffer | |
1184 (if (and (eobp) | |
1185 (looking-at "^$")) | |
1186 (delete-backward-char 1))))))))) | |
1187 files) | |
1188 (save-buffer) | |
1189 (kill-buffer buf)))) | |
1190 | |
1191 (defun tumme-list-tags (file) | |
1192 "Read all tags for image FILE from the image database." | |
1193 (save-excursion | |
1194 (let (end buf (tags "")) | |
1195 (setq buf (find-file tumme-db-file)) | |
1196 (goto-char (point-min)) | |
1197 (if (search-forward-regexp | |
1198 (format "^%s" file) nil t) | |
1199 (progn | |
1200 (end-of-line) | |
1201 (setq end (point)) | |
1202 (beginning-of-line) | |
1203 (if (search-forward ";" end t) | |
1204 (if (search-forward "comment:" end t) | |
1205 (if (search-forward ";" end t) | |
1206 (setq tags (buffer-substring (point) end))) | |
1207 (setq tags (buffer-substring (point) end)))))) | |
1208 (kill-buffer buf) | |
1209 (split-string tags ";")))) | |
1210 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1211 ;;;###autoload |
67302 | 1212 (defun tumme-tag-files (arg) |
1213 "Tag marked file(s) in dired. With prefix ARG, tag file at point." | |
1214 (interactive "P") | |
1215 (let ((tag (read-string "Tag to add: ")) | |
1216 curr-file files) | |
1217 (if arg | |
1218 (setq files (dired-get-filename)) | |
1219 (setq files (dired-get-marked-files))) | |
1220 (tumme-write-tag files tag))) | |
1221 | |
1222 (defun tumme-tag-thumbnail () | |
1223 "Tag current thumbnail." | |
1224 (interactive) | |
1225 (let ((tag (read-string "Tag to add: "))) | |
1226 (tumme-write-tag (tumme-original-file-name) tag)) | |
1227 (tumme-update-property | |
1228 'tags (tumme-list-tags (tumme-original-file-name)))) | |
1229 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1230 ;;;###autoload |
67302 | 1231 (defun tumme-tag-remove (arg) |
1232 "Remove tag for selected file(s). | |
1233 With prefix argument ARG, remove tag from file at point." | |
1234 (interactive "P") | |
1235 (let ((tag (read-string "Tag to remove: ")) | |
1236 files) | |
1237 (if arg | |
1238 (setq files (list (dired-get-filename))) | |
1239 (setq files (dired-get-marked-files))) | |
1240 (tumme-remove-tag files tag))) | |
1241 | |
1242 (defun tumme-tag-thumbnail-remove () | |
1243 "Remove tag from thumbnail." | |
1244 (interactive) | |
1245 (let ((tag (read-string "Tag to remove: "))) | |
1246 (tumme-remove-tag (tumme-original-file-name) tag)) | |
1247 (tumme-update-property | |
1248 'tags (tumme-list-tags (tumme-original-file-name)))) | |
1249 | |
1250 (defun tumme-original-file-name () | |
1251 "Get original file name for thumbnail or display image at point." | |
1252 (get-text-property (point) 'original-file-name)) | |
1253 | |
1254 (defun tumme-associated-dired-buffer () | |
1255 "Get associated dired buffer at point." | |
1256 (get-text-property (point) 'associated-dired-buffer)) | |
1257 | |
1258 (defun tumme-get-buffer-window (buf) | |
1259 "Return window where buffer BUF is." | |
1260 (get-window-with-predicate | |
1261 (lambda (window) | |
1262 (equal (window-buffer window) buf)) | |
1263 nil t)) | |
1264 | |
1265 (defun tumme-track-original-file () | |
1266 "Track the original file in the associated dired buffer. | |
1267 See documentation for `tumme-toggle-movement-tracking'. Interactive | |
1268 use only useful if `tumme-track-movement' is nil." | |
1269 (interactive) | |
1270 (let ((old-buf (current-buffer)) | |
1271 (dired-buf (tumme-associated-dired-buffer)) | |
1272 (file-name (tumme-original-file-name))) | |
1273 (if (and dired-buf file-name) | |
1274 (progn | |
1275 (setq file-name (file-name-nondirectory file-name)) | |
1276 (set-buffer dired-buf) | |
1277 (goto-char (point-min)) | |
1278 (if (not (search-forward file-name nil t)) | |
1279 (message "Could not track file") | |
1280 (dired-move-to-filename) | |
1281 (set-window-point | |
1282 (tumme-get-buffer-window dired-buf) (point))) | |
1283 (set-buffer old-buf))))) | |
1284 | |
1285 (defun tumme-toggle-movement-tracking () | |
1286 "Turn on and off `tumme-track-movement'. | |
1287 Tracking of the movements between thumbnail and dired buffer so that | |
1288 they are \"mirrored\" in the dired buffer. When this is on, moving | |
1289 around in the thumbnail or dired buffer will find the matching | |
1290 position in the other buffer." | |
1291 (interactive) | |
1292 (setq tumme-track-movement (not tumme-track-movement)) | |
1293 (message "Tracking %s" (if tumme-track-movement "on" "off"))) | |
1294 | |
1295 (defun tumme-track-thumbnail () | |
1296 "Track current dired file's thumb in `tumme-thumbnail-buffer'. | |
1297 This is almost the same as what `tumme-track-original-file' does, but | |
1298 the other way around." | |
1299 (let ((file (dired-get-filename)) | |
1300 (old-buf (current-buffer)) | |
1301 prop-val found) | |
1302 (if (get-buffer tumme-thumbnail-buffer) | |
1303 (progn | |
1304 (set-buffer tumme-thumbnail-buffer) | |
1305 (goto-char (point-min)) | |
1306 (while (and (not (eobp)) | |
1307 (not found)) | |
1308 (if (and (setq prop-val | |
1309 (get-text-property (point) 'original-file-name)) | |
1310 (string= prop-val file)) | |
1311 (setq found t)) | |
1312 (if (not found) | |
1313 (forward-char 1))) | |
1314 (if found | |
1315 (progn | |
1316 (set-window-point | |
1317 (tumme-thumbnail-window) (point)) | |
1318 (tumme-display-thumb-properties))) | |
1319 (set-buffer old-buf))))) | |
1320 | |
1321 (defun tumme-dired-next-line (&optional arg) | |
1322 "Call `dired-next-line', then track thumbnail. | |
1323 This can safely replace `dired-next-line'. With prefix argument, move | |
1324 ARG lines." | |
1325 (interactive "P") | |
1326 (dired-next-line (or arg 1)) | |
1327 (if tumme-track-movement | |
1328 (tumme-track-thumbnail))) | |
1329 | |
1330 (defun tumme-dired-previous-line (&optional arg) | |
1331 "Call `dired-previous-line', then track thumbnail. | |
1332 This can safely replace `dired-previous-line'. With prefix argument, | |
1333 move ARG lines." | |
1334 (interactive "P") | |
1335 (dired-previous-line (or arg 1)) | |
1336 (if tumme-track-movement | |
1337 (tumme-track-thumbnail))) | |
1338 | |
1339 (defun tumme-forward-char () | |
1340 "Move to next image and display properties." | |
1341 (interactive) | |
1342 ;; Before we move, make sure that there is an image two positions | |
1343 ;; forward. | |
1344 (if (save-excursion | |
1345 (forward-char 2) | |
1346 (tumme-image-at-point-p)) | |
1347 (progn | |
1348 (forward-char) | |
1349 (while (and (not (eobp)) | |
1350 (not (tumme-image-at-point-p))) | |
1351 (forward-char)) | |
1352 (if tumme-track-movement | |
1353 (tumme-track-original-file)))) | |
1354 (tumme-display-thumb-properties)) | |
1355 | |
1356 (defun tumme-backward-char () | |
1357 "Move to previous image and display properties." | |
1358 (interactive) | |
1359 (if (not (bobp)) | |
1360 (progn | |
1361 (backward-char) | |
1362 (while (and (not (bobp)) | |
1363 (not (tumme-image-at-point-p))) | |
1364 (backward-char)) | |
1365 (if tumme-track-movement | |
1366 (tumme-track-original-file)))) | |
1367 (tumme-display-thumb-properties)) | |
1368 | |
1369 (defun tumme-next-line () | |
1370 "Move to next line and display properties." | |
1371 (interactive) | |
1372 (next-line 1) | |
1373 ;; If we end up in an empty spot, back up to the next thumbnail. | |
1374 (if (not (tumme-image-at-point-p)) | |
1375 (tumme-backward-char)) | |
1376 (if tumme-track-movement | |
1377 (tumme-track-original-file)) | |
1378 (tumme-display-thumb-properties)) | |
1379 | |
1380 | |
1381 (defun tumme-previous-line () | |
1382 "Move to previous line and display properties." | |
1383 (interactive) | |
1384 (previous-line 1) | |
1385 ;; If we end up in an empty spot, back up to the next | |
1386 ;; thumbnail. This should only happen if the user deleted a | |
1387 ;; thumbnail and did not refresh, so it is not very common. But we | |
1388 ;; can handle it in a good manner, so why not? | |
1389 (if (not (tumme-image-at-point-p)) | |
1390 (tumme-backward-char)) | |
1391 (if tumme-track-movement | |
1392 (tumme-track-original-file)) | |
1393 (tumme-display-thumb-properties)) | |
1394 | |
1395 (defun tumme-format-properties-string (buf file props comment) | |
1396 "Format display properties. | |
1397 BUF is the associated dired buffer, FILE is the original image file | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
1398 name, PROPS is a list of tags and COMMENT is the image files's |
67302 | 1399 comment." |
1400 (format-spec | |
1401 tumme-display-properties-format | |
1402 (list | |
1403 (cons ?b buf) | |
1404 (cons ?f file) | |
1405 (cons ?t (or (princ props) "")) | |
1406 (cons ?c (or comment ""))))) | |
1407 | |
1408 (defun tumme-display-thumb-properties () | |
1409 "Display thumbnail properties in the echo area." | |
1410 (if (not (eobp)) | |
1411 (let ((file-name (file-name-nondirectory (tumme-original-file-name))) | |
1412 (dired-buf (buffer-name (tumme-associated-dired-buffer))) | |
1413 (props (mapconcat | |
1414 'princ | |
1415 (get-text-property (point) 'tags) | |
1416 ", ")) | |
1417 (comment (get-text-property (point) 'comment))) | |
1418 (if file-name | |
1419 (message | |
1420 (tumme-format-properties-string | |
1421 dired-buf | |
1422 file-name | |
1423 props | |
1424 comment)))))) | |
1425 | |
1426 (defun tumme-dired-file-marked-p () | |
1427 "Check whether file on current line is marked or not." | |
1428 (save-excursion | |
1429 (beginning-of-line) | |
1430 (not (looking-at "^ .*$")))) | |
1431 | |
1432 (defun tumme-modify-mark-on-thumb-original-file (command) | |
1433 "Modify mark in dired buffer. | |
1434 This is quite ugly but I don't know how to implemented in a better | |
1435 way. COMMAND is one of 'mark for marking file in dired, 'unmark for | |
1436 unmarking file in dired or 'flag for flagging file for delete in | |
1437 dired." | |
1438 (let ((file-name (tumme-original-file-name)) | |
1439 (dired-buf (tumme-associated-dired-buffer))) | |
1440 (if (not (and dired-buf file-name)) | |
1441 (message "No image, or image with correct properties, at point.") | |
1442 (save-excursion | |
1443 (message file-name) | |
1444 (setq file-name (file-name-nondirectory file-name)) | |
1445 (set-buffer dired-buf) | |
1446 (goto-char (point-min)) | |
1447 (if (search-forward file-name nil t) | |
1448 (cond ((eq command 'mark) (dired-mark 1)) | |
1449 ((eq command 'unmark) (dired-unmark 1)) | |
1450 ((eq command 'toggle) | |
1451 (if (tumme-dired-file-marked-p) | |
1452 (dired-unmark 1) | |
1453 (dired-mark 1))) | |
1454 ((eq command 'flag) (dired-flag-file-deletion 1)))))))) | |
1455 | |
1456 (defun tumme-mark-thumb-original-file () | |
1457 "Mark original image file in associated dired buffer." | |
1458 (interactive) | |
1459 (tumme-modify-mark-on-thumb-original-file 'mark) | |
1460 (tumme-forward-char)) | |
1461 | |
1462 (defun tumme-unmark-thumb-original-file () | |
1463 "Unmark original image file in associated dired buffer." | |
1464 (interactive) | |
1465 (tumme-modify-mark-on-thumb-original-file 'unmark) | |
1466 (tumme-forward-char)) | |
1467 | |
1468 (defun tumme-flag-thumb-original-file () | |
1469 "Flag original image file for deletion in associated dired buffer." | |
1470 (interactive) | |
1471 (tumme-modify-mark-on-thumb-original-file 'flag) | |
1472 (tumme-forward-char)) | |
1473 | |
1474 (defun tumme-toggle-mark-thumb-original-file () | |
1475 "Toggle mark on original image file in associated dired buffer." | |
1476 (interactive) | |
1477 (tumme-modify-mark-on-thumb-original-file 'toggle)) | |
1478 | |
1479 (defun tumme-jump-original-dired-buffer () | |
1480 "Jump to the dired buffer associated with the current image file. | |
1481 You probably want to use this together with | |
1482 `tumme-track-original-file'." | |
1483 (interactive) | |
1484 (let ((buf (tumme-associated-dired-buffer)) | |
1485 window frame) | |
1486 (setq window (tumme-get-buffer-window buf)) | |
1487 (if window | |
1488 (progn | |
1489 (if (not (equal (selected-frame) (setq frame (window-frame window)))) | |
1490 (select-frame-set-input-focus frame)) | |
1491 (select-window window)) | |
1492 (message "Associated dired buffer not visible")))) | |
1493 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1494 ;;;###autoload |
67302 | 1495 (defun tumme-jump-thumbnail-buffer () |
1496 "Jump to thumbnail buffer." | |
1497 (interactive) | |
1498 (let ((window (tumme-thumbnail-window)) | |
1499 frame) | |
1500 (if window | |
1501 (progn | |
1502 (if (not (equal (selected-frame) (setq frame (window-frame window)))) | |
1503 (select-frame-set-input-focus frame)) | |
1504 (select-window window)) | |
1505 (message "Thumbnail buffer not visible")))) | |
1506 | |
1507 (defvar tumme-thumbnail-mode-map (make-sparse-keymap) | |
1508 "Keymap for `tumme-thumbnail-mode'.") | |
1509 | |
1510 (defvar tumme-thumbnail-mode-line-up-map (make-sparse-keymap) | |
1511 "Keymap for line-up commands in `tumme-thumbnail-mode'.") | |
1512 | |
1513 (defvar tumme-thumbnail-mode-tag-map (make-sparse-keymap) | |
1514 "Keymap for tag commands in `tumme-thumbnail-mode'.") | |
1515 | |
1516 (defun tumme-define-thumbnail-mode-keymap () | |
1517 "Define keymap for `tumme-thumbnail-mode'." | |
1518 | |
1519 ;; Keys | |
1520 (define-key tumme-thumbnail-mode-map [right] 'tumme-forward-char) | |
1521 (define-key tumme-thumbnail-mode-map [left] 'tumme-backward-char) | |
1522 (define-key tumme-thumbnail-mode-map [up] 'tumme-previous-line) | |
1523 (define-key tumme-thumbnail-mode-map [down] 'tumme-next-line) | |
1524 (define-key tumme-thumbnail-mode-map "\C-f" 'tumme-forward-char) | |
1525 (define-key tumme-thumbnail-mode-map "\C-b" 'tumme-backward-char) | |
1526 (define-key tumme-thumbnail-mode-map "\C-p" 'tumme-previous-line) | |
1527 (define-key tumme-thumbnail-mode-map "\C-n" 'tumme-next-line) | |
1528 | |
1529 (define-key tumme-thumbnail-mode-map "d" 'tumme-flag-thumb-original-file) | |
1530 (define-key tumme-thumbnail-mode-map [delete] | |
1531 'tumme-flag-thumb-original-file) | |
1532 (define-key tumme-thumbnail-mode-map "m" 'tumme-mark-thumb-original-file) | |
1533 (define-key tumme-thumbnail-mode-map "u" 'tumme-unmark-thumb-original-file) | |
1534 (define-key tumme-thumbnail-mode-map "." 'tumme-track-original-file) | |
1535 (define-key tumme-thumbnail-mode-map [tab] 'tumme-jump-original-dired-buffer) | |
1536 | |
1537 ;; add line-up map | |
1538 (define-key tumme-thumbnail-mode-map "g" tumme-thumbnail-mode-line-up-map) | |
1539 | |
1540 ;; map it to "g" so that the user can press it more quickly | |
1541 (define-key tumme-thumbnail-mode-line-up-map "g" 'tumme-line-up-dynamic) | |
1542 ;; "f" for "fixed" number of thumbs per row | |
1543 (define-key tumme-thumbnail-mode-line-up-map "f" 'tumme-line-up) | |
1544 ;; "i" for "interactive" | |
1545 (define-key tumme-thumbnail-mode-line-up-map "i" 'tumme-line-up-interactive) | |
1546 | |
1547 ;; add tag map | |
1548 (define-key tumme-thumbnail-mode-map "t" tumme-thumbnail-mode-tag-map) | |
1549 | |
1550 ;; map it to "t" so that the user can press it more quickly | |
1551 (define-key tumme-thumbnail-mode-tag-map "t" 'tumme-tag-thumbnail) | |
1552 ;; "r" for "remove" | |
1553 (define-key tumme-thumbnail-mode-tag-map "r" 'tumme-tag-thumbnail-remove) | |
1554 | |
1555 (define-key tumme-thumbnail-mode-map "\C-m" | |
1556 'tumme-display-thumbnail-original-image) | |
1557 (define-key tumme-thumbnail-mode-map [C-return] | |
1558 'tumme-thumbnail-display-external) | |
1559 | |
1560 (define-key tumme-thumbnail-mode-map "l" 'tumme-rotate-thumbnail-left) | |
1561 (define-key tumme-thumbnail-mode-map "r" 'tumme-rotate-thumbnail-right) | |
1562 | |
1563 (define-key tumme-thumbnail-mode-map "L" 'tumme-rotate-original-left) | |
1564 (define-key tumme-thumbnail-mode-map "R" 'tumme-rotate-original-right) | |
1565 | |
1566 (define-key tumme-thumbnail-mode-map "D" 'tumme-thumbnail-set-image-description) | |
1567 | |
1568 (define-key tumme-thumbnail-mode-map "\C-d" 'tumme-delete-char) | |
1569 (define-key tumme-thumbnail-mode-map " " | |
1570 'tumme-display-next-thumbnail-original) | |
1571 (define-key tumme-thumbnail-mode-map | |
1572 (kbd "DEL") 'tumme-display-previous-thumbnail-original) | |
1573 (define-key tumme-thumbnail-mode-map "c" 'tumme-comment-thumbnail) | |
1574 (define-key tumme-thumbnail-mode-map "q" 'tumme-kill-buffer-and-window) | |
1575 | |
1576 ;; Mouse | |
1577 (define-key tumme-thumbnail-mode-map [mouse-2] 'tumme-mouse-display-image) | |
1578 (define-key tumme-thumbnail-mode-map [mouse-1] 'tumme-mouse-select-thumbnail) | |
1579 | |
1580 ;; Seems I must first set C-down-mouse-1 to undefined, or else it | |
1581 ;; will trigger the buffer menu. If I try to instead bind | |
1582 ;; C-down-mouse-1 to `tumme-mouse-toggle-mark', I get a message | |
1583 ;; about C-mouse-1 not being defined afterwards. Annoying, but I | |
1584 ;; probably do not completely understand mouse events. | |
1585 | |
1586 (define-key tumme-thumbnail-mode-map [C-down-mouse-1] 'undefined) | |
1587 (define-key tumme-thumbnail-mode-map [C-mouse-1] 'tumme-mouse-toggle-mark) | |
1588 | |
1589 ;; Menu | |
1590 (define-key tumme-thumbnail-mode-map [menu-bar tumme] | |
1591 (cons "Tumme" (make-sparse-keymap "Tumme"))) | |
1592 | |
1593 (define-key tumme-thumbnail-mode-map | |
1594 [menu-bar tumme tumme-kill-buffer-and-window] | |
1595 '("Quit" . tumme-kill-buffer-and-window)) | |
1596 | |
1597 (define-key tumme-thumbnail-mode-map | |
1598 [menu-bar tumme tumme-delete-char] | |
1599 '("Delete thumbnail from buffer" . tumme-delete-char)) | |
1600 | |
1601 (define-key tumme-thumbnail-mode-map | |
1602 [menu-bar tumme tumme-tag-thumbnail-remove] | |
1603 '("Remove tag from thumbnail" . tumme-tag-thumbnail-remove)) | |
1604 | |
1605 (define-key tumme-thumbnail-mode-map | |
1606 [menu-bar tumme tumme-tag-thumbnail] | |
1607 '("Tag thumbnail" . tumme-tag-thumbnail)) | |
1608 | |
1609 (define-key tumme-thumbnail-mode-map | |
1610 [menu-bar tumme tumme-comment-thumbnail] | |
1611 '("Comment thumbnail" . tumme-comment-thumbnail)) | |
1612 | |
1613 (define-key tumme-thumbnail-mode-map | |
1614 [menu-bar tumme tumme-refresh-thumb] | |
1615 '("Refresh thumb" . tumme-refresh-thumb)) | |
1616 (define-key tumme-thumbnail-mode-map | |
1617 [menu-bar tumme tumme-line-up-dynamic] | |
1618 '("Dynamic line up" . tumme-line-up-dynamic)) | |
1619 (define-key tumme-thumbnail-mode-map | |
1620 [menu-bar tumme tumme-line-up] | |
1621 '("Line up thumbnails" . tumme-line-up)) | |
1622 | |
1623 (define-key tumme-thumbnail-mode-map | |
1624 [menu-bar tumme tumme-rotate-thumbnail-left] | |
1625 '("Rotate thumbnail left" . tumme-rotate-thumbnail-left)) | |
1626 (define-key tumme-thumbnail-mode-map | |
1627 [menu-bar tumme tumme-rotate-thumbnail-right] | |
1628 '("Rotate thumbnail right" . tumme-rotate-thumbnail-right)) | |
1629 | |
1630 (define-key tumme-thumbnail-mode-map | |
1631 [menu-bar tumme tumme-rotate-original-left] | |
1632 '("Rotate original left" . tumme-rotate-original-left)) | |
1633 (define-key tumme-thumbnail-mode-map | |
1634 [menu-bar tumme tumme-rotate-original-right] | |
1635 '("Rotate original right" . tumme-rotate-original-right)) | |
1636 | |
1637 (define-key tumme-thumbnail-mode-map | |
1638 [menu-bar tumme tumme-toggle-movement-tracking] | |
1639 '("Toggle movement tracking on/off" . tumme-toggle-movement-tracking)) | |
1640 | |
1641 (define-key tumme-thumbnail-mode-map | |
1642 [menu-bar tumme tumme-jump-original-dired-buffer] | |
1643 '("Jump to dired buffer" . tumme-jump-original-dired-buffer)) | |
1644 (define-key tumme-thumbnail-mode-map | |
1645 [menu-bar tumme tumme-track-original-file] | |
1646 '("Track original" . tumme-track-original-file)) | |
1647 | |
1648 (define-key tumme-thumbnail-mode-map | |
1649 [menu-bar tumme tumme-flag-thumb-original-file] | |
1650 '("Flag original for deletion" . tumme-flag-thumb-original-file)) | |
1651 (define-key tumme-thumbnail-mode-map | |
1652 [menu-bar tumme tumme-unmark-thumb-original-file] | |
1653 '("Unmark original" . tumme-unmark-thumb-original-file)) | |
1654 (define-key tumme-thumbnail-mode-map | |
1655 [menu-bar tumme tumme-mark-thumb-original-file] | |
1656 '("Mark original" . tumme-mark-thumb-original-file)) | |
1657 | |
1658 (define-key tumme-thumbnail-mode-map | |
1659 [menu-bar tumme tumme-thumbnail-display-external] | |
1660 '("Display in external viewer" . tumme-thumbnail-display-external)) | |
1661 (define-key tumme-thumbnail-mode-map | |
1662 [menu-bar tumme tumme-display-thumbnail-original-image] | |
1663 '("Display image" . tumme-display-thumbnail-original-image))) | |
1664 | |
1665 (defvar tumme-display-image-mode-map (make-sparse-keymap) | |
1666 "Keymap for `tumme-display-image-mode'.") | |
1667 | |
1668 (defun tumme-define-display-image-mode-keymap () | |
1669 "Define keymap for `tumme-display-image-mode'." | |
1670 | |
1671 ;; Keys | |
1672 (define-key tumme-display-image-mode-map "q" 'tumme-kill-buffer-and-window) | |
1673 | |
1674 (define-key tumme-display-image-mode-map "f" | |
1675 'tumme-display-current-image-full) | |
1676 | |
1677 (define-key tumme-display-image-mode-map "s" | |
1678 'tumme-display-current-image-sized) | |
1679 | |
1680 ;; Menu | |
1681 (define-key tumme-display-image-mode-map [menu-bar tumme] | |
1682 (cons "Tumme" (make-sparse-keymap "Tumme"))) | |
1683 | |
1684 (define-key tumme-display-image-mode-map | |
1685 [menu-bar tumme tumme-kill-buffer-and-window] | |
1686 '("Quit" . tumme-kill-buffer-and-window)) | |
1687 | |
1688 (define-key tumme-display-image-mode-map | |
1689 [menu-bar tumme tumme-display-current-image-sized] | |
1690 '("Display original, sized to fit" . tumme-display-current-image-sized)) | |
1691 | |
1692 (define-key tumme-display-image-mode-map | |
1693 [menu-bar tumme tumme-display-current-image-full] | |
1694 '("Display original, full size" . tumme-display-current-image-full)) | |
1695 | |
1696 ) | |
1697 | |
1698 (defun tumme-display-current-image-full () | |
1699 "Display current image in full size." | |
1700 (interactive) | |
1701 (let ((file (tumme-original-file-name))) | |
1702 (if file | |
1703 (progn | |
1704 (tumme-display-image file t) | |
1705 (message "Full size image displayed")) | |
1706 (error "No original file name at point")))) | |
1707 | |
1708 (defun tumme-display-current-image-sized () | |
1709 "Display current image in sized to fit window dimensions." | |
1710 (interactive) | |
1711 (let ((file (tumme-original-file-name))) | |
1712 (if file | |
1713 (progn | |
1714 (tumme-display-image file) | |
1715 (message "Full size image displayed")) | |
1716 (error "No original file name at point")))) | |
1717 | |
1718 (define-derived-mode tumme-thumbnail-mode | |
1719 fundamental-mode "tumme-thumbnail" | |
1720 "Browse and manipulate thumbnail images using dired. | |
1721 Use `tumme-dired' and `tumme-setup-dired-keybindings' to get a | |
1722 nice setup to start with." | |
1723 (tumme-define-thumbnail-mode-keymap) | |
1724 (message "tumme-thumbnail-mode enabled")) | |
1725 | |
1726 (define-derived-mode tumme-display-image-mode | |
1727 fundamental-mode "tumme-image-display" | |
1728 "Mode for displaying and manipulating original image. | |
1729 Resized or in full-size." | |
1730 (tumme-define-display-image-mode-keymap) | |
1731 (message "tumme-display-image-mode enabled")) | |
1732 | |
68404 | 1733 ;;;###autoload |
67302 | 1734 (defun tumme-setup-dired-keybindings () |
1735 "Setup easy-to-use keybindings for the commands to be used in dired mode. | |
1736 Note that n, p and <down> and <up> will be hijacked and bound to | |
1737 `tumme-dired-x-line'." | |
1738 (interactive) | |
1739 | |
1740 ;; Hijack previous and next line movement. Let C-p and C-b be | |
1741 ;; though... | |
1742 | |
1743 (define-key dired-mode-map "p" 'tumme-dired-previous-line) | |
1744 (define-key dired-mode-map "n" 'tumme-dired-next-line) | |
1745 (define-key dired-mode-map [up] 'tumme-dired-previous-line) | |
1746 (define-key dired-mode-map [down] 'tumme-dired-next-line) | |
1747 | |
1748 (define-key dired-mode-map (kbd "C-S-n") 'tumme-next-line-and-display) | |
1749 (define-key dired-mode-map (kbd "C-S-p") 'tumme-previous-line-and-display) | |
1750 (define-key dired-mode-map (kbd "C-S-m") 'tumme-mark-and-display-next) | |
1751 | |
1752 (define-key dired-mode-map "\C-td" 'tumme-display-thumbs) | |
1753 (define-key dired-mode-map "\C-tt" 'tumme-tag-files) | |
1754 (define-key dired-mode-map "\C-tr" 'tumme-tag-remove) | |
1755 (define-key dired-mode-map [tab] 'tumme-jump-thumbnail-buffer) | |
1756 (define-key dired-mode-map "\C-ti" 'tumme-display-dired-image) | |
1757 (define-key dired-mode-map "\C-tx" 'tumme-dired-display-external) | |
1758 (define-key dired-mode-map "\C-ta" 'tumme-display-thumbs-append) | |
1759 (define-key dired-mode-map "\C-t." 'tumme-display-thumb) | |
1760 (define-key dired-mode-map "\C-tc" 'tumme-dired-comment-files) | |
1761 (define-key dired-mode-map "\C-tf" 'tumme-mark-tagged-files) | |
1762 | |
1763 ;; Menu for dired | |
1764 (define-key dired-mode-map [menu-bar tumme] | |
1765 (cons "Tumme" (make-sparse-keymap "Tumme"))) | |
1766 | |
1767 (define-key dired-mode-map [menu-bar tumme tumme-copy-with-exif-file-name] | |
1768 '("Copy with EXIF file name" . tumme-copy-with-exif-file-name)) | |
1769 | |
1770 (define-key dired-mode-map [menu-bar tumme tumme-dired-comment-files] | |
1771 '("Comment files" . tumme-dired-comment-files)) | |
1772 | |
1773 (define-key dired-mode-map [menu-bar tumme tumme-mark-tagged-files] | |
1774 '("Mark tagged files" . tumme-mark-tagged-files)) | |
1775 | |
1776 (define-key dired-mode-map [menu-bar tumme tumme-tag-remove] | |
1777 '("Remove tag from files" . tumme-tag-remove)) | |
1778 | |
1779 (define-key dired-mode-map [menu-bar tumme tumme-tag-files] | |
1780 '("Tag files" . tumme-tag-files)) | |
1781 | |
1782 (define-key dired-mode-map [menu-bar tumme tumme-jump-thumbnail-buffer] | |
1783 '("Jump to thumbnail buffer" . tumme-jump-thumbnail-buffer)) | |
1784 | |
1785 (define-key dired-mode-map [menu-bar tumme tumme-toggle-movement-tracking] | |
1786 '("Toggle movement tracking" . tumme-toggle-movement-tracking)) | |
1787 | |
1788 (define-key dired-mode-map | |
1789 [menu-bar tumme tumme-toggle-append-browsing] | |
1790 '("Toggle append browsing" . tumme-toggle-append-browsing)) | |
1791 | |
1792 (define-key dired-mode-map | |
1793 [menu-bar tumme tumme-toggle-disp-props] | |
1794 '("Toggle display properties" . tumme-toggle-dired-display-properties)) | |
1795 | |
1796 (define-key dired-mode-map | |
1797 [menu-bar tumme tumme-dired-display-external] | |
1798 '("Display in external viewer" . tumme-dired-display-external)) | |
1799 (define-key dired-mode-map | |
1800 [menu-bar tumme tumme-display-dired-image] | |
1801 '("Display image" . tumme-display-dired-image)) | |
1802 (define-key dired-mode-map | |
1803 [menu-bar tumme tumme-display-thumb] | |
1804 '("Display this thumbnail" . tumme-display-thumb)) | |
1805 (define-key dired-mode-map | |
1806 [menu-bar tumme tumme-display-thumbs-append] | |
1807 '("Display thumbnails append" . tumme-display-thumbs-append)) | |
1808 (define-key dired-mode-map | |
1809 [menu-bar tumme tumme-display-thumbs] | |
1810 '("Display thumbnails" . tumme-display-thumbs)) | |
1811 | |
1812 (define-key dired-mode-map | |
1813 [menu-bar tumme tumme-create-thumbs] | |
1814 '("Create thumbnails for marked files" . tumme-create-thumbs)) | |
1815 | |
1816 (define-key dired-mode-map | |
1817 [menu-bar tumme tumme-mark-and-display-next] | |
1818 '("Mark and display next" . tumme-mark-and-display-next)) | |
1819 (define-key dired-mode-map | |
1820 [menu-bar tumme tumme-previous-line-and-display] | |
1821 '("Display thumb for previous file" . tumme-previous-line-and-display)) | |
1822 (define-key dired-mode-map | |
1823 [menu-bar tumme tumme-next-line-and-display] | |
1824 '("Display thumb for next file" . tumme-next-line-and-display))) | |
1825 | |
1826 (defun tumme-create-thumbs (&optional arg) | |
1827 "Create thumbnail images for all marked files in dired. | |
1828 With prefix argument ARG, create thumbnails even if they already exist | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
1829 \(i.e. use this to refresh your thumbnails)." |
67302 | 1830 (interactive "P") |
1831 (let (curr-file thumb-name files count) | |
1832 (setq files (dired-get-marked-files)) | |
1833 (mapcar | |
1834 (lambda (curr-file) | |
1835 (setq thumb-name (tumme-thumb-name curr-file)) | |
1836 ;; If the user overrides the exist check, we must clear the | |
1837 ;; image cache so that if the user wants to display the | |
1838 ;; thumnail, it is not fetched from cache. | |
1839 (if arg | |
1840 (clear-image-cache)) | |
1841 (if (or (not (file-exists-p thumb-name)) | |
1842 arg) | |
1843 (if (not (= 0 (tumme-create-thumb curr-file | |
1844 (tumme-thumb-name curr-file)))) | |
1845 (error "Thumb could not be created")))) | |
1846 files))) | |
1847 | |
1848 (defvar tumme-slideshow-timer nil | |
1849 "Slideshow timer.") | |
1850 | |
1851 (defvar tumme-slideshow-count 0 | |
1852 "Keeping track on number of images in slideshow.") | |
1853 | |
1854 (defvar tumme-slideshow-times 0 | |
1855 "Number of pictures to display in slideshow.") | |
1856 | |
1857 (defun tumme-slideshow-step () | |
1858 "Step to next file, if `tumme-slideshow-times' has not been reached." | |
1859 (if (< tumme-slideshow-count tumme-slideshow-times) | |
1860 (progn | |
1861 (message "%s" (1+ tumme-slideshow-count)) | |
1862 (setq tumme-slideshow-count (1+ tumme-slideshow-count)) | |
1863 (tumme-next-line-and-display)) | |
1864 (tumme-slideshow-stop))) | |
1865 | |
1866 (defun tumme-slideshow-start () | |
1867 "Start slideshow. | |
1868 Ask user for number of images to show and the delay in between." | |
1869 (interactive) | |
1870 (setq tumme-slideshow-count 0) | |
1871 (setq tumme-slideshow-times (string-to-number (read-string "How many: "))) | |
1872 (let ((repeat (string-to-number | |
1873 (read-string | |
1874 "Delay, in seconds. Decimals are accepted : " "1")))) | |
1875 (setq tumme-slideshow-timer | |
1876 (run-with-timer | |
1877 0 repeat | |
1878 'tumme-slideshow-step)))) | |
1879 | |
1880 (defun tumme-slideshow-stop () | |
1881 "Cancel slideshow." | |
1882 (interactive) | |
1883 (cancel-timer tumme-slideshow-timer)) | |
1884 | |
1885 (defun tumme-delete-char () | |
1886 "Remove current thumbnail from thumbnail buffer and line up." | |
1887 (interactive) | |
1888 (let ((inhibit-read-only t)) | |
1889 (delete-char 1) | |
1890 (if (looking-at " ") | |
1891 (delete-char 1)))) | |
1892 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1893 ;;;###autoload |
67302 | 1894 (defun tumme-display-thumbs-append () |
1895 "Append thumbnails to `tumme-thumbnail-buffer'." | |
1896 (interactive) | |
1897 (tumme-display-thumbs nil t)) | |
1898 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1899 ;;;###autoload |
67302 | 1900 (defun tumme-display-thumb () |
1901 "Shorthard for `tumme-display-thumbs' with prefix argument." | |
1902 (interactive) | |
1903 (tumme-display-thumbs t)) | |
1904 | |
1905 (defun tumme-line-up () | |
1906 "Line up thumbnails according to `tumme-thumbs-per-row'. | |
1907 See also `tumme-line-up-dynamic'." | |
1908 (interactive) | |
1909 (let ((inhibit-read-only t)) | |
1910 (goto-char (point-min)) | |
1911 (while (and (not (tumme-image-at-point-p)) | |
1912 (not (eobp))) | |
1913 (delete-char 1)) | |
1914 (while (not (eobp)) | |
1915 (forward-char) | |
1916 (while (and (not (tumme-image-at-point-p)) | |
1917 (not (eobp))) | |
1918 (delete-char 1))) | |
1919 (goto-char (point-min)) | |
1920 (let ((count 0)) | |
1921 (while (not (eobp)) | |
1922 (forward-char) | |
1923 (if (= tumme-thumbs-per-row 1) | |
1924 (insert "\n") | |
1925 (insert " ") | |
1926 (setq count (1+ count)) | |
1927 (if (= count (- tumme-thumbs-per-row 1)) | |
1928 (progn | |
1929 (forward-char) | |
1930 (insert "\n") | |
1931 (setq count 0)))))) | |
1932 (goto-char (point-min)))) | |
1933 | |
1934 (defun tumme-line-up-dynamic () | |
1935 "Line up thumbnails images dynamically. | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
1936 Calculate how many thumbnails fit." |
67302 | 1937 (interactive) |
1938 (let* ((char-width (frame-char-width)) | |
1939 (width (tumme-window-width-pixels (tumme-thumbnail-window))) | |
1940 (tumme-thumbs-per-row | |
1941 (/ width | |
1942 (+ (* 2 tumme-thumb-relief) | |
1943 (* 2 tumme-thumb-margin) | |
1944 tumme-thumb-size char-width)))) | |
1945 (tumme-line-up))) | |
1946 | |
1947 (defun tumme-line-up-interactive () | |
1948 "Line up thumbnails interactively. | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
1949 Ask user how many thumbnails should be displayed per row." |
67302 | 1950 (interactive) |
1951 (let ((tumme-thumbs-per-row | |
1952 (string-to-number (read-string "How many thumbs per row: ")))) | |
1953 (if (not (> tumme-thumbs-per-row 0)) | |
1954 (message "Number must be greater than 0") | |
1955 (tumme-line-up)))) | |
1956 | |
1957 (defun tumme-thumbnail-display-external () | |
1958 "Display original image for thumbnail at point using external viewer." | |
1959 | |
1960 (interactive) | |
1961 (let ((file (tumme-original-file-name))) | |
1962 (if (not (tumme-image-at-point-p)) | |
1963 (message "No thumbnail at point") | |
1964 (if (not file) | |
1965 (message "No original file name found") | |
1966 (shell-command (format "%s \"%s\"" | |
1967 tumme-external-viewer | |
1968 file)))))) | |
1969 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1970 ;;;###autoload |
67302 | 1971 (defun tumme-dired-display-external () |
1972 "Display file at point using an external viewer." | |
1973 (interactive) | |
1974 (let ((file (dired-get-filename))) | |
1975 (shell-command (format "%s \"%s\"" | |
1976 tumme-external-viewer | |
1977 file)))) | |
1978 | |
1979 (defun tumme-window-width-pixels (window) | |
1980 "Calculate WINDOW width in pixels." | |
1981 (* (window-width window) (frame-char-width))) | |
1982 | |
1983 (defun tumme-window-height-pixels (window) | |
1984 "Calculate WINDOW height in pixels." | |
1985 ;; Note: The mode-line consumes one line | |
1986 (* (- (window-height window) 1) (frame-char-height))) | |
1987 | |
1988 (defun tumme-display-window () | |
1989 "Return window where `tumme-display-image-buffer' is visible." | |
1990 (get-window-with-predicate | |
1991 (lambda (window) | |
1992 (equal (buffer-name (window-buffer window)) tumme-display-image-buffer)) | |
1993 nil t)) | |
1994 | |
1995 (defun tumme-thumbnail-window () | |
1996 "Return window where `tumme-thumbnail-buffer' is visible." | |
1997 (get-window-with-predicate | |
1998 (lambda (window) | |
1999 (equal (buffer-name (window-buffer window)) tumme-thumbnail-buffer)) | |
2000 nil t)) | |
2001 | |
2002 (defun tumme-associated-dired-buffer-window () | |
2003 "Return window where associated dired buffer is visible." | |
2004 (let (buf) | |
2005 (if (tumme-image-at-point-p) | |
2006 (progn | |
2007 (setq buf (tumme-associated-dired-buffer)) | |
2008 (get-window-with-predicate | |
2009 (lambda (window) | |
2010 (equal (window-buffer window) buf)))) | |
2011 (error "No thumbnail image at point")))) | |
2012 | |
2013 (defun tumme-display-window-width () | |
2014 "Return width, in pixels, of tumme's image display window." | |
2015 (- (tumme-window-width-pixels (tumme-display-window)) | |
2016 tumme-display-window-width-correction)) | |
2017 | |
2018 (defun tumme-display-window-height () | |
2019 "Return height, in pixels, of tumme's image display window." | |
2020 (- (tumme-window-height-pixels (tumme-display-window)) | |
2021 tumme-display-window-height-correction)) | |
2022 | |
2023 (defun tumme-display-image (file &optional original-size) | |
2024 "Display image FILE in image buffer. | |
2025 Use this when you want to display the image, semi sized, in a window | |
2026 next to the thumbnail window - typically a three-window configuration | |
2027 with dired to the left, thumbnail window to the upper right and image | |
2028 window to the lower right. The image is sized to fit the display | |
2029 window (using a temporary file, don't worry). Because of this, it | |
2030 will not be as quick as opening it directly, but on most modern | |
2031 systems it should feel snappy enough. | |
2032 | |
2033 If optional argument ORIGINAL-SIZE is non-nil, display image in its | |
2034 original size." | |
2035 (let ((new-file (expand-file-name tumme-temp-image-file)) | |
2036 size-x size-y command ret) | |
2037 (setq file (expand-file-name file)) | |
2038 (if (not original-size) | |
2039 (progn | |
2040 (setq size-x (tumme-display-window-width)) | |
2041 (setq size-y (tumme-display-window-height)) | |
2042 (setq command | |
2043 (format-spec | |
2044 tumme-cmd-create-temp-image-options | |
2045 (list | |
2046 (cons ?p tumme-cmd-create-temp-image-program) | |
2047 (cons ?x size-x) | |
2048 (cons ?y size-y) | |
2049 (cons ?f file) | |
2050 (cons ?t new-file)))) | |
2051 (setq ret (shell-command command nil)) | |
2052 (if (not (= 0 ret)) | |
2053 (error "Could not resize image"))) | |
2054 (copy-file file new-file t)) | |
2055 (save-excursion | |
2056 (set-buffer (tumme-create-display-image-buffer)) | |
2057 (let ((inhibit-read-only t)) | |
2058 (erase-buffer) | |
2059 (clear-image-cache) | |
2060 (tumme-insert-image tumme-temp-image-file 'jpeg 0 0) | |
2061 (goto-char (point-min)) | |
2062 (tumme-update-property 'original-file-name file))))) | |
2063 | |
2064 (defun tumme-display-thumbnail-original-image (&optional arg) | |
2065 "Display current thumbnail's original image in display buffer. | |
2066 See documentation for `tumme-display-image' for more information. | |
2067 With prefix argument ARG, display image in its original size." | |
2068 (interactive "P") | |
2069 (let ((file (tumme-original-file-name))) | |
2070 (if (not (string-equal major-mode "tumme-thumbnail-mode")) | |
2071 (message "Not in tumme-thumbnail-mode") | |
2072 (if (not (tumme-image-at-point-p)) | |
2073 (message "No thumbnail at point") | |
2074 (if (not file) | |
2075 (message "No original file name found") | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2076 (tumme-display-image file arg) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2077 (display-buffer tumme-display-image-buffer)))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2078 |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
2079 ;;;###autoload |
67302 | 2080 (defun tumme-display-dired-image (&optional arg) |
2081 "Display current image file. | |
2082 See documentation for `tumme-display-image' for more information. | |
2083 With prefix argument ARG, display image in its original size." | |
2084 (interactive "P") | |
2085 (tumme-display-image (dired-get-filename) arg)) | |
2086 | |
2087 (defun tumme-image-at-point-p () | |
2088 "Return true if there is a tumme thumbnail at point." | |
2089 (get-text-property (point) 'tumme-thumbnail)) | |
2090 | |
2091 (defun tumme-rotate-thumbnail (degrees) | |
2092 "Rotate thumbnail DEGREES degrees." | |
2093 (if (not (tumme-image-at-point-p)) | |
2094 (message "No thumbnail at point") | |
2095 (let ((file (tumme-thumb-name (tumme-original-file-name))) | |
2096 command) | |
2097 (setq command (format-spec | |
2098 tumme-cmd-rotate-thumbnail-options | |
2099 (list | |
2100 (cons ?p tumme-cmd-rotate-thumbnail-program) | |
2101 (cons ?d degrees) | |
2102 (cons ?t (expand-file-name file))))) | |
2103 (shell-command command nil) | |
2104 ;; Clear the cache to refresh image. I wish I could just refresh | |
2105 ;; the current file but I do not know how to do that. Yet... | |
2106 (clear-image-cache)))) | |
2107 | |
2108 (defun tumme-rotate-thumbnail-left () | |
2109 "Rotate thumbnail left (counter clockwise) 90 degrees. | |
2110 The result of the rotation is displayed in the image display area | |
2111 and a confirmation is needed before the original image files is | |
2112 overwritten. This confirmation can be turned off using | |
2113 `tumme-rotate-original-ask-before-overwrite'." | |
2114 (interactive) | |
2115 (tumme-rotate-thumbnail "270")) | |
2116 | |
2117 (defun tumme-rotate-thumbnail-right () | |
2118 "Rotate thumbnail counter right (clockwise) 90 degrees. | |
2119 The result of the rotation is displayed in the image display area | |
2120 and a confirmation is needed before the original image files is | |
2121 overwritten. This confirmation can be turned off using | |
2122 `tumme-rotate-original-ask-before-overwrite'." | |
2123 (interactive) | |
2124 (tumme-rotate-thumbnail "90")) | |
2125 | |
2126 (defun tumme-refresh-thumb () | |
2127 "Force creation of new image for current thumbnail." | |
2128 (interactive) | |
2129 (let ((file (tumme-original-file-name))) | |
2130 (clear-image-cache) | |
2131 (tumme-create-thumb file (tumme-thumb-name file)))) | |
2132 | |
2133 (defun tumme-rotate-original (degrees) | |
2134 "Rotate original image DEGREES degrees." | |
2135 (if (not (tumme-image-at-point-p)) | |
2136 (message "No image at point") | |
2137 (let ((file (tumme-original-file-name)) | |
2138 command temp-file) | |
2139 (if (not (string-match "\.[jJ][pP[eE]?[gG]$" file)) | |
2140 (error "Only JPEG images can be rotated!")) | |
2141 (setq command (format-spec | |
2142 tumme-cmd-rotate-original-options | |
2143 (list | |
2144 (cons ?p tumme-cmd-rotate-original-program) | |
2145 (cons ?d degrees) | |
2146 (cons ?o (expand-file-name file)) | |
2147 (cons ?t tumme-temp-rotate-image-file)))) | |
2148 (if (not (= 0 (shell-command command nil))) | |
2149 (error "Could not rotate image") | |
2150 (tumme-display-image tumme-temp-rotate-image-file) | |
2151 (if (or (and tumme-rotate-original-ask-before-overwrite | |
2152 (y-or-n-p "Rotate to temp file OK. Overwrite original image? ")) | |
2153 (not tumme-rotate-original-ask-before-overwrite)) | |
2154 (progn | |
2155 (copy-file tumme-temp-rotate-image-file file t) | |
2156 (tumme-refresh-thumb)) | |
2157 (tumme-display-image file)))))) | |
2158 | |
2159 (defun tumme-rotate-original-left () | |
2160 "Rotate original image left (counter clockwise) 90 degrees." | |
2161 (interactive) | |
2162 (tumme-rotate-original "270")) | |
2163 | |
2164 (defun tumme-rotate-original-right () | |
2165 "Rotate original image right (clockwise) 90 degrees." | |
2166 (interactive) | |
2167 (tumme-rotate-original "90")) | |
2168 | |
2169 (defun tumme-get-exif-file-name (file) | |
2170 "Use the image's EXIF information to return a unique file name. | |
2171 The file name should be unique as long as you do not take more than | |
2172 one picture per second. The original file name is suffixed at the end | |
2173 for traceability. The format of the returned file name is | |
2174 YYYY_MM_DD_HH_MM_DD_ORIG_FILE_NAME.jpg. Used from | |
2175 `tumme-copy-with-exif-file-name'." | |
2176 (let (data no-exif-data-found) | |
2177 (if (not (string-match "\.[Jj][Pp][Ee]?[Gg]$" (expand-file-name file))) | |
2178 (progn | |
2179 (setq no-exif-data-found t) | |
2180 (setq data | |
2181 (format-time-string | |
2182 "%Y:%m:%d %H:%M:%S" | |
2183 (nth 5 (file-attributes (expand-file-name file)))))) | |
2184 (setq data (tumme-get-exif-data (expand-file-name file) "DateTimeOriginal"))) | |
2185 (while (string-match "[ :]" data) | |
2186 (setq data (replace-match "_" nil nil data))) | |
2187 (format "%s%s%s" data | |
2188 (if no-exif-data-found | |
2189 "_noexif_" | |
2190 "_") | |
2191 (file-name-nondirectory file)))) | |
2192 | |
2193 (defun tumme-thumbnail-set-image-description () | |
2194 "Set the ImageDescription EXIF tag for the original image. | |
2195 If the image already has a value for this tag, it is used as the | |
2196 default value at the prompt." | |
2197 (interactive) | |
2198 (if (not (tumme-image-at-point-p)) | |
2199 (message "No thumbnail at point") | |
2200 (let* ((file (tumme-original-file-name)) | |
2201 (old-value (tumme-get-exif-data file "ImageDescription"))) | |
2202 (if (eq 0 | |
2203 (tumme-set-exif-data file "ImageDescription" | |
2204 (read-string "Value of ImageDescription: " old-value))) | |
2205 (message "Successfully wrote ImageDescription tag.") | |
2206 (error "Could not write ImageDescription tag"))))) | |
2207 | |
2208 (defun tumme-set-exif-data (file tag-name tag-value) | |
2209 "In FILE, set EXIF tag TAG-NAME to value TAG-VALUE." | |
2210 (let (command) | |
2211 (setq command (format-spec | |
2212 tumme-cmd-write-exif-data-options | |
2213 (list | |
2214 (cons ?p tumme-cmd-write-exif-data-program) | |
2215 (cons ?f (expand-file-name file)) | |
2216 (cons ?t tag-name) | |
2217 (cons ?v tag-value)))) | |
2218 (shell-command command nil))) | |
2219 | |
2220 (defun tumme-get-exif-data (file tag-name) | |
2221 "From FILE, return EXIF tag TAG-NAME." | |
2222 (let ((buf (get-buffer-create "*tumme-get-exif-data*")) | |
2223 command tag-value) | |
2224 (setq command (format-spec | |
2225 tumme-cmd-read-exif-data-options | |
2226 (list | |
2227 (cons ?p tumme-cmd-read-exif-data-program) | |
2228 (cons ?f file) | |
2229 (cons ?t tag-name)))) | |
2230 (save-excursion | |
2231 (set-buffer buf) | |
2232 (delete-region (point-min) (point-max)) | |
2233 (if (not (eq (shell-command command buf) 0)) | |
2234 (error "Could not get EXIF tag") | |
2235 (goto-char (point-min)) | |
2236 ;; Clean buffer from newlines and carriage returns before | |
2237 ;; getting final info | |
2238 (while (search-forward-regexp "[\n\r]" nil t) | |
2239 (replace-match "" nil t)) | |
2240 (setq tag-value (buffer-substring (point-min) (point-max))))) | |
2241 tag-value)) | |
2242 | |
2243 (defun tumme-copy-with-exif-file-name () | |
2244 "Copy file with unique name to main image directory. | |
2245 Copy current or all marked files in dired to a new file in your main | |
2246 image directory, using a file name generated by | |
2247 `tumme-get-exif-file-name'. This might or might not be useful for | |
2248 other people, but I use it each time I fetch images from my digital | |
2249 camera, for copying the images into my main image directory. | |
2250 | |
2251 Typically I open up the folder where I store my incoming digital | |
2252 images, with file names like dscn0319.jpg, dscn0320.jpg etc., mark the | |
2253 files I want to copy into my main image directory, and execute this | |
2254 function. The result is a couple of new files in | |
2255 `tumme-main-image-directory' called 2005_05_08_12_52_00_dscn0319.jpg, | |
2256 2005_05_08_14_27_45_dscn0320.jpg etc. | |
2257 | |
2258 When the images are safely in my main image directory I start to | |
2259 browse and tag them using rest of the functionality in `tumme'." | |
2260 (interactive) | |
2261 (let (new-name | |
2262 (files (dired-get-marked-files))) | |
2263 (mapcar | |
2264 (lambda (curr-file) | |
2265 (setq new-name | |
2266 (format "%s/%s" | |
2267 (file-name-as-directory | |
2268 (expand-file-name tumme-main-image-directory)) | |
2269 (tumme-get-exif-file-name curr-file))) | |
2270 (message "Copying %s to %s" curr-file new-name) | |
2271 (copy-file curr-file new-name)) | |
2272 files))) | |
2273 | |
2274 (defun tumme-display-next-thumbnail-original () | |
2275 "In thubnail buffer, move to next thumbnail and display the image." | |
2276 (interactive) | |
2277 (tumme-forward-char) | |
2278 (tumme-display-thumbnail-original-image)) | |
2279 | |
2280 (defun tumme-display-previous-thumbnail-original () | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
2281 "Move to previous thumbnail and display image." |
67302 | 2282 |
2283 (interactive) | |
2284 (tumme-backward-char) | |
2285 (tumme-display-thumbnail-original-image)) | |
2286 | |
2287 (defun tumme-write-comment (file comment) | |
2288 "For FILE, write comment COMMENT in database." | |
2289 (save-excursion | |
2290 (let (end buf comment-beg | |
2291 (base-name (file-name-nondirectory file))) | |
2292 (setq buf (find-file tumme-db-file)) | |
2293 (goto-char (point-min)) | |
2294 (if (search-forward-regexp | |
2295 (format "^%s" base-name) nil t) | |
2296 (progn | |
2297 (end-of-line) | |
2298 (setq end (point)) | |
2299 (beginning-of-line) | |
2300 ;; Delete old comment, if any | |
2301 (cond ((search-forward ";comment:" end t) | |
2302 (setq comment-beg (match-beginning 0)) | |
2303 ;; Any tags after the comment? | |
2304 (if (search-forward ";" end t) | |
2305 (setq comment-end (- (point) 1)) | |
2306 (setq comment-end end)) | |
2307 ;; Delete comment tag and comment | |
2308 (delete-region comment-beg comment-end))) | |
2309 ;; Insert new comment | |
2310 (beginning-of-line) | |
2311 (if (not (search-forward ";" end t)) | |
2312 (progn | |
2313 (end-of-line) | |
2314 (insert ";"))) | |
2315 (insert (format "comment:%s;" comment))) | |
2316 ;; File does not exist in databse - add it. | |
2317 (goto-char (point-max)) | |
2318 (insert (format "\n%s;comment:%s" base-name comment))) | |
2319 (save-buffer) | |
2320 (kill-buffer buf)))) | |
2321 | |
2322 (defun tumme-update-property (prop value) | |
2323 "Update text property PROP with value VALUE at point." | |
2324 (let ((inhibit-read-only t)) | |
2325 (put-text-property | |
2326 (point) (1+ (point)) | |
2327 prop | |
2328 value))) | |
2329 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
2330 ;;;###autoload |
67302 | 2331 (defun tumme-dired-comment-files () |
2332 "Add comment to current or marked files in dired." | |
2333 (interactive) | |
2334 (let ((files (dired-get-marked-files)) | |
2335 (comment (tumme-read-comment))) | |
2336 (mapcar | |
2337 (lambda (curr-file) | |
2338 (tumme-write-comment curr-file comment)) | |
2339 files))) | |
2340 | |
2341 (defun tumme-comment-thumbnail () | |
2342 "Add comment to current thumbnail in thumbnail buffer." | |
2343 (interactive) | |
2344 (let* ((file (tumme-original-file-name)) | |
2345 (comment (tumme-read-comment file))) | |
2346 (tumme-write-comment file comment) | |
2347 (tumme-update-property 'comment comment)) | |
2348 (tumme-display-thumb-properties)) | |
2349 | |
2350 (defun tumme-read-comment (&optional file) | |
2351 "Read comment, optionally using old comment from FILE as initial value." | |
2352 | |
2353 (let ((comment | |
2354 (read-string | |
2355 "Comment: " | |
2356 (if file (tumme-get-comment file))))) | |
2357 comment)) | |
2358 | |
2359 (defun tumme-get-comment (file) | |
2360 "Get comment for file FILE." | |
2361 (save-excursion | |
2362 (let (end buf comment-beg comment (base-name (file-name-nondirectory file))) | |
2363 (setq buf (find-file tumme-db-file)) | |
2364 (goto-char (point-min)) | |
2365 (if (search-forward-regexp | |
2366 (format "^%s" base-name) nil t) | |
2367 (progn | |
2368 (end-of-line) | |
2369 (setq end (point)) | |
2370 (beginning-of-line) | |
2371 (cond ((search-forward ";comment:" end t) | |
2372 (setq comment-beg (point)) | |
2373 (if (search-forward ";" end t) | |
2374 (setq comment-end (- (point) 1)) | |
2375 (setq comment-end end)) | |
2376 (setq comment (buffer-substring | |
2377 comment-beg comment-end)))))) | |
2378 (kill-buffer buf) | |
2379 comment))) | |
2380 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
2381 ;;;###autoload |
67302 | 2382 (defun tumme-mark-tagged-files () |
2383 "Use regexp to mark files with matching tag." | |
2384 (interactive) | |
2385 (let ((tag (read-string "Mark tagged files (regexp): ")) | |
2386 (hits 0) | |
2387 files buf) | |
2388 (save-excursion | |
2389 (setq buf (find-file tumme-db-file)) | |
2390 (goto-char (point-min)) | |
2391 ;; Collect matches | |
2392 (while (search-forward-regexp | |
2393 (concat "\\(^[^;]+\\);.*" tag ".*$") nil t) | |
2394 (setq files (append (list (match-string 1)) files))) | |
2395 (kill-buffer buf) | |
2396 ;; Mark files | |
2397 (mapcar | |
2398 ;; I tried using `dired-mark-files-regexp' but it was | |
2399 ;; waaaay to slow. | |
2400 (lambda (curr-file) | |
2401 ;; Don't bother about hits found in other directories than | |
2402 ;; the current one. | |
2403 (when (string= (file-name-as-directory | |
2404 (expand-file-name default-directory)) | |
2405 (file-name-as-directory | |
2406 (file-name-directory curr-file))) | |
2407 (setq curr-file (file-name-nondirectory curr-file)) | |
2408 (goto-char (point-min)) | |
2409 (when (search-forward-regexp (format "\\s %s$" curr-file) nil t) | |
2410 (setq hits (+ hits 1)) | |
2411 (dired-mark 1)))) | |
2412 files)) | |
2413 (message "%d files with matching tag marked." hits))) | |
2414 | |
2415 (defun tumme-mouse-display-image (event) | |
2416 "Use mouse EVENT, call `tumme-display-image' to display image. | |
2417 Track this in associated dired buffer if `tumme-track-movement' is | |
2418 non-nil." | |
2419 (interactive "e") | |
2420 (let (file) | |
2421 (mouse-set-point event) | |
2422 (goto-char (posn-point (event-end event))) | |
2423 (setq file (tumme-original-file-name)) | |
2424 (if tumme-track-movement | |
2425 (tumme-track-original-file)) | |
2426 (tumme-display-image file))) | |
2427 | |
2428 (defun tumme-mouse-select-thumbnail (event) | |
2429 "Use mouse EVENT to select thumbnail image. | |
2430 Track this in associated dired buffer if `tumme-track-movement' is | |
2431 non-nil." | |
2432 (interactive "e") | |
2433 (let (file) | |
2434 (mouse-set-point event) | |
2435 (goto-char (posn-point (event-end event))) | |
2436 (if tumme-track-movement | |
2437 (tumme-track-original-file))) | |
2438 (tumme-display-thumb-properties)) | |
2439 | |
2440 (defun tumme-mouse-toggle-mark (event) | |
2441 "Use mouse EVENT to toggle dired mark for thumbnail. | |
2442 Track this in associated dired buffer if `tumme-track-movement' is | |
2443 non-nil." | |
2444 (interactive "e") | |
2445 (let (file) | |
2446 (mouse-set-point event) | |
2447 (goto-char (posn-point (event-end event))) | |
2448 (if tumme-track-movement | |
2449 (tumme-track-original-file))) | |
2450 (tumme-toggle-mark-thumb-original-file)) | |
2451 | |
2452 (defun tumme-dired-display-properties () | |
2453 "Display properties for dired file in the echo area." | |
2454 (interactive) | |
2455 (let* ((file (dired-get-filename)) | |
2456 (file-name (file-name-nondirectory file)) | |
2457 (dired-buf (buffer-name (current-buffer))) | |
2458 (props (mapconcat | |
2459 'princ | |
2460 (tumme-list-tags file) | |
2461 ", ")) | |
2462 (comment (tumme-get-comment file))) | |
2463 (if file-name | |
2464 (message | |
2465 (tumme-format-properties-string | |
2466 dired-buf | |
2467 file-name | |
2468 props | |
2469 comment))))) | |
2470 | |
2471 (defvar tumme-tag-file-list nil | |
2472 "List to store tag-file structure.") | |
2473 | |
2474 (defvar tumme-file-tag-list nil | |
2475 "List to store file-tag structure.") | |
2476 | |
2477 (defvar tumme-file-comment-list nil | |
2478 "List to store file comments.") | |
2479 | |
2480 (defun tumme-add-to-tag-file-list (tag file) | |
2481 "Add relation between TAG and FILE." | |
2482 (let (curr) | |
2483 (if tumme-tag-file-list | |
2484 (if (setq curr (assoc tag tumme-tag-file-list)) | |
2485 (if (not (member file curr)) | |
2486 (setcdr curr (cons file (cdr curr)))) | |
2487 (setcdr tumme-tag-file-list | |
2488 (cons (list tag file) (cdr tumme-tag-file-list)))) | |
2489 (setq tumme-tag-file-list (list (list tag file)))))) | |
2490 | |
2491 (defun tumme-add-to-tag-file-lists (tag file) | |
2492 "Helper function used from `tumme-create-gallery-lists'. | |
2493 | |
2494 Add TAG to FILE in one list and FILE to TAG in the other. | |
2495 | |
2496 Lisp structures look like the following: | |
2497 | |
2498 tumme-file-tag-list: | |
2499 | |
2500 ((\"filename1\" \"tag1\" \"tag2\" \"tag3\" ...) | |
2501 (\"filename2\" \"tag1\" \"tag2\" \"tag3\" ...) | |
2502 ...) | |
2503 | |
2504 tumme-tag-file-list: | |
2505 | |
2506 ((\"tag1\" \"filename1\" \"filename2\" \"filename3\" ...) | |
2507 (\"tag2\" \"filename1\" \"filename2\" \"filename3\" ...) | |
2508 ...)" | |
2509 ;; Add tag to file list | |
2510 (let (curr) | |
2511 (if tumme-file-tag-list | |
2512 (if (setq curr (assoc file tumme-file-tag-list)) | |
2513 (setcdr curr (cons tag (cdr curr))) | |
2514 (setcdr tumme-file-tag-list | |
2515 (cons (list file tag) (cdr tumme-file-tag-list)))) | |
2516 (setq tumme-file-tag-list (list (list file tag)))) | |
2517 ;; Add file to tag list | |
2518 (if tumme-tag-file-list | |
2519 (if (setq curr (assoc tag tumme-tag-file-list)) | |
2520 (if (not (member file curr)) | |
2521 (setcdr curr (cons file (cdr curr)))) | |
2522 (setcdr tumme-tag-file-list | |
2523 (cons (list tag file) (cdr tumme-tag-file-list)))) | |
2524 (setq tumme-tag-file-list (list (list tag file)))))) | |
2525 | |
2526 (defun tumme-add-to-file-comment-list (file comment) | |
2527 "Helper function used from `tumme-create-gallery-lists'. | |
2528 | |
2529 For FILE, add COMMENT to list. | |
2530 | |
2531 Lisp structure looks like the following: | |
2532 | |
2533 tumme-file-comment-list: | |
2534 | |
2535 ((\"filename1\" . \"comment1\") | |
2536 (\"filename2\" . \"comment2\") | |
2537 ...)" | |
2538 (if tumme-file-comment-list | |
2539 (if (not (assoc file tumme-file-comment-list)) | |
2540 (setcdr tumme-file-comment-list | |
2541 (cons (cons file comment) | |
2542 (cdr tumme-file-comment-list)))) | |
2543 (setq tumme-file-comment-list (list (cons file comment))))) | |
2544 | |
2545 (defun tumme-create-gallery-lists () | |
2546 "Create temporary lists used by `tumme-gallery-generate'." | |
2547 (let ((buf (find-file tumme-db-file)) | |
2548 end beg file row-tags) | |
2549 (setq tumme-tag-file-list nil) | |
2550 (setq tumme-file-tag-list nil) | |
2551 (setq tumme-file-comment-list nil) | |
2552 (goto-char (point-min)) | |
2553 (while (search-forward-regexp "^." nil t) | |
2554 (end-of-line) | |
2555 (setq end (point)) | |
2556 (beginning-of-line) | |
2557 (setq beg (point)) | |
2558 (if (not (search-forward ";" end nil)) | |
2559 (error "Something is really wrong, check format of database")) | |
2560 (setq row-tags (split-string | |
2561 (buffer-substring beg end) ";")) | |
2562 (setq file (car row-tags)) | |
2563 (mapc | |
2564 (lambda (x) | |
2565 (if (not (string-match "^comment:\\(.*\\)" x)) | |
2566 (tumme-add-to-tag-file-lists x file) | |
2567 (tumme-add-to-file-comment-list file (match-string 1 x)))) | |
2568 (cdr row-tags))) | |
2569 (kill-buffer buf)) | |
2570 ;; Sort tag-file list | |
2571 (setq tumme-tag-file-list | |
2572 (sort tumme-tag-file-list | |
2573 (lambda (x y) | |
2574 (string< (car x) (car y)))))) | |
2575 | |
2576 (defun tumme-hidden-p (file) | |
2577 "Return t if image FILE has a \"hidden\" tag." | |
2578 (let (hidden) | |
2579 (mapc | |
2580 (lambda (tag) | |
2581 (if (member tag tumme-gallery-hidden-tags) | |
2582 (setq hidden t))) | |
2583 (cdr (assoc file tumme-file-tag-list))) | |
2584 hidden)) | |
2585 | |
2586 (defun tumme-gallery-generate () | |
2587 "Generate gallery pages. | |
2588 First we create a couple of Lisp structures from the database to make | |
2589 it easier to generate, then HTML-files are created in | |
2590 `tumme-gallery-dir'" | |
2591 (interactive) | |
2592 (if (eq 'per-directory tumme-thumbnail-storage) | |
2593 (error "Currently, gallery generation is not supported \ | |
2594 when using per-directory thumbnail file storage")) | |
2595 (tumme-create-gallery-lists) | |
2596 (let ((tags tumme-tag-file-list) | |
2597 count curr tag index-buf tag-buf | |
2598 comment file-tags tag-link tag-link-list) | |
2599 ;; Make sure gallery root exist | |
2600 (if (file-exists-p tumme-gallery-dir) | |
2601 (if (not (file-directory-p tumme-gallery-dir)) | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
2602 (error "tumme-gallery-dir is not a directory")) |
67302 | 2603 (make-directory tumme-gallery-dir)) |
2604 ;; Open index file | |
2605 (setq index-buf (find-file | |
2606 (format "%s/index.html" tumme-gallery-dir))) | |
2607 (erase-buffer) | |
2608 (insert "<html>\n") | |
2609 (insert " <body>\n") | |
2610 (insert " <h2>Tumme Gallery</h2>\n") | |
2611 (insert (format "<p>\n Gallery generated %s\n <p>\n" | |
2612 (current-time-string))) | |
2613 (insert " <h3>Tag index</h3>\n") | |
2614 (setq count 1) | |
2615 ;; Pre-generate list of all tag links | |
2616 (mapc | |
2617 (lambda (curr) | |
2618 (setq tag (car curr)) | |
2619 (when (not (member tag tumme-gallery-hidden-tags)) | |
2620 (setq tag-link (format "<a href=\"%d.html\">%s</a>" count tag)) | |
2621 (if tag-link-list | |
2622 (setq tag-link-list | |
2623 (append tag-link-list (list (cons tag tag-link)))) | |
2624 (setq tag-link-list (list (cons tag tag-link)))) | |
2625 (setq count (1+ count)))) | |
2626 tags) | |
2627 (setq count 1) | |
2628 ;; Main loop where we generated thumbnail pages per tag | |
2629 (mapc | |
2630 (lambda (curr) | |
2631 (setq tag (car curr)) | |
2632 ;; Don't display hidden tags | |
2633 (when (not (member tag tumme-gallery-hidden-tags)) | |
2634 ;; Insert link to tag page in index | |
2635 (insert (format " %s<br>\n" (cdr (assoc tag tag-link-list)))) | |
2636 ;; Open per-tag file | |
2637 (setq tag-buf (find-file | |
2638 (format "%s/%s.html" tumme-gallery-dir count))) | |
2639 (erase-buffer) | |
2640 (insert "<html>\n") | |
2641 (insert " <body>\n") | |
2642 (insert " <p><a href=\"index.html\">Index</a></p>\n") | |
2643 (insert (format " <h2>Images with tag "%s"</h2>" tag)) | |
2644 ;; Main loop for files per tag page | |
2645 (mapc | |
2646 (lambda (file) | |
2647 (when (not (tumme-hidden-p file)) | |
2648 ;; Insert thumbnail with link to full image | |
2649 (insert | |
2650 (format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n" | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2651 tumme-gallery-image-root-url (file-name-nondirectory file) |
67302 | 2652 tumme-gallery-thumb-image-root-url |
2653 (file-name-nondirectory (tumme-thumb-name file)) file)) | |
2654 ;; Insert comment, if any | |
2655 (if (setq comment (cdr (assoc file tumme-file-comment-list))) | |
2656 (insert (format "<br>\n%s<br>\n" comment)) | |
2657 (insert "<br>\n")) | |
2658 ;; Insert links to other tags, if any | |
2659 (when (> (length | |
2660 (setq file-tags (assoc file tumme-file-tag-list))) 2) | |
2661 (insert "[ ") | |
2662 (mapc | |
2663 (lambda (extra-tag) | |
2664 ;; Only insert if not file name or the main tag | |
2665 (if (and (not (equal extra-tag tag)) | |
2666 (not (equal extra-tag file))) | |
2667 (insert | |
2668 (format "%s " (cdr (assoc extra-tag tag-link-list)))))) | |
2669 file-tags) | |
2670 (insert "]<br>\n")))) | |
2671 (cdr curr)) | |
2672 (insert " <p><a href=\"index.html\">Index</a></p>\n") | |
2673 (insert " </body>\n") | |
2674 (insert "</html>\n") | |
2675 (save-buffer) | |
2676 (kill-buffer tag-buf) | |
2677 (setq count (1+ count)))) | |
2678 tags) | |
2679 (insert " </body>\n") | |
2680 (insert "</html>") | |
2681 (save-buffer) | |
2682 (kill-buffer index-buf))) | |
2683 | |
2684 (defun tumme-kill-buffer-and-window () | |
2685 "Kill the current buffer and, if possible, also the window." | |
2686 (interactive) | |
2687 (let ((buffer (current-buffer))) | |
2688 (condition-case nil | |
2689 (delete-window (selected-window)) | |
2690 (error nil)) | |
2691 (kill-buffer buffer))) | |
2692 | |
2693 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2694 ;;;;;;;;; TEST-SECTION ;;;;;;;;;;; | |
2695 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2696 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2697 ;; (defvar tumme-dir-max-size 12300000) |
67302 | 2698 |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2699 ;; (defun tumme-test-clean-old-files () |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2700 ;; "Clean `tumme-dir' from old thumbnail files. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2701 ;; \"Oldness\" measured using last access time. If the total size of all |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2702 ;; thumbnail files in `tumme-dir' is larger than 'tumme-dir-max-size', |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2703 ;; old files are deleted until the max size is reached." |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2704 ;; (let* ((files |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2705 ;; (sort |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2706 ;; (mapcar |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2707 ;; (lambda (f) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2708 ;; (let ((fattribs (file-attributes f))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2709 ;; ;; Get last access time and file size |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2710 ;; `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2711 ;; (directory-files tumme-dir t ".+\.thumb\..+$")) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2712 ;; ;; Sort function. Compare time between two files. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2713 ;; '(lambda (l1 l2) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2714 ;; (time-less-p (car l1) (car l2))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2715 ;; (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2716 ;; (while (> dirsize tumme-dir-max-size) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2717 ;; (y-or-n-p |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2718 ;; (format "Size of thumbnail directory: %d, delete old file %s? " |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2719 ;; dirsize (cadr (cdar files)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2720 ;; (delete-file (cadr (cdar files))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2721 ;; (setq dirsize (- dirsize (car (cdar files)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2722 ;; (setq files (cdr files))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2723 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2724 ;;;;;;;;;;;;;;;;;;;;;;, |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2725 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2726 ;; (defun dired-speedbar-buttons (dired-buffer) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2727 ;; (when (and (boundp 'tumme-use-speedbar) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2728 ;; tumme-use-speedbar) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2729 ;; (let ((filename (with-current-buffer dired-buffer |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2730 ;; (dired-get-filename)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2731 ;; (when (and (not (string-equal filename (buffer-string))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2732 ;; (string-match (image-file-name-regexp) filename)) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2733 ;; (erase-buffer) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2734 ;; (insert (propertize |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2735 ;; filename |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2736 ;; 'display |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2737 ;; (tumme-get-thumbnail-image filename))))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2738 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2739 ;; (setq tumme-use-speedbar t) |
67302 | 2740 |
2741 (provide 'tumme) | |
2742 | |
67318 | 2743 ;; arch-tag: 9d11411d-331f-4380-8b44-8adfe3a0343e |
67302 | 2744 ;;; tumme.el ends here |