mymedia_ftp 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdde7acbc01250e03fcf5fa40081cc1840a2029cccdf0ac27b5e56bffefa3061
-  data.tar.gz: e9653b62d38324fde59c949ca2d2808526d74c7f104686669b3d933b4a23fb44
+  metadata.gz: 7e8e7b10bc85f00e03c740ffeaa1d437ad5c16df06f21668416e8a1241c3d735
+  data.tar.gz: fd83e3ce6fae0b9036b1829afee8ab873babc453600a478a5c95ec2a43860af2
 SHA512:
-  metadata.gz: a07ff2c9ecb932e6dc9aadfbd2adfa3946d7e2790f623d868615c1d7f0740c55f9f52b0a85ea685d1c66f8707df166d89f7d58028180cb766d3cd36e9c0aed4d
-  data.tar.gz: 360f1642802011c9c69d0cf1b63a76537e0b3bcd549b27c1a2d8c04366907e461b838cbef27de896fd8214e040c14f9cb318fb2bb9d203f53db9b937eef810f0
+  metadata.gz: dd889589d614b195a4a5c9cf03dfba5c8c927a513efa7b713451d9f4fc0e0a824310c4f7c97e03cd00e109f522b8521c9fa4c9432a56d3c1006aa2b199159fd3
+  data.tar.gz: 7534ec99cce8d55d5d19632b101fdb056a50ff780c4a4cbdbce00ebde11122dfc0cc14913f249669257ddf6778f5855a17dc47ae4113ecbeca7382b39cddc160

data/lib/mymedia_ftp.rb

@@ -3,11 +3,51 @@
 # file: mymedia_ftp.rb
 
 require 'net/ftp'
+require 'tempfile'
 require 'fileutils'
 
 
 class MyMediaFTP < Net::FTP
 
+  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    
+    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 initialize(s=nil, host: '127.0.0.1', user: 'user', password: '1234', 
                  port: 21, debug: false)
 
@@ -43,29 +83,24 @@ class MyMediaFTP < Net::FTP
     
     puts 'cp: ' + src.inspect if @debug
     chdir File.dirname(src)
-    FileUtils.mkdir_p dest
-    Dir.chdir  dest
-
-    files = list_filenames(src)
+    dir = File.dirname(dest)
+    FileUtils.mkdir_p dir
+    Dir.chdir  dir
 
-    puts 'copying ...'
-
-    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
-        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
@@ -82,20 +117,30 @@ class MyMediaFTP < Net::FTP
       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
+      
+      if q then
+        filename[/^#{q}$/] ? r << {name: filename, type: type} : r
+      else
+        r << {name: filename, type: type}
+      end
       r
     end
 
@@ -126,6 +171,29 @@ class MyMediaFTP < Net::FTP
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia_ftp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   vmQbOdyo1gepCZyCN+UN/SCimjgu1yZtpI0S9lPHE1w/fMob3ohXflP/mnwUFxsN
   KVwzt+QIecFrRei1GVykx8z3
   -----END CERTIFICATE-----
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu