tcpfiletransfer 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62044c0e19afeac843809c334b214195b733a0f86117340612b4d456ea2c640a
-  data.tar.gz: 748c80bd45a384b162c4cd426eb4b37b29d60a26381497540406328eba0f23d2
+  metadata.gz: e05f1f2443f8672ad35b72d470ebaee0c906cf686d9e94fb010757d1d62dcb42
+  data.tar.gz: af5dcbb81340ddc9794f94c64401adccaba2fe0d2c39666016adb01d979c6644
 SHA512:
-  metadata.gz: bd0732e8a55145e4786b88984b1de03f4fe689538bae699d58dccd8b0326a0b57bda1798b3a40550786fe86a09534f81f58d44e6b2b30314714a6935a88d77a6
-  data.tar.gz: 52fa15820ad722d1f472bfa0eb8fe3dff7b66e284fae7e2715e31c601177bc57cb0d7b60d4beecb838ef5cce2e7f37168a4431ef751fc805afbfa86b58c1a612
+  metadata.gz: adc96bd9d1709741b31603b6874f61028ccb92b032dc0b4351fc010c00974adeb0138d3ea0111c29c904225a711460f3673568ef156c93abed835ea846b4960b
+  data.tar.gz: bb99ab26bca1a85e3d760cbcc63a47f2fe1d6f3c41d8763c2f603d0b79762968f361bb472e0f7fb48c4be6167793220644c233d14675cf273f9ee80240ba745f

data/bin/sendfile

@@ -10,13 +10,15 @@ name = originalpath.split("/").last.gsub(" ", "_")
 
 recipient = ""
 loop do
-  recipient = ARGV[1] || `zenity --text="Recipient\\n(Leave blank to discover available recipients)" --entry --title='Send File'`.chomp
+  recipient = ARGV[1] || `zenity --text="Recipient\\n(Leave blank to search for available recipients)" --entry --title='Send File'`.chomp
   exit(1) if $?.exitstatus == 1
 
   if recipient == ""
-    `notify-send 'Please wait, searching for recipients'`
-    hosts = `nmap -Pn -p8021 --open 192.168.0.0/24 | grep -oP '([\\w-]+\\s\\(((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}\\)|((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4})'`
-    `zenity --info --no-wrap --title="Avalable recipients" --text="#{hosts}"`
+    `nmap -Pn -p8021 --open 192.168.0.0/24 | grep -oP '([\\w-]+\\s\\(((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}\\)|((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4})' | tee ~/.tmphosts | zenity --progress --pulsate --no-cancel --text="Searcing for available devices" --title="Searching..." --auto-close`
+    hosts = File.read("#{Dir.home}/.tmphosts")
+    recipient = `zenity --list --title="Avalable recipients" --text="Choose a device" --column="Available Recipients" #{hosts.split("\n").map{|h|"'#{h}'"}.join(" ")}`.match(/((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}/).to_s
+    break if recipient != ""
+    exit(1) if $?.exitstatus == 1
   else
     break
   end

data/lib/filetransfer/httpserver.rb

@@ -4,7 +4,10 @@ module FileTransfer
       path = initdata[1].split("/")
       decline = (path[2] == "decline")
       path = ?/ + path[1]
+      sock_domain, remote_port, remote_hostname, remote_ip = client.peeraddr
+
       if decline
+        `zenity --error --title="Transfer Declined" --text="Your transfer to #{remote_hostname} has been declined." --no-wrap`
         $active_transfers.delete(path)
         client.puts "HTTP/1.0 200\r\nContent-Type: text/plain\r\n\r\nTransfer declined"
         client.close
@@ -23,6 +26,8 @@ module FileTransfer
         client.close
         return
       end
+
+      `zenity --info --title="Transfer Accepted" --text="Your transfer to #{remote_hostname} has been accepted." --no-wrap`
       client.puts "HTTP/1.0 200\r\nContent-Type: application/octet-stream\r\nContent-Disposition: attachment; filename=\"#{file[:name]}\"\r\n\r\n#{File.read(file[:path])}"
       $active_transfers.delete(path)
       client.close

data/lib/filetransfer/notifier.rb

@@ -9,7 +9,7 @@ module FileTransfer
 
       x=system("zenity --question --icon-name=document-save-symbolic.symbolic --no-wrap --text=\"#{notification_body}\" --title='#{notification_title}'")
       if x
-        file_location = `zenity --file-selection --save --filename=#{filename}`
+        file_location = `zenity --title="Save file" --file-selection --save --filename=#{filename.chomp}`.chomp
         if file_location == ""
           f=open(accept_link + "/decline")
           f.read

data/lib/filetransfer.rb

@@ -5,7 +5,7 @@ module FileTransfer
   @@files = ['server.rb', 'notifier.rb', 'httpserver.rb', 'ftserver.rb']
 
   def self.version
-    "0.0.4"
+    "0.0.6"
   end
 
   def self.file_paths(relative:false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcpfiletransfer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Matthias Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-26 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies: []
 description: An easy way to transfer files over TCP between linux computers
 email: matthias@matthiasclee.com