pwup 0.0.1 → 0.0.2

data/lib/pwup.rb

@@ -1,5 +1,6 @@
-require 'date'
+require 'pathname'
 require 'tmpdir'
+
 require 'picasa'
 
 module PwUp
@@ -10,7 +11,7 @@ module PwUp
       ".rar" => "unrar x -ep \"%<file>s\" %<target_dir>s",
       ".zip" => "unzip -j \"%<file>s\" -d %<target_dir>s",
     }
-    IMAGE_TYPES = %w[.jpg .png .gif]
+    IMAGE_TYPES = %w[*.jpg *.png *.gif]
 
     def initialize(email, password)
       @email = email
@@ -22,9 +23,12 @@ module PwUp
     def process!(files, album_name)
       # create a tmp folder
       target_dir = Dir.mktmpdir('pwup', '/tmp')
-      # these are the compressed ones
+      # these are the compressed ones or directories
+      unless files.respond_to? :each
+        files = [files]
+      end
       files.each do |file|
-        if not process? file
+        unless process? file
           puts "Skipping, can't process file #{file}"
           next
         end
@@ -33,22 +37,29 @@ module PwUp
         unpack file, target_dir
       end
       # filter only the images
-      images = Dir.foreach(target_dir).select {|f| IMAGE_TYPES.include? File.extname(f).downcase}
+      p1 = Pathname.new target_dir
+      images = Dir.glob(IMAGE_TYPES.map {|i| p1 + "**" + i} ,File::FNM_CASEFOLD)
       puts "Found #{images.length} images"
       # exit if no images where found
       return if images.length == 0
       puts "Uploading to #{album_name}"
       # create album
-      album = @picasa.create_album(:title => album_name,
-      :summary => album_name,
-      :location => "", :keywords => "", :timestamp => DateTime.now.to_time.to_i)
+      album = @picasa.create_album(
+        title: album_name,
+        summary: album_name,
+        location: "",
+        keywords: "",
+        timestamp: Time.now.to_i
+        )
       puts "album name = #{album.name}"
       images.each do |image|
         file_name = File.join(target_dir, image)
         puts "Reading #{file_name}"
         image_data = open(file_name, "rb").read
-        photo = @picasa.post_photo(image_data, :album => album.name,
-        :summary => file_name, :title => file_name)
+        @picasa.post_photo(
+          image_data, :album => album.name,
+          :summary => file_name, :title => file_name
+          )
         puts "photo #{file_name} uploaded to #{album.name}"
       end
     end
@@ -56,13 +67,20 @@ module PwUp
     private
     def process?(file)
       ext = File.extname(file)
-      COMMANDS.include? ext.downcase and File.exists? file
+      COMMANDS.include? ext.downcase and File.exists? file or File.directory? file
     end
 
     def unpack(file, target_dir)
-      ext = File.extname(file)
-      command = COMMANDS[ext] % {:file=>file, :target_dir=>target_dir}
-      system(command)
+      # if it's a dir, copy all content to the target_dir
+      if File.directory? file
+        p1 = Pathname.new file
+        images = Dir.glob(IMAGE_TYPES.map {|i| p1 + "**" + i} ,File::FNM_CASEFOLD)
+        FileUtils.cp(images, target_dir)
+      else
+        ext = File.extname(file)
+        command = COMMANDS[ext] % {:file=>file, :target_dir=>target_dir}
+        system(command)
+      end
     end
   end
 end

metadata

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