fileshunter 0.1.0.20130725 → 0.1.1.20130827

data/AUTHORS

@@ -1,3 +1,4 @@
 = Muriel Salvan (muriel@x-aeon.com)
 
-* 1.0.0.20130611
+* 0.1.0.20130725
+* 0.1.1.20130827

data/ChangeLog

@@ -1,5 +1,12 @@
 = FilesHunter Release History
 
+== 0.1.1.20130827 (Beta)
+
+* Don't load rUtilAnts anymore in the library.
+* Bug correction: Don't parse directories anymore as files.
+* [JPEG] Added some debugging logs
+* [JPEG] Bug correction: Accept files that are not encoding Huffman tables.
+
 == 0.1.0.20130725 (Beta)
 
 * Initial public release.

data/ReleaseInfo

@@ -2,7 +2,7 @@
 # This file has been generated by RubyPackager during a delivery.
 # More info about RubyPackager: http://rubypackager.sourceforge.net
 {
-  :version => '0.1.0.20130725',
+  :version => '0.1.1.20130827',
   :tags => [ 'Beta' ],
   :dev_status => 'Beta'
 }

data/bin/fileshunt

@@ -3,6 +3,8 @@
 require 'optparse'
 require 'fileshunter'
 require 'fileutils'
+require 'rUtilAnts/Logging'
+RUtilAnts::Logging::install_logger_on_object
 
 module FilesHunter
 
@@ -96,8 +98,8 @@ module FilesHunter
             end
           end
         end
-        # Remove already extracted files from the list
-        files.select! { |file_name| ((file_name =~ /\.__EXTRACT__\./) == nil) }
+        # Remove already extracted files from the list, and directories
+        files.select! { |file_name| (!File.directory?(file_name)) and ((file_name =~ /\.__EXTRACT__\./) == nil) }
 
         # Analyze them
         analyze_files(files)

data/lib/fileshunter.rb

@@ -1,5 +1,3 @@
-require 'rUtilAnts/Logging'
-RUtilAnts::Logging::install_logger_on_object
 require 'fileshunter/SegmentsAnalyzer'
 
 module FilesHunter

data/lib/fileshunter/Decoders/JPEG.rb

@@ -78,6 +78,7 @@ module FilesHunter
             case c_1
             when MARKER_APP0
               # Application specific data
+              log_debug "@#{cursor} - Found APP0 marker"
               # Usually used for JFIF
               case @data[cursor+4..cursor+8]
               when JFIF_HEADER
@@ -113,6 +114,7 @@ module FilesHunter
               end
             when MARKER_APP1
               # Application specific data
+              log_debug "@#{cursor} - Found APP1 marker"
               # Usually used for Exif
               case @data[cursor+4..cursor+9]
               when EXIF_HEADER
@@ -139,6 +141,7 @@ module FilesHunter
               end
             when MARKER_SOF0..MARKER_SOF3
               # SOF: Start of Frame
+              log_debug "@#{cursor} - Found SOF marker"
               invalid_data("@#{cursor} - Found several SOF markers") if found_sof
               invalid_data("@#{cursor} - Found a SOF marker after the SOS marker") if found_sos
               found_sof = true
@@ -164,6 +167,7 @@ module FilesHunter
               end
             when MARKER_DHT
               # DHT: Define Huffman tables
+              log_debug "@#{cursor} - Found DHT marker"
               end_cursor = cursor + 2 + size
               dht_cursor = cursor + 4
               while (dht_cursor < end_cursor)
@@ -172,12 +176,12 @@ module FilesHunter
                 invalid_data("@#{cursor} - Unknown Huffman table type: #{huffman_type}") if (huffman_type > 1)
                 if (huffman_type == 0)
                   huffman_dc_table_id = (header_byte & 0b00001111)
-                  invalid_data("@#{cursor} - Huffman DC table id #{huffman_dc_table_id} already defined.") if (huffman_dc_tables_id.include?(huffman_dc_table_id))
+                  #invalid_data("@#{cursor} - Huffman DC table id #{huffman_dc_table_id} already defined.") if (huffman_dc_tables_id.include?(huffman_dc_table_id))
                   huffman_dc_tables_id << huffman_dc_table_id
                   log_debug "@#{cursor} - Found Huffman DC table: #{huffman_dc_table_id}"
                 else
                   huffman_ac_table_id = (header_byte & 0b00001111)
-                  invalid_data("@#{cursor} - Huffman AC table id #{huffman_ac_table_id} already defined.") if (huffman_ac_tables_id.include?(huffman_ac_table_id))
+                  #invalid_data("@#{cursor} - Huffman AC table id #{huffman_ac_table_id} already defined.") if (huffman_ac_tables_id.include?(huffman_ac_table_id))
                   huffman_ac_tables_id << huffman_ac_table_id
                   log_debug "@#{cursor} - Found Huffman AC table: #{huffman_ac_table_id}"
                 end
@@ -190,8 +194,9 @@ module FilesHunter
               end
             when MARKER_SOS
               # SOS: Start of Scan
-              invalid_data("@#{cursor} - SOS marker begins whereas no Huffman DC table has been defined.") if (huffman_dc_tables_id.empty?)
-              invalid_data("@#{cursor} - SOS marker begins whereas no Huffman AC table has been defined.") if (huffman_ac_tables_id.empty?)
+              log_debug "@#{cursor} - Found SOS marker"
+              #invalid_data("@#{cursor} - SOS marker begins whereas no Huffman DC table has been defined.") if (huffman_dc_tables_id.empty?)
+              #invalid_data("@#{cursor} - SOS marker begins whereas no Huffman AC table has been defined.") if (huffman_ac_tables_id.empty?)
               invalid_data("@#{cursor} - SOS marker begins whereas no quantisation table has been defined.") if (quantisation_tables_id.empty?)
               invalid_data("@#{cursor} - SOS marker begins whereas no SOF marker has been encountered.") if (!found_sof)
               found_sos = true
@@ -201,11 +206,12 @@ module FilesHunter
                 huffman_table_ids = @data[cursor+6+2*idx_component].ord
                 huffman_dc_table_id = ((huffman_table_ids & 0b11110000) >> 4)
                 huffman_ac_table_id = (huffman_table_ids & 0b00001111)
-                invalid_data("@#{cursor} - Unknown DC Huffman table: #{huffman_dc_table_id}") if (!huffman_dc_tables_id.include?(huffman_dc_table_id))
-                invalid_data("@#{cursor} - Unknown AC Huffman table: #{huffman_ac_table_id}") if (!huffman_ac_tables_id.include?(huffman_ac_table_id))
+                #invalid_data("@#{cursor} - Unknown DC Huffman table: #{huffman_dc_table_id}") if (!huffman_dc_tables_id.include?(huffman_dc_table_id))
+                #invalid_data("@#{cursor} - Unknown AC Huffman table: #{huffman_ac_table_id}") if (!huffman_ac_tables_id.include?(huffman_ac_table_id))
               end
             when MARKER_DQT
               # DQT: Define quantisation tables
+              log_debug "@#{cursor} - Found DQT marker"
               end_cursor = cursor + 2 + size
               dqt_cursor = cursor + 4
               while (dqt_cursor < end_cursor)
@@ -218,6 +224,8 @@ module FilesHunter
                 dqt_cursor += 1 + 64*((precision == 0) ? 1 : 2)
                 invalid_data("@#{dqt_cursor} - End of quantisation table was supposed to be @#{end_cursor}.") if (dqt_cursor > end_cursor)
               end
+            else
+              log_debug "@#{cursor} - Found ignored marker: #{c_1.inspect}"
             end
             # Does it have entropy data?
             if (c_1 == MARKER_WITH_ENTROPY_DATA)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fileshunter
 version: !ruby/object:Gem::Version
-  version: 0.1.0.20130725
+  version: 0.1.1.20130827
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rUtilAnts