phoseum-cli 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d4c2caa638507e748ded48b8bd2f399118f4c0575d63c79605a30404c52266
-  data.tar.gz: 96769e821a7a65173ade5e8f1590243844b0f24cdaf5dac3e72018366e99448c
+  metadata.gz: b9b6d70c029b61bd0b79fa9b273127031722834e15ce61e3c9af70c4df351257
+  data.tar.gz: 785291e7e82d36150ec29aafcdcc965af92f2fed9e2fad501ed16c49961922b4
 SHA512:
-  metadata.gz: 036dfce8b227c96a9dacb497e4e99935fbb4a08187af54e6b886aa29d729773e36a881f6055a1991421e11aadbabb252bbd2035875f1e914ab751f62c5d36b6c
-  data.tar.gz: ffcc052629a6b59a3eecec0a9563e8d1248587f039736ef796325acce034aedc2926a553ca971026e0dfd0916ea63d768ae14d4c84c0cf0825cd4f1bbeb3b603
+  metadata.gz: 50c263d913f571b9c55a31e6aab978568067105fb663c3ed2c41a244942e2e06b9c7fa16a3933e53a25f735ec3cefb1a63598fdc000f1d4fe38771b8090ec7e9
+  data.tar.gz: ba3c420ac178f153baef9815486cd902cb3f42906bf66bc038bdff0478ea0c52092926e41cf704a5b7e5939cc9bedc88b65872dab94c4182153d89ca0ea5a9df

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
+      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,16 +475,50 @@ 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] }
+    server_value = cross_versions()
+    if server_value['version'] != VERSION_SIGN
+      puts "Server and Client version won't match, please make them match to continue.".red
+      puts "Remote version: #{server_value['version']}"
+      puts "Local version: #{VERSION_SIGN}"
+      exit 1
+    end
     puts "Start login process".green if !$QUIET
     if user_login
       puts "Login successful".green
     else
       puts "Login failed".red
     end
+  when -> (vs) { vs[:version] }
+    local_version
+    exit 0
+  when -> (x) { x[:crossv] }
+    server_value = cross_versions()
+    puts "Remote version: #{server_value['version']}"
+    puts "Local version: #{VERSION_SIGN}"
+    exit 0
   when -> (t) { t[:test] }
     puts "Making local analysis of files on directory".green if !$QUIET
     test

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,10 +40,22 @@ 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
 
+    opts.on("-V", "--version", "What version we are") do |vs|
+      options[:version] = vs
+    end
+
+    opts.on("-x", "--cross-versions", "Check version match between Client and API") do |x|
+      options[:crossv] = x
+    end
+
     opts.on("-r", "--role ROLE", "Role for user: [User, Super]. Use with 'create-user'") do |r|
       options[:role] = r
     end
@@ -149,6 +165,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
@@ -234,6 +261,37 @@ def validate_token(token)
   end
 end
 
+def cross_versions
+  headers = {}
+  base = URI.parse("#{$config['SERVERURL']}")
+  request = Net::HTTP::Post.new(base,headers)
+  request.basic_auth("cli", "loginNOauth")
+  request.body = JSON.generate({"action" => "version-check" })
+  response = Net::HTTP.start(base.hostname, $config['PORT'],
+                             :timeout => $config['CALL_TIMEOUT'],
+                             :use_ssl => base.scheme == "https",
+                             :verify_mode => OpenSSL::SSL::VERIFY_PEER,
+                             :ca_file => $config['CA_TRUST']
+                             ) do |http|
+    http.request(request)
+  end
+  begin
+    list = JSON.parse(response.body)
+    return list
+    # if list['error']
+    #   return false
+    # end
+    # if list['success']
+    #   return true
+    # end
+  rescue
+    puts "\nThe server sent out an Error:".red
+    puts clean_html(response.body)
+    exit 1
+  end
+end
+
+
 def delete_user(username)
   headers = {}
   if $config['TOKEN']
@@ -266,3 +324,10 @@ def delete_user(username)
     exit 1
   end
 end
+
+def local_version
+  puts "This CLI library is running version: #{VERSION_SIGN}"
+  return
+end
+
+VERSION_SIGN="0.0.16"

metadata

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