Basic review pass

main.py

@@ -1,68 +1,63 @@
-import os
-import time
 import boto3
-import sys
+
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 
-s3_bucket_name = ""
-filename = ""
-
 class OnMyWatch:
     # Set the directory on watch
     watchDirectory = "e:/Code/indellinent/test/"
 
-    def __init__(self):
+    def __init__(self, handlers):
         self.observer = Observer()
-
+        self.handlers = handlers
+
     def run(self):
-        event_handler = Handler()
-        self.observer.schedule(event_handler, self.watchDirectory)
+        for handler in self.handlers:
+            self.observer.schedule(handler, self.watchDirectory)
+
         self.observer.start()
         try:
-            while True:
-                time.sleep(5)
-        except:
+            while self.observer.isAlive():
+                self.observer.join(5)
+        except KeyboardInterrupt:
+            # user requested stop
+            pass
+        finally:
             self.observer.stop()
+            self.observer.join()
             print("Observer Stopped")
-
-        self.observer.join()
-
-
+
 class Handler(FileSystemEventHandler):
+
+    def __init__(self, s3_client, bucket_name, target_filename):
+        self.s3 = s3_client
+        self.bucket_name = bucket_name
+        self.target_filename = target_filename
 
-    @staticmethod
-    def on_any_event(event):
+    def on_any_event(self, event):
 
-        if event.event_type == 'created' and filename in event.src_path :
-            s3 = boto3.client(
-                's3',
-                region_name = os.environ['AWS_REGION'],
-                aws_access_key_id = os.environ['AWS_ACCESS_KEY_ID'],
-                aws_secret_access_key = os.environ['AWS_SECRET_ACCESS_KEY']            
-            )
+        if event.event_type == 'created' or event.event_type == 'closed' and self.target_filename in event.src_path:
+            self.s3.upload_file(event.src_path, self.bucket_name, self.target_filename)
+            print("Watchdog received %s event - %s." % (event.event_type, event.src_path))
 
-            s3.upload_file(event.src_path, s3_bucket_name, filename)
-            print("Watchdog received created event - % s." % event.src_path)
-        elif event.event_type == 'modified' and filename in event.src_path :
-            s3 = boto3.client(
-                's3',
-                region_name = os.environ['AWS_REGION'],
-                aws_access_key_id = os.environ['AWS_ACCESS_KEY_ID'],
-                aws_secret_access_key = os.environ['AWS_SECRET_ACCESS_KEY']            
-            )
-
-            s3.upload_file(event.src_path, s3_bucket_name, filename)
-            print("Watchdog received modified event - % s." % event.src_path)
-        else:
-            return None
-
 
 if __name__ == '__main__':
+    import argparse
+
+    parser = argparse.ArgumentParser(
+        prog="monitor-specific-file",
+        description="Monitor a specific file, and upload it to a specific s3 bucket",
+    )
+    parser.add_argument('s3_bucket_name')
+    parser.add_argument('filename')
+    args = parser.parse_args()
+
+    s3_bucket_name = args.s3_bucket_name
+    filename = args.filename
+
+    s3 = boto3.client("s3")
 
-    #Set global variables as data that's passed from command line
-    s3_bucket_name = sys.argv[1]
-    filename = sys.argv[2]
+    test_handler = Handler(s3, s3_bucket_name, filename)
 
-    watch = OnMyWatch()
-    watch.run()
+    watch = OnMyWatch([test_handler])
+    watch.run()

pyproject.toml

@@ -0,0 +1,14 @@
+[project]
+name = "monitor_specific_file"
+version = "0.0.1"
+readme = "README.md"
+requires-python = ">=3.7"
+
+dependencies = [
+    "boto3",
+    "watchdog",
+]
+
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"