jro_apps/redmine Commit - r2083:93c04f2666b6

Fixed: wrong digest for text files under Windows (#2264)....

Jean-Philippe Lang -

r2083:93c04f2666b6

parent child

Context file:

r2083:93c04f2666b6

app/models/attachment.rb +8 -1

                   File.open(diskfile, "wb") do |f|
                     f.write(@temp_file.read)
                   end
-                  self.digest = Digest::MD5.hexdigest(File.read(diskfile))
+                  self.digest = self.class.digest(diskfile)
                 end
                 # Don't save the content type if it's longer than the authorized length
                 if self.content_type && self.content_type.length > 255
                 end
                 df
               end
+              # Returns the MD5 digest of the file at given path
+              def self.digest(filename)
+                File.open(filename, 'rb') do |f|
+                  Digest::MD5.hexdigest(f.read)
+                end
+              end
             end

test/fixtures/files/testfile.txt +2 -1

@@ -1,1 +1,2
1	this is a text file for upload tests No newline at end of file	1	this is a text file for upload tests
		2	with multiple lines

test/unit/attachment_test.rb +6 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class AttachmentTest < Test::Unit::TestCase
+              fixtures :issues, :users
               def setup
               end
                 assert_equal 'f8139524ebb8f32e51976982cd20a85d', Attachment.disk_filename("test_accentué")[13..-1]
                 assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]
               end
+              def test_digest
+                assert_equal '1478adae0d4eb06d35897518540e25d6', Attachment.digest(Test::Unit::TestCase.fixture_path + "/files/testfile.txt")
+              end
             end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages