aspera-cli 4.2.2 → 4.3.0

data/lib/aspera/persistency_folder.rb

@@ -6,11 +6,8 @@ require 'aspera/log'
 module Aspera
   # Persist data on file system
   class PersistencyFolder
-    WINDOWS_PROTECTED_CHAR=%r{[/:"<>\\\*\?]}
-    PROTECTED_CHAR_REPLACE='_'
-    ID_SEPARATOR='_'
     FILE_SUFFIX='.txt'
-    private_constant :PROTECTED_CHAR_REPLACE,:FILE_SUFFIX,:WINDOWS_PROTECTED_CHAR,:ID_SEPARATOR
+    private_constant :FILE_SUFFIX
     def initialize(folder)
       @cache={}
       set_folder(folder)
@@ -23,7 +20,6 @@ module Aspera
 
     # @return String or nil string on existing persist, else nil
     def get(object_id)
-      object_id=marshalled_id(object_id)
       Log.log.debug("persistency get: #{object_id}")
       if @cache.has_key?(object_id)
         Log.log.debug("got from memory cache")
@@ -39,18 +35,16 @@ module Aspera
     end
 
     def put(object_id,value)
-      raise "only String supported" unless value.is_a?(String)
-      object_id=marshalled_id(object_id)
+      raise "value: only String supported" unless value.is_a?(String)
       persist_filepath=id_to_filepath(object_id)
-      Log.log.debug("saving: #{persist_filepath}")
+      Log.log.debug("persistency saving: #{persist_filepath}")
       File.write(persist_filepath,value)
       @cache[object_id]=value
     end
 
     def delete(object_id)
-      object_id=marshalled_id(object_id)
       persist_filepath=id_to_filepath(object_id)
-      Log.log.debug("empty data, deleting: #{persist_filepath}")
+      Log.log.debug("persistency deleting: #{persist_filepath}")
       File.delete(persist_filepath) if File.exist?(persist_filepath)
       @cache.delete(object_id)
     end
@@ -63,7 +57,7 @@ module Aspera
       end
       garbage_files.each do |filepath|
         File.delete(filepath)
-        Log.log.debug("Deleted expired: #{filepath}")
+        Log.log.debug("persistency deleted expired: #{filepath}")
       end
       return garbage_files
     end
@@ -72,25 +66,11 @@ module Aspera
 
     # @param object_id String or Array
     def id_to_filepath(object_id)
+      raise "object_id: only String supported" unless object_id.is_a?(String)
       FileUtils.mkdir_p(@folder)
       return File.join(@folder,"#{object_id}#{FILE_SUFFIX}")
       #.gsub(/[^a-z]+/,FILE_FIELD_SEPARATOR)
     end
 
-    def marshalled_id(object_id)
-      if object_id.is_a?(Array)
-        # special case, url in second position: TODO: check any position
-        if object_id[1].is_a?(String) and object_id[1] =~ URI::ABS_URI
-          object_id=object_id.clone
-          object_id[1]=URI.parse(object_id[1]).host
-        end
-        object_id=object_id.join(ID_SEPARATOR)
-      end
-      raise "id must be a String" unless object_id.is_a?(String)
-      return object_id.
-      gsub(WINDOWS_PROTECTED_CHAR,PROTECTED_CHAR_REPLACE). # remove windows forbidden chars
-      gsub('.',PROTECTED_CHAR_REPLACE).  # keep dot for extension only (nicer)
-      downcase
-    end
   end # PersistencyFolder
 end # Aspera

data/lib/aspera/rest.rb

@@ -125,7 +125,7 @@ module Aspera
     end
 
     def oauth_token(options={})
-      raise "ERROR: not Oauth" unless @oauth.is_a?(Oauth)
+      raise "ERROR: expecting Oauth, have #{@oauth.class}" unless @oauth.is_a?(Oauth)
       return @oauth.get_authorization(options)
     end
 

data/lib/aspera/timer_limiter.rb

@@ -0,0 +1,22 @@
+module Aspera
+  # used to throttle logs
+  class TimerLimiter
+    # @param delay in seconds (float)
+    def initialize(delay)
+      @delay=delay
+      @last_time=nil
+      @count=0
+    end
+
+    def trigger?
+      old_time=@last_time
+      @last_time=Time.now.to_f
+      @count+=1
+      if old_time.nil? or (@last_time-old_time)>@delay
+        @count=0
+        return true
+      end
+      return false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspera-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Laurent Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -289,6 +289,7 @@ files:
 - lib/aspera/fasp/uri.rb
 - lib/aspera/faspex_gw.rb
 - lib/aspera/hash_ext.rb
+- lib/aspera/id_generator.rb
 - lib/aspera/log.rb
 - lib/aspera/nagios.rb
 - lib/aspera/node.rb
@@ -312,6 +313,7 @@ files:
 - lib/aspera/ssh.rb
 - lib/aspera/sync.rb
 - lib/aspera/temp_file_manager.rb
+- lib/aspera/timer_limiter.rb
 - lib/aspera/uri_reader.rb
 - lib/aspera/web_auth.rb
 homepage: https://github.com/IBM/aspera-cli