phoseum-cli 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 972b9572dcaedc922fd21dce2b2e01d6e88f2d0e56d5c783f7a6dc649caaba0c
-  data.tar.gz: e6982fa62e3c73782969733342c5d6a9286d213bc5bec73ffeddf38b7a72bf91
+  metadata.gz: 64322b7d05911b8e332b53a9c71e802ba0328a3f566f510a4c987eaab30447ad
+  data.tar.gz: 7f44480404aa5d42533deef77414997b9cf459d215726ce4723aeb37055ed9b9
 SHA512:
-  metadata.gz: 7ee2be8d7e2955031aad2a11ab69accb4099a923da96d8b8a2af06654f12c237451eba79084af65e89bdc708f3129c74107ff377b9d2a8352395b2c9d074e4df
-  data.tar.gz: 52b8c5260934de17dd80c5451471ec2f100052be84ca24a0a1cd3e1d5f52910cc1e49e31fb11589d2f12a70a0a238cf19f5ef84b1b51b6c0de183104ea989a4f
+  metadata.gz: eb7348f7bbac6a5f225be5e19a633fb46a57eb33122392dcbff9735eeca51c154acb4a2a7a269642c4145e8c26843620c6f9e3a7483db15fa3dc68ad650cd0fb
+  data.tar.gz: 27739486308f80512d929123d46a46b809e1ec930c5b63ff1f227654e9bf42aba183b823646b8a71eddc7f392b8b231e9a84a39b7b66f46ccf773b9529054d3e

data/bin/phoseum-cli

@@ -19,6 +19,7 @@ options = option_parser(ARGV)
 BOUNDARY = "AaB03x"
 $QUIET = options[:quiet] ? true : false
 $DEBUG = options[:verbose] ? true : false
+$MULTI = options[:multiple] ? true : false
 
 client_checks
 
@@ -66,6 +67,13 @@ def upload(album)
       # human_name = check_string_sanity(filename)
       human_name = filename
 
+      somefound = search_image(image.signature)
+      if somefound
+        print "Filename: #{human_name} was found repeated in Phoseum Server :: ".yellow
+        puts somefound.yellow
+        next if !$MULTI
+      end
+
       uri = URI.parse($config['SERVERURL'])
       post_body = []
       post_body << "--#{BOUNDARY}\r\n"
@@ -342,6 +350,7 @@ def delete(what='',path='')
       http.request(request)
     end
     list = JSON.parse(response.body)
+    # missing begin test result
     puts list
   else
     puts "Deleting cancelled.".green

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

@@ -32,6 +32,10 @@ def option_parser(opts)
       options[:login] = l
     end
 
+    opts.on("-m", "--multiple", "Ignore repeated images, keep multiple") do |m|
+      options[:multiple] = m
+    end
+
     opts.on("-v", "--verbose", "Run verbosely (DEBUG mode)") do |v|
       options[:verbose] = v
     end
@@ -96,7 +100,7 @@ def client_checks
   if $config['SERVERURL'] == ''
      puts "I could not find a valid SERVERURL configuration. CFG is empty.".red
      exit 1
-  elsif $config['SERVERURL'] !~ /\A#{URI::regexp(['https'])}\z/
+  elsif $config['SERVERURL'] !~ /\A#{URI::regexp(['https', 'http'])}\z/
     puts "I could not find a valid SERVERURL configuration. Contains: #{$config['SERVERURL']}".red
     exit 1
   end
@@ -111,15 +115,57 @@ def client_checks
     puts "I could not find the DEFAULT_SECRET from Phoseum config, Variable is empty.".red
     exit 1
   end
-
   if !$config['SERVERURL']
     puts "I could not find the SERVERURL from Phoseum config, this client is then useless.".red
     exit 1
   end
-
   if !$config['PORT']
     puts "I could not find the PORT from Phoseum config, this client is then useless.".red
     exit 1
   end
+end
+
+def clean_html(msg)
+  msg.gsub!(/<\/?[^>]*>/, ' ')
+  msg.gsub!(/\n\n+/, '\n')
+  msg.gsub!(/^\n|\n$/, ' ')
+  return msg
+end
 
+def search_image(sign)
+  headers = {}
+  if $config['TOKEN']
+    headers={ "bearer" => "#{$config['TOKEN']}" }
+  else
+    if token = user_login()
+      headers = { "bearer" => token }
+    else
+      puts "Login Failed".red
+      exit 1
+    end
+  end
+  some_uri="?signature=#{sign}"
+  base = URI.parse("#{$config['SERVERURL']}#{some_uri}")
+  request = Net::HTTP::Get.new(base,headers)
+  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)
+    if list['warning']
+      return list['warning']
+    end
+    if list['success']
+      return false
+    end
+  rescue
+    puts "\nThe server sent out an Error:".red
+    puts clean_html(response.body)
+    exit 1
+  end
 end

metadata

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