ralber 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b60444e1324682dac3a7d030dff87746500e2c2
-  data.tar.gz: bcbc2b32ad77e4b91af37be4661e81b8350fb8cb
+  metadata.gz: 529c57628e4ae4b6c145a5cbfca4d79f045261b5
+  data.tar.gz: f9df5763a02617c6371b48e7c2b7ecac97d85528
 SHA512:
-  metadata.gz: 1487111943be6a4f493c756c6dcbd1df162a90d4cd5b287beac10d013ad2f971aad2e674f7f29d217466fe2ce2de390930f87f71563a79adfbcc4e6a1a537386
-  data.tar.gz: 6676c3917f20fd98dc1415f42f71b2bb73398e777f09f3ee0b6bd9e871818fe06affe59893f6a06e264f2383adfcf382df0433ace81b75a789e55719362bcd39
+  metadata.gz: 74d83d3d557a627ec15ab9ed6aaf0dc085af092eb89fe2a4e0990de528038f9a0e60cae855983186d69216be516da8dfb4bdd5d48e92c5052eeb861e592c3a56
+  data.tar.gz: 14f949a4115dabd6d51e223d4e86dec357571c64a66dc2616c4031c5dd5ef64a1a3e93fe49d8d279fc54111d66d830236d87362750f888816c1ff3952d711331

data/bin/ralber.rb

@@ -10,7 +10,7 @@ require 'ralber/commands/create_command'
 require 'ralber/commands/publish_command'
 require 'ralber/commands/update_command'
 
-program :version, '0.0.1'
+program :version, '0.0.2'
 program :description, 'A static web album generator'
  
 command :create do |c|

data/lib/ralber/album.rb

@@ -209,7 +209,20 @@ module Ralber
                 rescue
                 end
             end
+
+            self.clear_unused_config
             self.write_albuminfo
         end
+
+        def clear_unused_config
+            configs = Dir.glob(File.join(File.dirname(self.json_path),'*.json')).map {|f| File.basename(f)}
+            configs.delete('album.json')
+            @images.each {|img|
+                configs.delete(File.basename(img.json_path))
+            }
+            configs.each {|conf|
+                File.delete(File.join(File.dirname(self.json_path),conf))
+            }
+        end
     end
 end

data/lib/ralber/image.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
-
+require 'digest'
 require 'json'
 require 'rmagick'
 
@@ -11,7 +11,7 @@ module Ralber
     # functions like thumbs etc.
     class Image
         attr :path
-        attr_reader :title, :type, :description, :width, :height
+        #attr_reader :title, :type, :description, :width, :height, :published_md5
 
         def initialize(path)
             raise StandardError, "File does not exits" if not File.exists?(path)
@@ -34,6 +34,9 @@ module Ralber
         def height
             @image_info['height']
         end
+        def published_md5
+            @image_info['published_md5']
+        end
 
         ##
         # creates the initial image.json file, extracting the metadata
@@ -46,6 +49,7 @@ module Ralber
             @image_info['type'] = type
             @image_info['width'] = meta[:width]
             @image_info['height'] = meta[:height]
+            @image_info['published_md5'] = meta[:published_md5]
 
             self.write_imageinfo
         end
@@ -69,7 +73,8 @@ module Ralber
                 "type" => nil,
                 "description" => '',
                 "width" => 0,
-                "height" => 0
+                "height" => 0,
+                "published_md5" => ''
             }
         end
 
@@ -87,6 +92,7 @@ module Ralber
                         (info['type'] = data['type'].to_sym) if data.key?('type')
                         (info['width'] = data['width']) if data.key?('width')
                         (info['height'] = data['height']) if data.key?('height')
+                        (info['published_md5'] = data['published_md5']) if data.key?('published_md5')
                     end
                 rescue
                 end
@@ -112,7 +118,8 @@ module Ralber
             {
                 :width => img.columns,
                 :height => img.rows,
-                :type => self.map_type(img.format)
+                :type => self.map_type(img.format),
+                :published_md5 => ''
             }
         end
 
@@ -151,5 +158,21 @@ module Ralber
             end
             return name
         end
+
+        def calc_md5
+            if not @md5_calculated
+                @md5_calculated = Digest::MD5.file(@path).hexdigest
+            end
+            return @md5_calculated
+        end
+
+        def has_changed
+            self.calc_md5() != self.published_md5
+        end
+
+        def update_md5
+            @image_info['published_md5'] = self.calc_md5
+            self.write_imageinfo
+        end
     end
 end

data/lib/ralber/publisher.rb

@@ -44,6 +44,10 @@ module Ralber
                 destdir = File.join(path,imgdir,name)
                 self.create_images(destdir,conf,name )
             }
+            @album.images.each {|img|
+                self.inform_listeners(:image_update_md5, "Updating MD5 information for #{File.basename(img.path)}")
+                img.update_md5
+            }
         end
 
         def publish_index_to(path)
@@ -126,7 +130,7 @@ module Ralber
                 info = self.image_info(img,name)
                 format = (conf['format']).to_sym if conf['format']
                 destfile = File.join(destdir,img.get_resized_name(img.path,format))
-                if (File.exists?(destfile) && @force != true)
+                if (File.exists?(destfile) && @force != true && (not img.has_changed()))
                     self.inform_listeners(:create_resized_version, "Skipping #{name}: #{info['rel_path']}, File exists");
                 else
                     self.ensure_path(destdir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ralber
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexander Schenkel