rarity 0.1.0 → 0.1.1

data/README.md

@@ -14,6 +14,12 @@ Rarity makes use of:
 
 You will need to install these prior to running rarity.
 
+Additionally, the sqlite3 gem is used for the tracking database. This has the following package dependencies on Ubuntu:
+
+* libsqlite3-dev
+
+Gem dependencies are installed automatically when installing rarity.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -49,3 +55,7 @@ You can find more help with:
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## License
+
+See the LICENSE file. Long story short, MIT, go crazy.

data/lib/rarity/optimiser.rb

@@ -21,7 +21,7 @@ class Rarity::Optimiser
       if ext == ".png"
         `#{png_cmd} "#{path}"`
         type = :png
-        @tracker.mark_done(path, @options)
+        @tracker.mark_done(path, @options, {:before=>start_size, :after=>File.size(path), :filetype=>type, :time=>(Time.now-start)})
       elsif ext == ".gif"
         type = :gif
         # ooh, okay, so if we're a gif, are we animated?
@@ -32,7 +32,7 @@ class Rarity::Optimiser
           if (fc.split(":")[1].to_i rescue 1) > 0
             # We have more than one frame! We're animated or strange. gifsicle.
             `#{gif_cmd} "#{path}"`
-            @tracker.mark_done(path, @options)
+            @tracker.mark_done(path, @options, {:before=>start_size, :after=>File.size(path), :filetype=>type, :time=>(Time.now-start)})
           else
             # We're single frame, PNG probably does better
             opo = `#{png_cmd} "#{path}"`
@@ -42,12 +42,12 @@ class Rarity::Optimiser
               File.delete(path)
               # Changed format, so update path
               path = pngpath
-              @tracker.mark_done(path, @options)
+              @tracker.mark_done(path, @options, {:before=>start_size, :after=>File.size(path), :filetype=>type, :time=>(Time.now-start)})
             else
               # Clean up the PNG we tried and gifsicle it.
               File.delete(path.gsub(File.extname(path),".png"))
               `#{gif_cmd} "#{path}"`
-              @tracker.mark_done(path, @options)
+              @tracker.mark_done(path, @options, {:before=>start_size, :after=>File.size(path), :filetype=>type, :time=>(Time.now-start)})
             end
           end
         else
@@ -59,18 +59,18 @@ class Rarity::Optimiser
             File.delete(path)
             # Changed format, so update path
             path = pngpath
-            @tracker.mark_done(path, @options)
+            @tracker.mark_done(path, @options, {:before=>start_size, :after=>File.size(path), :filetype=>type, :time=>(Time.now-start)})
           else
             # Clean up the PNG we tried and gifsicle it.
             File.delete(path.gsub(File.extname(path),".png"))
             `#{gif_cmd} "#{path}"`
-            @tracker.mark_done(path, @options)
+            @tracker.mark_done(path, @options, {:before=>start_size, :after=>File.size(path), :filetype=>type, :time=>(Time.now-start)})
           end
         end
       elsif ext == ".jpg" or ext == ".jpeg"
         type = :jpg
         `#{jpg_cmd} "#{path}"`
-        @tracker.mark_done(path, @options)
+        @tracker.mark_done(path, @options, {:before=>start_size, :after=>File.size(path), :filetype=>type, :time=>(Time.now-start)})
       else
         puts "Skipped file, not a recognised file type"
       end

data/lib/rarity/runner.rb

@@ -1,9 +1,11 @@
 class Rarity::Runner
+  # Initialises a new runner
   def initialize(options)
     @directory = options[:directory]
     @tracker = Rarity::Tracker.new
     @optimiser = Rarity::Optimiser.new(@tracker, {:png_o_level => options[:pnglevel]})
   end
+  # Runs optimisations recursively.
   def run
     recursively_optimise(@directory)
   end

data/lib/rarity/tracker.rb

@@ -2,7 +2,7 @@ require 'sequel'
 class Rarity::Tracker
 
   def initialize
-    @db_path = File.expand_path("~/.spike.sqlite")
+    @db_path = File.expand_path("~/.rarity.sqlite")
     @first_run = !File.exists?(@db_path)
     @db = Sequel.sqlite(@db_path)
     if @first_run
@@ -10,8 +10,13 @@ class Rarity::Tracker
         primary_key :id
         String :path
         Integer :png_o_level
+        Integer :before_bytes
+        Integer :after_bytes
+        String :filetype
+        Float :time_taken
       end
     end
+    puts "Tracker initialised with a total of #{@db[:images].count} records"
   end
   def import_from_old_format
     @path = File.expand_path("~/.optimdone.dat")
@@ -22,13 +27,13 @@ class Rarity::Tracker
     end
     puts "Imported #{@done.size} entries that we have already optimised from the old land, you can now delete ~/.optimdone.dat"
   end
-  def mark_done(path, options)
+  def mark_done(path, options, results)
     cleanpath = path.gsub("\n","").gsub("\r","").chomp
     if !is_done?(path, options)
       if @db[:images][:path=>cleanpath]
-        @db[:images][:path=>cleanpath] = {:png_o_level => options[:png_o_level]}
+        @db[:images][:path=>cleanpath] = {:png_o_level => options[:png_o_level], :after_bytes=>results[:after], :time_taken=>(results[:time]+ @db[:images][:path=>cleanpath].time_taken)}
       else
-        @db[:images].insert(:path=>cleanpath, :png_o_level=>options[:png_o_level])
+        @db[:images].insert(:path=>cleanpath, :png_o_level=>options[:png_o_level], :before_bytes=>results[:before], :after_bytes=>results[:after], :filetype=>results[:filetype].to_s, :time_taken=>results[:time])
       end
     end
   end

data/lib/rarity/version.rb

@@ -1,3 +1,3 @@
 module Rarity
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - James Harrison