phoseum-cli 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79b0cc59910f35dcbdd5a260cb32aae60678cc168e2adeb45a6ecee9f4cbd34a
-  data.tar.gz: 57538eade56ae69d9fe3e093032265914d557dbe9fd7fa0eac17af22e478e670
+  metadata.gz: a62dd7a4317315a806e9e0c47fda71440cd5cfe18f8acc14576cb1fc84b2fee4
+  data.tar.gz: 02561a9d90764ed24baf53432d0871d5db73ff2e93026da32a6d4f2f59098386
 SHA512:
-  metadata.gz: 9e23015f5dbef4a6e07fef4ba1fb77fcd7b9431fa23349d592edd97b4eca56971b891a82623dc4fd56cc3771907e3f33becae531c1d23c1747add6ccc8e886a6
-  data.tar.gz: eb073ffac401ca46c43bf93166db6ae6f59d3c43508bf0bdbbd87636e432e4c948100cdc858c8ae24cd5285eeddb215b0752c1ef758f1560b7edb5e786d7c207
+  metadata.gz: 1543277b2a80405e9bd65fa7803dc6c57b8ad1e2b10e887448e820d317f95e209a8c6a26f7f62963474e491ab5755e6b506eab577547612b9242eb01e52344cb
+  data.tar.gz: f2533161dcc360ecc7f4a792604f739a472dc54ac023fae45dd20a2dcce1d670e081b28d4683e36a2392c074b6ae87ff57411e5cb24e69ef3b95b6c0b87fc2d2

data/bin/phoseum-cli

@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
+# encoding: UTF-8
 
 require "phoseum/phoseum-common-lib"
 $config = load_config('cli')
@@ -7,7 +8,6 @@ require "phoseum/phoseum-cli-lib"
 load_gem('uri')
 load_gem('json')
 load_gem('date')
-load_gem('nokogiri')
 load_gem('mini_magick')
 
 require 'optparse'
@@ -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
 
@@ -61,16 +62,28 @@ def upload(album)
       end
       total_size = (total_size + image.size)
 
+      # 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
+
+      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"
-      post_body << "Content-Disposition: form-data; name=\"datafile\"; filename=\"#{File.basename(filename)}\"\r\n"
+      post_body << "Content-Disposition: form-data; name=\"datafile\"; filename=\"#{image.signature}\"\r\n"
       post_body << "Content-Type: #{image.mime_type}\r\n"
       post_body << "\r\n"
       post_body << File.read(filename)
       post_body << "\r\n--#{BOUNDARY}--\r\n"
       http = Net::HTTP.new(uri.host, uri.port)
-      headers = headers.merge({ "filename" => filename, "album" => "#{album}" })
+      headers = headers.merge({ "filename" => "#{image.signature}.#{image.type}", "album" => "#{album}", "name" => human_name })
       request = Net::HTTP::Post.new(uri, headers)
       request.body = post_body.join
       request["Content-Type"] = "multipart/form-data, boundary=#{BOUNDARY}"
@@ -84,7 +97,6 @@ def upload(album)
       end
       print "Format: #{image.type} | Dim.: W = #{image.width} H = #{image.height} | Size: #{imgSZ} : ".yellow if !$QUIET
 
-
       begin
         msg_resp = JSON.parse(response.body)
         if msg_resp['success']
@@ -94,12 +106,12 @@ def upload(album)
           puts "#{msg_resp['warning']}".yellow
           warn += 1
         else
-          puts "#{msg_resp['error']}".red
+          puts "\n#{msg_resp['error']}".red
           error += 1
         end
       rescue
-        puts "Error on Server".red if $DEBUG
-        puts Nokogiri::HTML(response.body).text
+        puts "\nThe server sent out an Error:".red
+        puts clean_html(response.body)
         exit 1
       end
 
@@ -168,7 +180,6 @@ def health(what='',name='')
   end
   begin
     list = JSON.parse(response.body)
-    # puts list
     if list['error']
       puts list['error'].red
       exit 1
@@ -177,8 +188,8 @@ def health(what='',name='')
       data=list['success']
     end
   rescue
-    puts "Error on Login".red if $DEBUG
-    puts Nokogiri::HTML(response.body).text
+    puts "\nThe server sent out an Error:".red
+    puts clean_html(response.body)
     exit 1
   end
 
@@ -237,7 +248,6 @@ def user_mgmt(action,user,pass='',role='')
   end
   begin
     list = JSON.parse(response.body)
-    # puts list
     if list['error']
       puts list['error'].red
       exit 1
@@ -247,8 +257,8 @@ def user_mgmt(action,user,pass='',role='')
       puts data
     end
   rescue
-    puts "Error on Login".red if $DEBUG
-    puts Nokogiri::HTML(response.body).text
+    puts "Error on Login".red
+    puts clean_html(response.body)
   end
   exit 0
 end
@@ -303,7 +313,8 @@ def user_login()
       return list['token']
     end
   rescue
-    puts Nokogiri::HTML(response.body).text
+    puts "\nThe server sent out an Error:".red
+    puts clean_html(response.body)
     return false
   end
   return false

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.1
+  version: 0.0.6
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -90,26 +90,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.10
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement