mymedia_ftp 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2a79c27201bd99d03df23d7fac22ac335904f591
-  data.tar.gz: c95aeb3a504437ed05e198d0e11d4b1d9ce2ecd4
+SHA256:
+  metadata.gz: b7eb16a509a0458ad7e202999d535cb7aabe305e08b5267ae0f39f3583ffeecd
+  data.tar.gz: 4c0f913a18c5a00fc91c6a4be31895fcbdd265f47382b66fce04ecba22d7b05c
 SHA512:
-  metadata.gz: c96d73bf20f366be140b15d6702393431812bcf89094b2fd3dfbe04d20731adfff977f2c786f2415d9384c268590d32dca930474edf9c2dd5fd900bbdaff2e59
-  data.tar.gz: f0c685f277c99e5eb5a9dcf835c20d7af289f1f47927beec6d7f9ac311737d9d21203ab35079e4d9a17cc132f5ccd98e0372d0c669a61a2fddfa8f48751b7bc1
+  metadata.gz: 5cd0981666fe7fd3434a601d80698d774972706743503e1d5300fe0c94da5ab6b84816ec141f5b61f2464f38c6bbd3f8c5a10d0ab5fba58fa29009cec5dce640
+  data.tar.gz: b4b03d2487ac64c1d571f51ec11886e70adbe943c1f6111be4cff7a9e2ded7b797c84adfcb86e74af9c3925500a38feacc2a683019a56a2c0ff58907a7837066

data/lib/mymedia_ftp.rb

@@ -3,15 +3,75 @@
 # file: mymedia_ftp.rb
 
 require 'net/ftp'
+require 'tempfile'
 require 'fileutils'
 
 
 class MyMediaFTP < Net::FTP
 
-  def initialize(host: '127.0.0.1', user: 'user', password: '1234', 
+  def self.cp(src, dest, debug: false)
+    
+    if src =~ /^ftp:\/\// then
+      uri, remotepath = src.match(/^(ftp:\/\/[^\/]+)(\/[^$]+)/).captures    
+      new(uri, debug: debug).cp(remotepath, dest, :inbound)
+    else
+      uri, remotepath = dest.match(/^(ftp:\/\/[^\/]+)(\/[^$]+)/).captures    
+      new(uri, debug: debug).cp(src, remotepath, :outbound)      
+    end    
+    
+  end
+  
+  def self.ls(s, debug: false)
+    
+    uri, remotepath = s.match(/^(ftp:\/\/[^\/]+)(\/[^$]*)?/).captures
+    puts 'remotepath'  + remotepath.inspect if debug
+    new(uri, debug: debug).ls(remotepath || '/')
+    
+  end
+
+  def self.read(s, debug: false)
+        
+    uri, remotepath = s.match(/^(ftp:\/\/[^\/]+)(\/[^$]+)/).captures
+    ftp = new(uri, debug: debug)
+    p ftp if debug
+    
+    tmpfile = Tempfile.new('ftp')
+
+    ftp.cp remotepath, tmpfile.path
+    File.read tmpfile.path
+
+  end
+  
+  def self.rm(s, debug: false)
+        
+    uri, remotepath = s.match(/^(ftp:\/\/[^\/]+)(\/[^$]+)/).captures
+    new(uri, debug: debug).rm(remotepath)
+
+  end  
+  
+  def self.write(s, content='', debug: false)
+            
+    tmpfile = Tempfile.new('ftp')    
+    File.write tmpfile.path, content    
+    self.cp tmpfile.path, s
+
+  end  
+  
+  def initialize(s=nil, host: '127.0.0.1', user: 'user', password: '1234', 
                  port: 21, debug: false)
 
+    if s then
+      
+      r = s.match(/(?<user>\w+):(?<password>\w+)@(?<host>[^:]+)(?:\:(?<port>\d+))?/)
+      h = r.named_captures.map {|k,v| [k.to_sym, v]}.to_h
+      puts 'h: ' + h.inspect if debug
+      user, password, host = h.values.take(3)
+      port = h[:port] if h[:port]
+      
+    end
+    
     @debug = debug
+
     @curdir = '/'
     super()
     connect(host, port)
@@ -23,55 +83,74 @@ class MyMediaFTP < Net::FTP
     super(dir)
     @curdir = pwd
   end
+  
+  alias cd chdir
 
-  def cp(src='', dest='', &blk)
+  def cp(src='', dest='', direction=:inbound, &blk)
 
+    return outbound_cp(src, dest) if direction == :outbound
+    
     puts 'cp: ' + src.inspect if @debug
     chdir File.dirname(src)
-    FileUtils.mkdir_p dest
-    Dir.chdir  dest
-
-    files = list_filenames(src)
-
-    puts 'copying ...'
+    dir = File.dirname(dest)
+    FileUtils.mkdir_p dir
+    Dir.chdir  dir
 
-    files.each do |h|
-
-      name, type = h[:name], h[:type]
+    puts 'copying ...' if @debug
+    
+    files = if src =~ /[\*\?]/ then
+    
+      cp_files(src)
       
-      puts name
+    else
+      
+      begin
+        getbinaryfile src, dest
+      rescue Net::FTPPermError => e
+        puts 'e: ' + e.inspect
+      end      
       
-      if type == :file then
-        getbinaryfile name, name.downcase.gsub(/ +/,'-')
-      else
-        cp_dir(name, &blk)
-      end
-      blk.call(name, type) if block_given?
     end
 
   end
   
-  def list_filenames(s=@curdir+'/*')
+  def delete(filename)
+    super(filename)
+    'file deleted'
+  end
+  
+  def list_filenames(s=@curdir+'/*', ctimesort: false)
     
     if @debug
       puts 'inside list_filenames' 
       puts 's: ' + s.inspect
     end
     
-    src = File.dirname(s)
+    if s =~ /\*/ then
+      
+      src = File.dirname(s)
 
-    raw_q = File.basename(s)
-    puts 'raw_q: ' + raw_q.inspect if @debug
-    
-    q = raw_q.gsub('.','\.').gsub('*','.*').gsub('?','.?')\
-        .sub(/[^\*\?\.]$/,'.*')
+      raw_q = File.basename(s)
+      puts 'raw_q: ' + raw_q.inspect if @debug
+      
+      q = raw_q.gsub('.','\.').gsub('*','.*').gsub('?','.?')\
+          .sub(/[^\*\?\.]$/,'.*')
+    else
+      src = s
+    end
 
     list(src).inject([]) do |r, x| 
 
       raw_attr, _, owner, group, filesize, month, day, time, filename = \
           x.split(/ +/,9)
-      type = raw_attr =~ /d/ ? :directory : :file
-      filename[/^#{q}$/] ? r << {name: filename, type: type} : r
+      type = raw_attr[0] == 'd' ? :directory : :file
+      d = Time.parse([Date.today.year, month, day, time].join(' ') )
+      
+      if q then
+        filename[/^#{q}$/] ? r << {name: filename, type: type, filesize: filesize, ctime: d} : r
+      else
+        r << {name: filename, type: type, filesize: filesize, ctime: d}
+      end
       r
     end
 
@@ -88,6 +167,8 @@ class MyMediaFTP < Net::FTP
 
   end
   
+  alias rm delete
+  
   private
   
   def cp_dir(directory, &blk)
@@ -99,5 +180,37 @@ class MyMediaFTP < Net::FTP
     cp('*', directory, &blk)
     chdir parent_dir
   end
+  
+  def cp_files(src)
+    
+    files = list_filenames(src)    
+    
+    files.each do |h|
+
+      name, type = h[:name], h[:type]
+      
+      puts name
+      
+      if type == :file then
+        begin
+          getbinaryfile name, name.downcase.gsub(/ +/,'-')
+        rescue Net::FTPPermError => e
+          puts 'e: ' + e.inspect
+        end
+      else
+        cp_dir(name, &blk)
+      end
+      blk.call(name, type) if block_given?
+    end    
+  end
+  
+  def outbound_cp(src, destination='.')
+    
+    if File.basename(destination) == '.' then
+      destination.sub!(/\.$/, File.basename(src))
+    end
+    
+    putbinaryfile(src, destination)
+  end
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia_ftp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzEyMTQzMjEyWhcN
-  MTkwMzEyMTQzMjEyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVvDiX
-  wZVChRBu6zZoETSQ17WFQF7bFJxMLuF+dQ45iCjGBOiMHkARKtgF/H9oeFLQGQpk
-  WxWVgjD0a1EW1Sbq76q6+4LTJHHzspMTR3OIclLg8uxhGH8XckMixwjYj2oX7j+h
-  837NDczDJwqB/OH8chn9zO1qfyWIiTDg0e9BRWQsAwNAigoAbipC56x6ciizdXq7
-  Uc2hfxmKUP4Rt5P5myMWhTAHNcYxXud0HS3XrtFUIL3pP/LBtwWy+/5HVTMS5iML
-  rlJLLOZ5ll0aNrT4h0DlspAN4IBYuZEwD/VKBSD2zg5vocSrDmvXFxaUnfMNGSxK
-  LR0DthL2JJU1KSGbAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFPr4r2Be8t/4br//MJNp3Rqta50nMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAMOtYvEPHEeLVwGNfgK5
-  lLMgIXA9Y4eRdOnhBFpcVlzsFrVm1oLieMFGVxkNHgflFRMHUpnzosaa8m+Tc4L4
-  ZQTtBa7dK7HjfBi7l8sGJR00KRk1QQNA1/dfhIr1YQejNq1J8RkUG7uI+aiEmMwW
-  +EWu4oQM7AHtDghXOxlPJlJphH/kpQcfSGfEz7pctL2WDEEr/7ax56cQHQzaInbh
-  7c6Xalbryf2I+Uj21nW9Sn5ZGyGl7mFqRiclRyqg89+k55DgQolX05KJGfiV8aWA
-  XgExvIVcxlAxeQOUlcIGBWKIf+Hva5DT7OUUp76DGt6bi3X8uUeZd6y3+UtFj/RZ
-  BXg=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwOTA2MTA1OTAxWhcN
+  MjEwOTA2MTA1OTAxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDFzmsx
+  8i7y/T2jgUQTBx/SMOu2OXWbl7FSmXvNqiScWjvkHHKFBtUTJ6eCGSKGF3xoAGKn
+  tolvsX3ZxNLGeYaaGSLImAx1yDskE8H2o/B+gQkhXOaqAWF0gMKKuSHgZGyBsrvf
+  LOSQipq/vbLQBrl2D1q5rlYetcKQ7sjAW3IAQWJsJe/TvoohEb2iXR1Btq8qx9qZ
+  XtL2SxNV7OaNRECTC2UieCXJNKVi/xpfkRorfyjv21KWfgw5T5h4xrNZtBRiS3vH
+  kO/cIlNTAqgSu0ZeQUhr8blMP+Te6o2cmynR/4vfGMU7L822l+in9Fkde5AxoVBQ
+  FejSp6+UEd8Bu2nXQmO91NxlwCvRlylHheYjabsij41+KeFYhJqsVFOzQlcBD0Pb
+  FGsq3YNbStt+DHir1OfceK4JX3N7CiPnQsXTx06T3ZnUxiYUj0QquefTnqb/S7MO
+  XtAMy3eH5msr8cAYiPRBW0hr/6RGGDTMM6Cjz+VzFgAF6OXqVDN9bjYQqckCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU/PN/KSth
+  nZ4pBrLLklzgnH00nkMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAHM0WneD/luRLhn4hraEIWTNCUaVzz94DUcoo4umJ
+  2APA5QsBXnnh33rUwCx3bWtTCR7mW0cShSVbGFwgvB7dRyegHczXlQcx2AgwB1k1
+  FzhR/37ef8Vdu44nXhhKj6NDhzVi89XuNLxSXzEHoGde6liAjTiGA7ydCyxSBdzq
+  Ld3WBJ+LycfVWgoNmW2csBCgrALXa145QKO5HW34n03wbZ5fAaCVy8GjAaHRf6Tf
+  3QFe8+mYaXbHnqf2qEkNPIPQmdBKrfiyJK2kMIqQ3ldUGZZj+H5e1VOH8NKlSvr8
+  MtTHQ/vWwolPDjip3vyPbPMyNsdwC8QJHXiYl5M4rxYHSCaG6/+dMWMFAGMYVs52
+  4LpA7DyCXsIeDLLZm4GvsGU+ntoCovwRCl4ZtgXtZt19QRze/nd9rcIxwULjVOBR
+  vmQbOdyo1gepCZyCN+UN/SCimjgu1yZtpI0S9lPHE1w/fMob3ohXflP/mnwUFxsN
+  KVwzt+QIecFrRei1GVykx8z3
   -----END CERTIFICATE-----
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu
@@ -58,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A MyMedia FTP client which uses Net/FTP.