phoseum-cli 0.0.24 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b2515ecd25464bc144a69a49c3886cfb026c0d8f0ddf472027164b93e6919c5
-  data.tar.gz: 5f6264f4f0d50d4d154f7a4741cc846b52d778f7729f416cbf603f3523afda54
+  metadata.gz: f53423a1821a507dc1d206fb7c6353a0de579a4f18c301504b0d48f8bda44215
+  data.tar.gz: d66ca654de0d5b95c58744f3647aab47ec5a598b1b30f5ee61b907a0d0342767
 SHA512:
-  metadata.gz: be476a9a88cc455cf16ba96ecc8716b162c7031fa75e1613d171b5247529b2484167733aba93f068d84348baf0403ad57db8395aa28bfc485b029c92a86cde15
-  data.tar.gz: 0ee2429307623d92a6791681f0ba8bcb036057d95776ca2db4cd7639a40a4f83053cba655fc27694da20d007b4515305593a41b40761de65e24d28650bbbc1ed
+  metadata.gz: 3da519912424da022ff5ba68455a3759be3445d7e0a184e04b5d0a1b00dce296c82f36edff730ed01f95be186ec59d39985c0deff7431e94bb002c6f8cd2b0d6
+  data.tar.gz: 7a42a48b927f9d2a220618b38acdbc67e19621f6807a4cbc0b899238357e84f6ce21f586e372a72954c215f82b2561ae0d9567ea58dd25ee396ee14d78c255a7

data/bin/phoseum-cli

@@ -205,14 +205,13 @@ def health(what='',name='')
 
   if list['success']
     data=list['success']
-
     if data['Albums']
       puts "  >> Albums Available at this level (#{data['Albums'].count})".green if !$QUIET
       data['Albums'].each do |album|
         if $DEBUG
           puts JSON.pretty_generate(album)
         else
-          created = DateTime.strptime(album['created'],'%s')
+          created = DateTime.strptime(album['created'].to_s,'%s')
           puts "Name: #{album['name']} | Web Path: #{album['web_path']} | description: #{album['description']} | created: #{created} "
         end
       end
@@ -224,8 +223,9 @@ def health(what='',name='')
         if $DEBUG
           puts JSON.pretty_generate(photo)
         else
-          added = DateTime.strptime(photo['added'],'%s')
-          puts "Name: #{photo['name']} | Filename: #{photo['image']} | Format: #{photo['full_info']['format']} | Dim.(WxH): #{photo['full_info']['geometry']['width']} x #{photo['full_info']['geometry']['height']} | Size: #{photo['size']} | Included: #{added}"
+          added = DateTime.strptime(photo['added'].to_s,'%s')
+          photo['exif']=JSON.parse(photo['exif'])
+          puts "Name: #{photo['name']} | Filename: #{photo['image']} | Format: #{photo['exif']['format']} | Dim.(WxH): #{photo['exif']['geometry']['width']} x #{photo['exif']['geometry']['height']} | Size: #{photo['size']} | Included: #{added}"
         end
       end
     end
@@ -287,10 +287,11 @@ def user_login(puser='',ppass='')
       data=list['success']
       puts data if !$QUIET
       $config['TOKEN']=list['token']
-      home_cfg=File.expand_path('~/.phoseum/cli-config.yml')
-      file_to_write = home_cfg
-      File.open(file_to_write, 'w') do |f|
-        f.write(Psych.dump($config))
+      begin
+        save_config('cli',$config)
+        puts "New configuration saved" if $DEBUG
+      rescue StandardError => e
+        puts "ERROR: Failed to save configuration :: #{e}"
       end
       puts  "Newly received token is: #{list['token']}" if $DEBUG
       return list['token']

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

@@ -370,4 +370,4 @@ def local_version
   return
 end
 
-VERSION_SIGN="0.0.24"
+VERSION_SIGN="0.0.30"

data/lib/phoseum/phoseum-common-lib.rb

@@ -124,6 +124,17 @@ def load_config(who)
       puts "CLI CFG Not found: #{file_to_load} "
       exit 1
     end
+  elsif who == "fe"
+    local_dir=Dir.pwd
+    home_cfg=File.expand_path("#{local_dir}/cfg")
+    file_to_load = [home_cfg,"phoseum-fe-config.yml"].join('/')
+    if !Dir.exist?(home_cfg)
+      gen_config(who)
+      puts "New configuration was generated for #{file_to_load} FrontEnd."
+    end
+    if !File.file?(file_to_load)
+      puts "FE CFG Not found: #{file_to_load} "
+    end
   else
     puts "Not sure which configuration to load. Abort."
     exit 1
@@ -134,15 +145,36 @@ def load_config(who)
     puts "Opening configuration from #{file_to_load}" if config_data['DEBUG']
   rescue
     puts "Failed loading configuration from #{file_to_load}"
-    exit 1
+    exit 1 if who != 'fe'
+    return false
   end
   return config_data
 end
 
-def gen_config(who)
+def sane_config(type,key)
+  ct = {}
+  case type
+  when 'cli'
+    ct = { type => ['SERVER','DEBUG','PORT','CALL_TIMEOUT','DEFAULT_SECRET','TOKEN']}
+  when 'api'
+    ct = { type => ['THREADED','BASEALBUM','ALBUM_URL','STORE_DIR','DEBUG','PORT','EXT_URL','MAX_IMG_SIZE','RESIZE','RESAMPLE','CALL_TIMEOUT','DEFAULT_SECRET']}
+  when 'fe'
+    ct = { type => ['THEME','THEME_STYLE','LIMIT','NXT_LOAD','SCROLL_SPEED','ROTATE_TO','SCROLL_BACK','LOGO','TITLE_P','TITLE_B','IMG_LABEL','REFRESH_DELETE','IMG_COLUMNS','ALB_COLUMNS','DEF_VIEW','LOAD_METHOD']}
+  end
 
+  good_key=false
+  ct[type].each do |k|
+    if k == key
+      good_key=true
+    end
+  end
+  return good_key
+end
+
+def gen_config(who)
   local_config={}
   file_to_write=''
+  local_dir=Dir.pwd
 
   case who
   when "cli"
@@ -164,10 +196,9 @@ def gen_config(who)
     end
     file_to_write = [home_cfg,"cli-config.yml"].join('/')
     puts "Creating config at #{file_to_write}"
-
   when "api"
     local_config['THREADED']=false
-    local_dir=Dir.pwd
+    local_config['SUBCHECK']=true
     local_config['BASEALBUM']="#{local_dir}/Albums"
     local_config['ALBUM_URL']="Albums"
     local_config['STORE_DIR']="#{local_dir}"
@@ -188,12 +219,57 @@ def gen_config(who)
     new_secret = SecureRandom.base64(32)
     local_config['DEFAULT_SECRET'] = new_secret
     puts "\nGenerating new secret: #{new_secret}"
+  when "fe"
+    local_config['THEME']="Default"
+    local_config['THEME_STYLE']="single"
+    local_config['LIMIT']=30
+    local_config['NXT_LOAD']=10
+    local_config['SCROLL_SPEED']=40
+    local_config['SCROLL_BACK']="smooth"
+    local_config['ROTATE_TO']="left"
+    local_config['DEF_VIEW']="basic"
+    local_config['LOGO']="logo-phoseum.png"
+    local_config['TITLE_P']="Your personal museum of photography"
+    local_config['TITLE_B']="Phoseum"
+    local_config['IMG_LABEL']=false
+    local_config['REFRESH_DELETE']=false
+    local_config['LOAD_METHOD']="auto"
+    local_config['IMG_COLUMNS']=4
+    local_config['ALB_COLUMNS']=4
 
+    home_cfg="#{local_dir}/cfg"
+    if !Dir.exist?(home_cfg)
+      Dir.mkdir(home_cfg)
+    end
+    file_to_write = [home_cfg,"phoseum-fe-config.yml"].join('/')
+    puts "Creating config at #{file_to_write}"
   end
-
   File.open(file_to_write, 'w') do |f|
     f.write(Psych.dump(local_config))
   end
   return true
+end
+
+def save_config(which,config_var)
+  file_to_write=''
+  local_dir=Dir.pwd
+
+  case which
+  when "cli"
+    home_cfg=File.expand_path('~/.phoseum/')
+    file_to_write = [home_cfg,"cli-config.yml"].join('/')
+  when "api"
+    home_cfg="#{local_dir}/cfg"
+    file_to_write = [home_cfg,"phoseum-api-config.yml"].join('/')
+  when "fe"
+    home_cfg="#{local_dir}/cfg"
+    file_to_write = [home_cfg,"phoseum-fe-config.yml"].join('/')
+  end
+  puts "Saving #{which} config at #{file_to_write}" if $config['DEBUG']
+
+  File.open(file_to_write, 'w') do |f|
+    f.write(Psych.dump(config_var))
+  end
+  return true
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoseum-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.30
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.8
 signing_key:
 specification_version: 4
 summary: Client for Phoseum