From 0f5f050448d24117681b7ccd0d6747951e8369b9 Mon Sep 17 00:00:00 2001
From: Kevin Midboe <kevin.midboe@gmail.com>
Date: Mon, 28 Nov 2022 00:49:13 +0100
Subject: [PATCH] Compute, log and save to file estimated & actual transfer
 time

---
 README.md                      |  6 ++++
 transatlanticTorrentExpress.py | 51 ++++++++++++++++++++++++++++++++--
 utils.py                       | 13 +++++++--
 3 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 90e381a..cacdb45 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,15 @@ user=
 remote=
 local=
 
+[LOGGER]
+CH_LEVEL=INFO
+
 [ELASTIC]
 host=
 port=
+ssl=
+api_key=
+
 ```
 
 ## Run
diff --git a/transatlanticTorrentExpress.py b/transatlanticTorrentExpress.py
index dae6d86..722bc41 100755
--- a/transatlanticTorrentExpress.py
+++ b/transatlanticTorrentExpress.py
@@ -107,18 +107,63 @@ def transferFiles(files, localPath, remotePath, host=None, user=None):
       logger.info('File already exists at remote path. Skipping.')
       continue
 
-    file = os.path.join(localPath, file)
+    remoteFile = os.path.join(remotePath, file)
+    fileSize = fileSizeByPath(remoteFile)
+    fileSizeBytes = fileSizeInBytes(fileSize)
+
+    logger.info('Moving file: {}'.format(file), es={'filename': file,
+                                                    'filesize': fileSize,
+                                                    'bytes': fileSizeBytes})
+
+    file = os.path.join(remotePath, file)
+    spaceEscapedFile = file.replace(' ', '\\ ')
 
     if host and user:
       cmd = "rsync -rz {}@{}:'{}' '{}'".format(user, host, spaceEscapedFile, localPath)
     else:
-      cmd = "rsync -rz '{}' {}".format(file, remotePath)
+      cmd = "rsync -rz '{}' '{}'".format(spaceEscapedFile, localPath)
+
+    estimatedTransferSpeed = estimateFileTransferTime(fileSize, file)
+    start = time()
 
     rsyncProcess = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True)
     stdout, stderr = rsyncProcess.communicate()
 
     if stderr:
-      logger.error('Rsync error: {}'.format(stderr))
+      stderr = stderr.decode('utf-8')
+      logger.error('Rsync error', es={'filename':file, 'output':stderr})
+
+    stdout = stdout.decode('utf-8')
+    logger.debug('Rsync output', es={'filename': file, 'output': stdout})
+
+    global LAST_FILE_TRANSFER_SPEED,TRANSFER_SPEED_UNIT
+    transferTime = int(time() - start)
+    if transferTime == 0:
+      transferTime = 1
+    calculatedTransferSpeed = int(fileSizeBytes / 1000 / 1000 * 8) / transferTime
+
+    if calculatedTransferSpeed / estimatedTransferSpeed < 10:
+      transferSpeed = calculatedTransferSpeed
+      logger.info('Actual recorded transfer time', es={'filename': file,
+                                                      'filesize': fileSize,
+                                                       'bytes': fileSizeBytes,
+                                                       'transferTime': str(timedelta(seconds=transferTime)),
+                                                       'transferSpeed': transferSpeed,
+                                                       'transferSpeedUnit': TRANSFER_SPEED_UNIT,
+                                                       'seconds': transferTime})
+    else:
+     transferSpeed = LAST_FILE_TRANSFER_SPEED
+     logger.warning('Fishy transferspeed, using previous speed calculation', es={'filename': file,
+                    'filesize': fileSize, 'bytes': fileSizeBytes,'transferTime': str(timedelta(seconds=transferTime)),
+                    'transferSpeed': calculatedTransferSpeed, 'transferSpeedUnit': TRANSFER_SPEED_UNIT, 'seconds': transferTime})
+
+    if LAST_FILE_TRANSFER_SPEED:
+      # Calculate to average of all transfers this instance
+      LAST_FILE_TRANSFER_SPEED = (LAST_FILE_TRANSFER_SPEED + transferSpeed) / 2
+    else:
+      LAST_FILE_TRANSFER_SPEED = transferSpeed
+
+    writeAvgSpeedToDisk(LAST_FILE_TRANSFER_SPEED)
 
     transferedFiles.append(file)
 
diff --git a/utils.py b/utils.py
index a59bb93..e728ab8 100644
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,15 @@
 #!/bin/usr/python3
 import os
-from configparser import ConfigParser
+from configparser import RawConfigParser, NoOptionError
+
+pwd = os.path.dirname(os.path.abspath(__file__))
+
+class NoneOptionConfigParser(RawConfigParser):
+  def get(self, section, option):
+    try:
+      return RawConfigParser.get(self, section, option)
+    except NoOptionError:
+      return None
 
 def getConfig():
   # logger.debug('Reading config')
@@ -11,7 +20,7 @@ def getConfig():
     print('Please fill out and rename config file. Check README for more info.')
     exit(0)
 
-  config = ConfigParser()
+  config = NoneOptionConfigParser()
   config.read(path)
 
   # logger.debug('Sections parsed: {}'.format(config.sections()))