Merge pull request #12 from CDRV/dev-1.1.0

Dev 1.1.0 merge into Dev

Globals.py

@@ -8,4 +8,4 @@
 
 config_man = ConfigManager()
 
-version_string = '1.0.6'
+version_string = '1.1.0'

README.md

@@ -15,7 +15,7 @@ Main features of the project includes:
       * OpenTera (https://github.com/introlab/opentera) server
 
 ## Requirements
-Tested on Python 3.7 and 3.8
+Tested on Python 3.10
 
 ## Pi setup
 
@@ -29,6 +29,7 @@ Initialize credential manager (to remember PAT) `git config --global credential.
      3. `source venv/bin/activate`
      4. `pip install -r requirements.txt`
      5. `deactivate`
+	 * **If miniconda is installed, the script "create_conda_venv" can also be used**
   4. Edit the config file `/home/pi/Desktop/PiHub/config/PiHub.json` with the appropriate values
   5. Setup the cron tasks using `sudo crontab -e` and the crontab job listed in the `/home/pi/Desktop/PiHub/setup/crontab.txt` file
   6. Setup and enable the main pihub service using<br>
@@ -50,6 +51,7 @@ If not developping directly on a Raspberry Pi, a virtual Python environment (ven
   3. Create the virtual environment: `python -m venv venv`
   4. Enable the virtual environment: <br>
      On Mac/Linux: `source venv/bin/activate`<br>
-     On Windows: `venv\Scripts\activate.bat`
+     On Windows: `venv\Scripts\activate.bat`<br>
+	 **If miniconda is installed, the script "create_conda_venv" can also be used**
   5. Install requirements: `pip install -r requirements.txt`
 

config/PiHub.json

@@ -30,10 +30,10 @@
     "sensor_ID": "Sensor_0"
   },
   "SFTP": {
-    "hostname": "",
+    "hostname": "telesante.cdrv.ca",
     "port": 40091,
-    "username": "dev",
-    "password": ""
+    "username": "sftp_dev",
+    "password": "LS9PwJx7$829so"
   },
   "OpenTera": {
     "hostname": "localhost",

create_conda_venv.bat

@@ -0,0 +1,8 @@
+@echo off
+echo Create or update conda venv
+call conda install -m -c conda-forge -y --copy -p venv python=3.10
+echo Activating venv
+call conda activate .\venv
+echo Installing requirements
+call pip install -r requirements.txt
+call conda deactivate

create_conda_venv.sh

@@ -0,0 +1,7 @@
+echo "Create or update conda venv"
+conda install -m -c conda-forge -y --copy -p $PWD/venv python=3.10
+echo "Activating venv"
+conda activate $PWD/venv
+echo "Installing requirements (make sure git submodules are installed)..."
+$PWD/venv/bin/pip install -r $PWD/requirements.txt
+conda deactivate

libs/hardware/PiHubHardware.py

@@ -37,7 +37,8 @@ def ensure_internet_is_available():
                 logging.warning('Reboot completed, but still no Internet... Rebooting...')
                 # Still no internet connection - reboot the pi!
                 PiHubHardware.reboot()
-            logging.info('Internet is back. All is fine.')
+            else:
+                logging.info('Internet is back. All is fine.')
 
         lock.release()
 

libs/servers/WatchServer.py

@@ -37,7 +37,7 @@ def run(self):
         logging.info('Apple Watch Server starting...')
 
         # Check if all files are on sync on the server
-        self.sync_files(check_internet=False)  # Don't explicitely check internet connection on startup
+        # self.sync_files(check_internet=False)  # Don't explicitely check internet connection on startup
 
         request_handler = AppleWatchRequestHandler
         request_handler.base_server = self
@@ -47,6 +47,11 @@ def run(self):
         self.is_running = True
         logging.info('Apple Watch Server started on port ' + str(self.port))
 
+        # Check if all files are on sync on the server (after the main server has started)
+        self.file_syncher_timer = threading.Timer(1, self.sync_files, [False])
+        self.file_syncher_timer.start()
+
+        # Thread will wait here
         self.server.serve_forever()
         self.server.server_close()
 
@@ -61,14 +66,14 @@ def stop(self):
 
     def sync_files(self, check_internet: bool = True):
         logging.info("WatchServer: Synchronizing files with server...")
-
         if self.synching_files:
             logging.info("*** WatchServer: Already synching files. Will wait for next time.")
             return
 
         self.synching_files = True
         # Build list of files to transfer
         base_folder = self.data_path + '/ToProcess/'
+        base_folder = base_folder.replace('/', os.sep)
         files = []
         full_files = []
         file_folders = []
@@ -128,6 +133,11 @@ def sync_files(self, check_internet: bool = True):
                 # Set files as processed
                 if success:
                     self.move_processed_files()
+                else:
+                    # Something occurred... Try again in 5 minutes
+                    self.file_syncher_timer = threading.Timer(300, self.sync_files)
+                    self.file_syncher_timer.start()
+
             # for file in full_files:
             #     WatchServer.file_was_processed(file)
         else:
@@ -156,7 +166,7 @@ def move_files(self, source_files, target_folder):
                 # raise
 
             try:
-                os.replace(full_filepath, target_file)
+                os.rename(full_filepath, target_file)
             except (OSError, IOError) as exc:
                 logging.error('Error moving ' + full_filepath + ' to ' + target_file + ': ' + exc.strerror)
                 continue
@@ -235,6 +245,7 @@ def do_POST(self):
             self.base_server.file_syncher_timer.cancel()
             self.base_server.file_syncher_timer = None
 
+        # Prepare to receive data
         destination_dir = (self.base_server.data_path + '/ToProcess/' + device_name + '/' + file_path + '/')\
             .replace('//', '/').replace('/', os.sep)
         destination_path = destination_dir + file_name
@@ -290,7 +301,7 @@ def do_POST(self):
                 else:
                     fh.write(data)
                 content_size_remaining -= buffer_size
-                content_received = (content_length - content_size_remaining)
+                # content_received = (content_length - content_size_remaining)
                 # pc = math.floor((content_received / content_length) * 100)
                 # if pc != last_pc:
                 #     self.streamer.update_progress.emit(file_name, " (" + str(content_received) + "/ " +
@@ -315,6 +326,17 @@ def do_POST(self):
             error = "Transfer error: " + str(file_infos.st_size) + " bytes received, " + str(content_length) + \
                     " expected."
             logging.error(device_name + " - " + file_name + " - " + error)
+            self.send_response(400)
+            self.send_header('Content-type', 'file-transfer/error')
+            self.end_headers()
+            return
+
+        if content_length == 0 or (file_infos.st_size == 0 and content_length != 0):
+            error = "Transfer error: 0 byte received."
+            logging.error(device_name + " - " + file_name + " - " + error)
+            self.send_response(400)
+            self.send_header('Content-type', 'file-transfer/error')
+            self.end_headers()
             return
 
         # All is good!