phoseum-cli 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7421fbbac2cf512f6be93770f895e789840cb887864d8b2d45839726cc65204f
-  data.tar.gz: f0fac7c15624a6652ec739c44e3af2fd6c64980da1cf5eceb41f188aa4734255
+  metadata.gz: 052beefab210d213c09986b11dfe93e499d328f6523f7f3cba71ecb2502ead53
+  data.tar.gz: 75fd5b65b74758d1517c61e65f69295ca445e70ba37e32ae57863da0ddb825d9
 SHA512:
-  metadata.gz: '0779e4712800a3a8312128db722b25b99a2084b1a7eb1faa1f609ba83b27d423dd3f7174f1f787618452ffbd0617f722c0db9758356fc94d4f1b7d3daaaf7d69'
-  data.tar.gz: b299ad615f973916909dcb52f7ef1e4dc9b52a5c6d80d773a2985db5400394036cc8e0802ccaffcc74d35f04eab139079ac9d89bc01b704bd826af80549d22a2
+  metadata.gz: 44173a8f4ed5893c0fdd6b5a9ef2b4ab463b091ed4c35f237be7f3ad369044a281d9067edbf7bd9d72670c45973827d9428fc015a6071f4eff5e1ff1ffd55c5f
+  data.tar.gz: 68c50ae1d3cc2c35e4d369bc02bbba99236a07a1a3f3e314f73ff411bab7e3ee27965507afbb22b44220df36a411ee10a84586ad5109be62e4e2bf974cba7f95

data/bin/phoseum-cli

@@ -23,7 +23,7 @@ $MULTI = options[:multiple] ? true : false
 
 client_checks
 
-def upload(album)
+def upload(album,syn_name='',description='')
   headers = {}
   if !validate_token($config['TOKEN'])
     if token = user_login()
@@ -65,7 +65,8 @@ def upload(album)
       # last resort solution for accents and unrecognizable characters
       # but then will need to remove extension, pass the filter, then add extension again.
       # human_name = check_string_sanity(filename)
-      human_name = filename.gsub!(/(.*)\.JPG|JPEG|PNG|GIF$/i,'\1')
+      human_name = filename.dup
+      human_name = human_name.gsub!(/(.*)\.JPG|JPEG|PNG|GIF$/i,'\1')
 
       somefound = search_image(image.signature)
       if somefound
@@ -84,6 +85,12 @@ def upload(album)
       post_body << "\r\n--#{BOUNDARY}--\r\n"
       http = Net::HTTP.new(uri.host, uri.port)
       headers = headers.merge({ "filename" => "#{image.signature}.#{image.type}", "album" => "#{album}", "name" => human_name })
+      if ! syn_name.nil?
+        headers = headers.merge({ "album_name" => syn_name })
+      end
+      if ! description.nil?
+        headers = headers.merge({ "description" => description })
+      end
       request = Net::HTTP::Post.new(uri, headers)
       request.body = post_body.join
       request["Content-Type"] = "multipart/form-data, boundary=#{BOUNDARY}"
@@ -468,8 +475,27 @@ case options
       exit 1
     else
       album_clean=check_string_sanity(options[:album])
-      puts "Using Album destination: #{album_clean}".light_blue if !$QUIET
-      upload(album_clean)
+      usable_name= options[:name] ? options[:name].dup : ''
+      usable_desc= options[:description] ? options[:description].dup : ''
+      if usable_name.length > 255 || usable_desc.length > 255
+        if usable_name.length > 255
+          puts "Synthetic name has #{usable_name.length} characters!!".red
+        end
+        if usable_desc.length > 255
+          puts "SHORT Description has #{usable_desc.length} characters!!".red
+        end
+        puts "This is a huge-ass string mate, what are you doing?".red
+        puts "We should limit this to 255 chars. Keep it short. Aborting.".red
+        exit 1
+      end
+      if options[:name]
+        usable_name = clean_name(options[:name])
+        usable_desc = clean_name(options[:description])
+        puts "Using Album destination: #{album_clean} --> Named as '#{usable_name}'".light_blue if !$QUIET
+      else
+        puts "Using Album destination: #{album_clean}".light_blue if !$QUIET
+      end
+      upload(album_clean,usable_name,usable_desc)
     end
   when -> (l) { l[:login] }
     puts "Start login process".green if !$QUIET

data/lib/phoseum/phoseum-cli-lib.rb

@@ -20,6 +20,10 @@ def option_parser(opts)
       options[:delete] = d
     end
 
+    opts.on("-D", "--description 'SHORTDESC'", "Add album description (up to 255 chars). Use with: [album-path]") do |ds|
+      options[:description] = ds
+    end
+
     opts.on("-f", "--file-cfg FILENAME", "Use alternative configuration file") do |f|
       options[:filecfg] = f
     end
@@ -36,6 +40,10 @@ def option_parser(opts)
       options[:multiple] = m
     end
 
+    opts.on("-N", "--name 'REALNAME'", "Set Album's synthetic name. Use with: [album-path]") do |n|
+      options[:name] = n
+    end
+
     opts.on("-v", "--verbose", "Run verbosely (DEBUG mode)") do |v|
       options[:verbose] = v
     end
@@ -149,6 +157,17 @@ def clean_html(msg)
   return msg
 end
 
+def clean_name(nameval)
+  name_words = nameval.split(' ')
+  name = ''
+  name_words.each do |word|
+    cword = check_string_sanity(word)
+    name = name.nil? ? cword : [name,cword].join(' ')
+  end
+  name.gsub!(/^\ /,'')
+  return name
+end
+
 def check_image_exists(fpath)
   flocal = fpath.split('/')
   filename = flocal.last

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoseum-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml