phoseum-cli 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64322b7d05911b8e332b53a9c71e802ba0328a3f566f510a4c987eaab30447ad
-  data.tar.gz: 7f44480404aa5d42533deef77414997b9cf459d215726ce4723aeb37055ed9b9
+  metadata.gz: 7282f4986b7a9f813c002c354d5fae25c6b0e29fd6274c4cd8ee5fa2a75cc89b
+  data.tar.gz: 3e22b900db8134c6a90b9cd54c55d672ddef8af86195c0148f7458fe924d47c0
 SHA512:
-  metadata.gz: eb7348f7bbac6a5f225be5e19a633fb46a57eb33122392dcbff9735eeca51c154acb4a2a7a269642c4145e8c26843620c6f9e3a7483db15fa3dc68ad650cd0fb
-  data.tar.gz: 27739486308f80512d929123d46a46b809e1ec930c5b63ff1f227654e9bf42aba183b823646b8a71eddc7f392b8b231e9a84a39b7b66f46ccf773b9529054d3e
+  metadata.gz: 6f23596ae34b88ba0bbb537672304490c2e065e448dfbb9b434052f73dc73080c0dbe89cbbf9b2b149c844b8a5695be19472f669e91fbeaf90e6a89cbe5d773c
+  data.tar.gz: c044c7b0922aacc1f0830e0592f6b7357266664f9c4ecbc5418a69ad2e86cb0f20cec3067708aa0e3321e76c2b8f5d0c096bdf494717813866e55007eda83ce0

data/bin/phoseum-cli

@@ -108,6 +108,7 @@ def upload(album)
         else
           puts "\n#{msg_resp['error']}".red
           error += 1
+          break
         end
       rescue
         puts "\nThe server sent out an Error:".red
@@ -323,8 +324,9 @@ end
 
 def delete(what='',path='')
   puts "You must write 'YES' to confirm, otherwise NO is assumed".yellow
-  print "Are you sure you want to delete the Album #{path} :[YES/NO]: "
+  print "Are you sure you want to delete the #{what} #{path} :[YES/NO]: "
   confirm=STDIN.gets.chomp
+
   if confirm == "YES"
     headers={}
     if $config['TOKEN']
@@ -349,9 +351,20 @@ def delete(what='',path='')
                                 ) do |http|
       http.request(request)
     end
-    list = JSON.parse(response.body)
-    # missing begin test result
-    puts list
+    begin
+      list = JSON.parse(response.body)
+      if list['error']
+        puts list['error'].red
+        exit 1
+      else
+        puts list['success'].green
+        exit 0
+      end
+    rescue
+      puts "\nThe server sent out an Error:".red
+      puts clean_html(response.body)
+      exit 1
+    end
   else
     puts "Deleting cancelled.".green
   end
@@ -388,12 +401,22 @@ case options
     if options[:album]
       value=check_string_sanity(options[:album])
       what='album'
+      if value == "/" or value == '' or value.nil?
+        puts "It is Not possible to delete base album".red
+        exit 1
+      end
     end
-    if value == "/" or value == '' or value.nil?
-      puts "It is Not possible to delete base album".red
-      exit 1
+    if options[:image]
+      if _found = check_image_exists(options[:image])
+        img_data = JSON.parse(_found)
+        value="#{img_data['web_path']}/#{img_data['image']}"
+        what='image'
+      else
+        puts "Image not found on server".red
+        exit 1
+      end
     end
-    puts "Deleting Album #{value}".green if !$QUIET
+    puts "Deleting #{what} #{value}".green if !$QUIET
     delete(what,value)
   when -> (u) { u[:upload] }
     puts "Preparing to upload images to API server".green if !$QUIET

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

@@ -96,15 +96,13 @@ class String
 end
 
 def client_checks
-
   if $config['SERVERURL'] == ''
-     puts "I could not find a valid SERVERURL configuration. CFG is empty.".red
-     exit 1
+    puts "I could not find a valid SERVERURL configuration. CFG is empty.".red
+    exit 1
   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
-
   if !$config['DEFAULT_SECRET']
     puts "I could not find the DEFAULT_SECRET from Phoseum config, this will limit our actions.".red
     exit 1
@@ -132,7 +130,21 @@ def clean_html(msg)
   return msg
 end
 
-def search_image(sign)
+def check_image_exists(fpath)
+  flocal = fpath.split('/')
+  filename = flocal.last
+  album = fpath.clone
+  album.gsub!(/#{filename}/,'')
+
+  if ffile = search_image(filename,album)
+    return ffile
+  else
+    return false
+  end
+  exit 0
+end
+
+def search_image(sign,album='')
   headers = {}
   if $config['TOKEN']
     headers={ "bearer" => "#{$config['TOKEN']}" }
@@ -144,7 +156,7 @@ def search_image(sign)
       exit 1
     end
   end
-  some_uri="?signature=#{sign}"
+  some_uri= album == '' ? "?signature=#{sign}" : "?signature=#{sign}&inside_album=#{album}"
   base = URI.parse("#{$config['SERVERURL']}#{some_uri}")
   request = Net::HTTP::Get.new(base,headers)
   response = Net::HTTP.start(base.hostname, $config['PORT'],
@@ -158,6 +170,7 @@ def search_image(sign)
   begin
     list = JSON.parse(response.body)
     if list['warning']
+      # puts list['warning']
       return list['warning']
     end
     if list['success']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phoseum-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Julio C Hegedus