photo-helper 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0feaba25fffb7634e816f16e80f11666cd6b18add7654d49cbd94bee690038ff
-  data.tar.gz: 6b76c47719929fe25c68373585ce2365a6d8b8e25606e4f3985e5ac8c1016f53
+  metadata.gz: 10d2b80093609775220a8b4055332e15afd40f95b43e7288546bf2aa7a3a44ba
+  data.tar.gz: 9b9985e0f5b79c92dc18f9f691340c39430df4846f3854b411058b87b798f89c
 SHA512:
-  metadata.gz: e8051f0f5b37c43c75ecf88efffa7aa6e0aaecd10c699e1f596472b3372e87634348468e1241f935684d4b43bcc437f4c769f8c78a2980507c890a0720192d3b
-  data.tar.gz: de34bb8a932d4714c830447655f9563817c4500705dd37360952a0f9f6f1fe0d912351d42fece858afbe71eaa4f76d89bb2f3274b6a09dbe043900ddf6d5a5f0
+  metadata.gz: ef04dbd4813b95654bf4ef9a8fee46ca5501ccdf10de91dd4bb9d3f676ffa4fe59c3be0a508366d03f41379ae1043c4c09ebf3a3cbdd3ef74ddadbf8cbe1dc2a
+  data.tar.gz: 8ef495f06581f0b2691e91d94543a85f9eddd1db471951744cf12f794afef890cfbd05e1eb915f718b24952e3d076d2d20dd322d14c59a36cd4f9b673d6ce4a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photo-helper (0.5.2)
+    photo-helper (0.5.3)
       ejson
       mimemagic
       mini_magick

data/lib/photo-helper/delete.rb

@@ -12,7 +12,7 @@ module PhotoHelper
 
     desc 'jpeg', 'delete jpegs that have an raw with same name'
     method_option :folder, aliases: '-f', type: :string, default: '.'
-    method_option :hard, aliases: '-h', type: :boolean, default: false
+    method_option :'soft-delete', aliases: '-s', type: :boolean, default: true
     method_option :recursive, aliases: '-r', type: :boolean, default: false
     def jpeg(folder = nil)
       folder ||= options[:folder]
@@ -38,10 +38,10 @@ module PhotoHelper
         next if FileHelper.ingore_file?(file)
         puts file
 
-        if options[:hard]
-          File.delete(file)
-        else
+        if options[:softdelete]
           File.trash(file)
+        else
+          File.delete(file)
         end
       end
 

data/lib/photo-helper/smugmug.rb

@@ -37,22 +37,60 @@ module PhotoHelper
 
     desc 'albums', 'list albums with their weburl'
     def albums
+      require 'pp'
+
       @smugmug = SmugmugAPI.new
       albums = @smugmug.albums_long
 
-      current_month = albums.first[:path].split('/')[1]
-      output = ['# Photos', "## #{current_month}"]
+      albums_tree = {}
+      output = ["# Photos"]
 
       albums.each do |a|
-        month = a[:path].split('/')[1]
-        next unless month
-        if month != current_month
-          current_month = month
-          output.push("## #{current_month}")
+        parts = a[:path].split('/')
+        next if parts[0] == "Trash"
+
+        album_name = parts.pop
+        parts.each_with_index do |part, i|
+          if i == 0
+            albums_tree[part] ||= {}
+          else
+            parts[0..(i - 1)].inject(albums_tree, :fetch)[part] ||= {}
+          end
         end
-        output.push("[#{a[:name]}](#{a[:web_uri].gsub('http://', 'https://')})")
+
+        parts[0..-1].inject(albums_tree, :fetch)[album_name] = "[#{a[:name]}](#{a[:web_uri]})"
       end
 
+      # depth first search
+      stack = albums_tree.keys.map { |a| [a] }
+      stack.sort_by! do |key|
+        next key.first.to_i if key.first =~ /^\d+$/
+        next Float::INFINITY
+      end
+
+      pp stack
+
+      until stack.empty?
+        key = stack.pop
+        item = key.inject(albums_tree, :fetch)
+        next if key.first == "dl"
+
+        if item.is_a?(Hash)
+          stack.concat(item.keys.map{|a| key.clone.push(a)})
+          output.push("#{'#'*key.count} #{key.last}")
+          next
+        end
+
+        begin
+          dl_item = ["dl"].concat(key).inject(albums_tree, :fetch)
+          output.push("  **Selects: ** #{item}\n  **All: ** #{dl_item}")
+        rescue
+          output.push(item)
+        end
+      end
+
+      # pp albums_tree
+
       puts output.join("\n\n")
     end
   end

data/lib/photo-helper/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PhotoHelper
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-helper
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Benjamin Caldwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler