From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Giraud via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#61394: 30.0.50; [PATCH] Image-dired thumb name based on content Date: Thu, 27 Jul 2023 23:30:29 +0200 Message-ID: <87bkfxcaa2.fsf@ledu-giraud.fr> References: <874jruy7xx.fsf@ledu-giraud.fr> <87ttztk0yw.fsf@tcd.ie> <87v8k9s6j9.fsf@ledu-giraud.fr> <83ilg8jzti.fsf@gnu.org> <87k00oo03r.fsf@ledu-giraud.fr> <838rh4jlsq.fsf@gnu.org> <87bklzol8n.fsf@ledu-giraud.fr> <877cwmo8ij.fsf@ledu-giraud.fr> <87y1oz54bn.fsf@ledu-giraud.fr> <87wn4dra0h.fsf@ledu-giraud.fr> <87bklhtwhd.fsf@ledu-giraud.fr> <871qgumqh7.fsf@ledu-giraud.fr> <83ila5n8co.fsf@gnu.org> <87fs59qx54.fsf@ledu-giraud.fr> <83wmyll9s5.fsf@gnu.org> Reply-To: Manuel Giraud Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38444"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: contovob@tcd.ie, stefankangas@gmail.com, 61394@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 28 00:07:44 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qP995-0009m9-HT for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 28 Jul 2023 00:07:43 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qP8Zl-00079i-Sr; Thu, 27 Jul 2023 17:31:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qP8Zb-00079J-Lf for bug-gnu-emacs@gnu.org; Thu, 27 Jul 2023 17:31:05 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qP8Zb-0007PL-4u for bug-gnu-emacs@gnu.org; Thu, 27 Jul 2023 17:31:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qP8Za-0000lJ-I4 for bug-gnu-emacs@gnu.org; Thu, 27 Jul 2023 17:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 27 Jul 2023 21:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61394 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 61394-submit@debbugs.gnu.org id=B61394.16904934382896 (code B ref 61394); Thu, 27 Jul 2023 21:31:02 +0000 Original-Received: (at 61394) by debbugs.gnu.org; 27 Jul 2023 21:30:38 +0000 Original-Received: from localhost ([127.0.0.1]:43255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qP8ZC-0000ke-9R for submit@debbugs.gnu.org; Thu, 27 Jul 2023 17:30:38 -0400 Original-Received: from ledu-giraud.fr ([51.159.28.247]:26738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qP8Z7-0000kN-2H for 61394@debbugs.gnu.org; Thu, 27 Jul 2023 17:30:37 -0400 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=Gbzo21f9 zKaM9kBtEnl914jgUpd+Mg6TH6qx18UMbnw=; h=date:references:in-reply-to: subject:cc:to:from; d=ledu-giraud.fr; b=hd49jiGzM66U7Ld/fm5PAmWq88BYPT uxjtp7lht8E1Rrhu35yuym9xsfhVXe/g4xDiSMaandEb8kZsofuqZrCA== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=Gbzo21f9zKaM9kBt Enl914jgUpd+Mg6TH6qx18UMbnw=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=nU4B9Yj+TLbnq7c9JbCiyIUDtv+2RSEYcYEsX6 AOcHAlzTUGD1dj83qvXDLW1vi99TQbC6X8knIR2lslwuInd8OkN3zQMwi/V0+S8Wsi2bR+ yYbEOCBXU4jaoGa4IOB5NJsR2RzYrxlN8I2IrhPezv993M6QN1UGCsSZgAkp9/gwHbgpMJ bDzCha9180CIKg4nj0u5yN2uoUTRdfxoDf77tNzsjMQmrPuCmGwlkd9paiSG7k+UuTmxsg m7D+3k8oStEb1QjBHrJoNjhT0GT0Ew+G7L4nIcV9HJub6x0Btw6n9Z3Piehy57i5C9qh5J oE8ghCkumFdvi2kFQTpEVluA== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id d6ef042b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 27 Jul 2023 23:30:31 +0200 (CEST) In-Reply-To: <83wmyll9s5.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 27 Jul 2023 17:16:26 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:266219 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: [...] > Thanks, installed. But now 1 set in image-dired-util-tests fails; it > sounds like the method of producing per-directory thumbnails has > changed, and now produces a SHA-1 hash? Can you please look into > fixing that test? Ok, I think this patch should do. -- Manuel Giraud --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-test-after-83b6a8a5147.patch >From 1460fb462300aac70faf99724efe126c72ad5fe6 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Thu, 27 Jul 2023 23:26:30 +0200 Subject: [PATCH] Fix test after 83b6a8a5147 --- test/lisp/image/image-dired-util-tests.el | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/test/lisp/image/image-dired-util-tests.el b/test/lisp/image/image-dired-util-tests.el index 1f3747a82b1..273a32d5dbb 100644 --- a/test/lisp/image/image-dired-util-tests.el +++ b/test/lisp/image/image-dired-util-tests.el @@ -57,20 +57,23 @@ image-dired-thumb-name/image-dired "jpg"))))) (ert-deftest image-dired-thumb-name/per-directory () - (let ((image-dired-thumbnail-storage 'per-directory)) - (should (file-name-absolute-p (image-dired-thumb-name "foo.jpg"))) - (should (file-name-absolute-p (image-dired-thumb-name "/tmp/foo.jpg"))) + (let ((image-dired-thumbnail-storage 'per-directory) + (rel-path "foo.jpg") + (abs-path "/tmp/foo.jpg") + (hash-name (concat (sha1 "foo.jpg") ".jpg"))) + (should (file-name-absolute-p (image-dired-thumb-name rel-path))) + (should (file-name-absolute-p (image-dired-thumb-name abs-path))) (should (equal - (file-name-nondirectory (image-dired-thumb-name "foo.jpg")) - (file-name-nondirectory (image-dired-thumb-name "/tmp/foo.jpg")))) + (file-name-nondirectory (image-dired-thumb-name rel-path)) + (file-name-nondirectory (image-dired-thumb-name abs-path)))) ;; The cdr below avoids the system dependency in the car of the ;; list returned by 'file-name-split': it's "" on Posix systems, ;; but the drive letter on MS-Windows. (should (equal (cdr (file-name-split - (image-dired-thumb-name "/tmp/foo.jpg"))) - '("tmp" ".image-dired" "foo.jpg.thumb.jpg"))) + (image-dired-thumb-name abs-path))) + (list "tmp" ".image-dired" hash-name))) (should (equal (file-name-nondirectory - (image-dired-thumb-name "foo.jpg")) - "foo.jpg.thumb.jpg")))) + (image-dired-thumb-name rel-path)) + hash-name)))) ;;; image-dired-util-tests.el ends here -- 2.40.0 --=-=-=--