Merge thumbnail branch.

ChangeLog

@@ -4,10 +4,45 @@
 	typo. Suggested by
 	http://hibari.2ch.net/test/read.cgi/unix/1265413075/149
 
+2010-09-26  MIZUNUMA Yuto  <mizmiz@users.sourceforge.net>
+
+	* navi2ch-article.el (navi2ch-article-insert-message):
+	(navi2ch-thumbnail-insert-image-reload)追加
+	サムネイル画像のキャッシュがあったら表示
+	副作用があるかもしれないので注意して見守りたい
+
+2010-09-25  MIZUNUMA Yuto  <mizmiz@users.sourceforge.net>
+
+	* navi2ch-thumbnail.el (navi2ch-thumbnail-image-identify)
+	(navi2ch-thumbnail-image-gif-identify)
+	(navi2ch-thumbnail-image-jpeg-identify)
+	(navi2ch-thumbnail-image-png-identify)
+	(navi2ch-thumbnail-show-image-subr)
+	(navi2ch-thumbnail-insert-image-cache): 外部プログラム(identify)を呼
+	ばずにemacs独自で画像の情報を判別するロジックの導入
+
+	(navi2ch-thumbnail-show-image-subr): 画像ファイルが取得できなかった
+	場合、何が取得できたのかをmessage表示して対応を考える
+
+	(navi2ch-thumbnail-show-image-subr): GIFサムネイル作成時のtempファ
+	イルの削除ロジック変更
+
+	(navi2ch-thumbnail-url-status-check): 画像取得前に302や404のチェッ
+	ク。302の場合移動先URLを返す。
+
+	(navi2ch-thumbnail-select-current-link): ファイルが無いにも関わらず
+	404を返さないサーバへの対応。ブラックリスト
+	`navi2ch-thumbnail-404-list' とマッチング
+
 2010-09-14  Naohiro Aota  <naota@elisp.net>
 
 	* navi2ch-http-date.el : テストコードを test/test.el に移動。
 
+2010-09-10  MIZUNUMA Yuto  <mizmiz@users.sourceforge.net>
+
+	* navi2ch-thumbnail.el:
+	新規ファイル　サムネイル機能追加
+
 2010-08-11  MIZUNUMA Yuto  <mizmiz@users.sourceforge.net>
 
 	* navi2ch-p2.el (navi2ch-p2-login-url, navi2ch-p2-cookie-domain)

Makefile.am

@@ -12,7 +12,7 @@ lisp_LISP = navi2ch-version.el \
 	navi2ch-jbbs-net.el navi2ch-jbbs-shitaraba.el navi2ch-machibbs.el \
 	navi2ch-futaba.el navi2ch-megabbs.el \
 	navi2ch-http-date.el navi2ch-localfile.el navi2ch-oyster.el \
-	navi2ch-auto-modify.el navi2ch-p2.el
+	navi2ch-auto-modify.el navi2ch-p2.el navi2ch-thumbnail.el
 lisp_DATA = navi2ch-config.el
 
 EXTRA_DIST = Makefile.old bcomp.el $(lisp_LISP) \
@@ -42,7 +42,7 @@ elcdist: $(ELCFILES)
 $(srcdir)/bcomp.el: @MAINTAINER_MODE_TRUE@ $(srcdir)/bcomp.el.in $(srcdir)/Makefile.am
 	rm -f $@ && \
 	list=`for file in $(lisp_LISP); do echo -n "\"$$file\" "; done` && \
-	sed -e "s/@\(lisp_LISP\)@/$$list/" < $(srcdir)/bcomp.el.in > $@
+	sed -e "s/@\(lisp_LISP\)@/$$list/;" < $(srcdir)/bcomp.el.in > $@ || rm $@
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) && \
@@ -56,4 +56,3 @@ update:
 	( cd $(srcdir); $(CVS) update -P -d ) && \
 	$(MAKE) $(AM_MAKEFLAGS) Makefiles
 
-check: $(ELCFILES)

Makefile.in

@@ -77,8 +77,8 @@ am__ELFILES = navi2ch-article.el navi2ch-articles.el \
 	navi2ch-message.el navi2ch-mona.el navi2ch-multibbs.el \
 	navi2ch-net.el navi2ch-oyster.el navi2ch-p2.el \
 	navi2ch-popup-article.el navi2ch-search.el navi2ch-splash.el \
-	navi2ch-util.el navi2ch-vars.el navi2ch-version.el \
-	navi2ch-xmas.el navi2ch.el
+	navi2ch-thumbnail.el navi2ch-util.el navi2ch-vars.el \
+	navi2ch-version.el navi2ch-xmas.el navi2ch.el
 am__ELCFILES = $(am__ELFILES:.el=.elc)
 ELCFILES = $(LISP:.el=.elc)
 elisp_comp = $(top_srcdir)/elisp-comp
@@ -181,7 +181,7 @@ lisp_LISP = navi2ch-version.el \
 	navi2ch-jbbs-net.el navi2ch-jbbs-shitaraba.el navi2ch-machibbs.el \
 	navi2ch-futaba.el navi2ch-megabbs.el \
 	navi2ch-http-date.el navi2ch-localfile.el navi2ch-oyster.el \
-	navi2ch-auto-modify.el navi2ch-p2.el
+	navi2ch-auto-modify.el navi2ch-p2.el navi2ch-thumbnail.el
 
 lisp_DATA = navi2ch-config.el
 EXTRA_DIST = Makefile.old bcomp.el $(lisp_LISP) \
@@ -691,7 +691,7 @@ elcdist: $(ELCFILES)
 $(srcdir)/bcomp.el: @MAINTAINER_MODE_TRUE@ $(srcdir)/bcomp.el.in $(srcdir)/Makefile.am
 	rm -f $@ && \
 	list=`for file in $(lisp_LISP); do echo -n "\"$$file\" "; done` && \
-	sed -e "s/@\(lisp_LISP\)@/$$list/" < $(srcdir)/bcomp.el.in > $@
+	sed -e "s/@\(lisp_LISP\)@/$$list/;" < $(srcdir)/bcomp.el.in > $@ || rm $@
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) && \
@@ -704,8 +704,6 @@ Makefiles: $(top_builddir)/config.status
 update:
 	( cd $(srcdir); $(CVS) update -P -d ) && \
 	$(MAKE) $(AM_MAKEFLAGS) Makefiles
-
-check: $(ELCFILES)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

bcomp.el

@@ -1,5 +1,4 @@
 ;;; -*- Emacs-Lisp -*-
-
 (require 'cl)
 
 (when (featurep 'xemacs)
@@ -8,7 +7,7 @@
 
 (setq bcomp-files
       '(
-	"navi2ch-version.el" "navi2ch-vars.el" "navi2ch-face.el" "navi2ch-util.el" "navi2ch-net.el" "navi2ch-list.el" "navi2ch-article.el" "navi2ch-popup-article.el" "navi2ch-board-misc.el" "navi2ch-board.el" "navi2ch-articles.el" "navi2ch-bookmark.el" "navi2ch-history.el" "navi2ch-search.el" "navi2ch-message.el" "navi2ch.el" "navi2ch-head.el" "navi2ch-mona.el" "navi2ch-e21.el" "navi2ch-xmas.el" "navi2ch-splash.el" "navi2ch-directory.el" "navi2ch-be2ch.el" "navi2ch-multibbs.el" "navi2ch-jbbs-net.el" "navi2ch-jbbs-shitaraba.el" "navi2ch-machibbs.el" "navi2ch-futaba.el" "navi2ch-megabbs.el" "navi2ch-http-date.el" "navi2ch-localfile.el" "navi2ch-oyster.el" "navi2ch-p2.el" "navi2ch-auto-modify.el" 
+	"navi2ch-version.el" "navi2ch-vars.el" "navi2ch-face.el" "navi2ch-util.el" "navi2ch-net.el" "navi2ch-list.el" "navi2ch-article.el" "navi2ch-popup-article.el" "navi2ch-board-misc.el" "navi2ch-board.el" "navi2ch-articles.el" "navi2ch-bookmark.el" "navi2ch-history.el" "navi2ch-search.el" "navi2ch-message.el" "navi2ch.el" "navi2ch-head.el" "navi2ch-mona.el" "navi2ch-e21.el" "navi2ch-xmas.el" "navi2ch-splash.el" "navi2ch-directory.el" "navi2ch-be2ch.el" "navi2ch-multibbs.el" "navi2ch-jbbs-net.el" "navi2ch-jbbs-shitaraba.el" "navi2ch-machibbs.el" "navi2ch-futaba.el" "navi2ch-megabbs.el" "navi2ch-http-date.el" "navi2ch-localfile.el" "navi2ch-oyster.el" "navi2ch-auto-modify.el" "navi2ch-p2.el" "navi2ch-thumbnail.el" 
 	))
 
 (let* ((dir (expand-file-name default-directory))

navi2ch-article.el

@@ -108,6 +108,11 @@
       (define-key map [(control c) (control ? )] 'navi2ch-article-toggle-sticky))
     (define-key map "u" 'navi2ch-show-url-at-point)
     (define-key map "\C-c\C-y" 'navi2ch-article-write-cite-message)
+    (define-key map "," 'navi2ch-thumbnail-select-current-link)
+    (define-key map "v" 'navi2ch-thumbnail-save-content)
+    (define-key map "\e\r" 'navi2ch-article-select-current-link)
+    (define-key map "D" 'navi2ch-thumbnail-image-delete-cache)
+    (define-key map "T" 'navi2ch-thumbnail-all-show)
     (setq navi2ch-article-mode-map map)))
 
 (defvar navi2ch-article-mode-menu-spec
@@ -682,7 +687,10 @@ BOARD non-nil $B$J$i$P!"$=$NHD$N(B coding-system $B$r;H$&!#(B"
 	(navi2ch-article-set-link-property)
         (if navi2ch-article-auto-decode-p
             (navi2ch-article-auto-decode-encoded-section))
-	(navi2ch-article-arrange-message))))
+	(navi2ch-article-arrange-message)
+        ;;$B%5%`%M%$%k2hA|$N%-%c%C%7%e$,$"$C$?$iI=<((B
+	(navi2ch-thumbnail-insert-image-reload)
+        )))
   (navi2ch-article-insert-message-separator num))
 
 (defun navi2ch-article-insert-messages (list range)

navi2ch-popup-article.el

@@ -72,6 +72,11 @@
     (define-key map "D" 'navi2ch-popup-article-hide-messages)
     (define-key map "A" 'navi2ch-popup-article-add-important-messages)
     (define-key map "u" 'navi2ch-show-url-at-point)
+    (define-key map "," 'navi2ch-thumbnail-select-current-link)
+    (define-key map "v" 'navi2ch-thumbnail-save-content)
+    (define-key map "\e\r" 'navi2ch-article-select-current-link)
+    (define-key map "D" 'navi2ch-thumbnail-image-delete-cache)
+    (define-key map "T" 'navi2ch-thumbnail-all-show)
     (setq navi2ch-popup-article-mode-map map)))
 
 (defvar navi2ch-popup-article-current-board nil)