حفظ العمل

zakat/__init__.py

@@ -12,18 +12,23 @@
 This file provides the ZakatLibrary classes, functions for tracking and calculating Zakat.
 """
 # Importing necessary classes and functions from the main module
-from .zakat_tracker import (
+from zakat.zakat_tracker import (
     ZakatTracker,
     Action,
     JSONEncoder,
     MathOperation,
 )
 
+from zakat.file_server import (
+    start_file_server,
+)
+
 # Version information for the module
 __version__ = ZakatTracker.Version()
 __all__ = [
     "ZakatTracker",
     "Action",
     "JSONEncoder",
     "MathOperation",
+    "start_file_server",
 ]

zakat/file_server.py

@@ -4,8 +4,7 @@
 import os
 import uuid
 import cgi
-from enum import Enum
-from zakat_tracker import ZakatTracker, Action
+from enum import Enum, auto
 import shutil
 import json
 
@@ -15,12 +14,27 @@ class FileType(Enum):
     CSV = 'csv'
 
 
+# SAFE Circular Imports (Duplicated class again)
+class Action(Enum):
+    CREATE = auto()
+    TRACK = auto()
+    LOG = auto()
+    SUB = auto()
+    ADD_FILE = auto()
+    REMOVE_FILE = auto()
+    BOX_TRANSFER = auto()
+    EXCHANGE = auto()
+    REPORT = auto()
+    ZAKAT = auto()
+
+
 def find_available_port():
     with socketserver.TCPServer(("localhost", 0), None) as s:
         return s.server_address[1]
 
 
-def start_file_server(database_path: str, debug: bool = False):
+def start_file_server(database_path: str, database_callback: callable = None, csv_callback: callable = None,
+                      debug: bool = False):
     """
     Starts an HTTP server to serve a file (GET) and accept file uploads (POST) with UUID-based URIs.
     """
@@ -113,7 +127,9 @@ def do_POST(self):
 
                         try:
                             # 6. Verify database file
-                            ZakatTracker(db_path=file_path)
+                            # ZakatTracker(db_path=file_path) # FATAL, Circular Imports Error
+                            if database_callback is not None:
+                                database_callback(file_path)
 
                             # 7. Copy database into the original path
                             shutil.copy2(file_path, database_path)
@@ -124,14 +140,17 @@ def do_POST(self):
                     case FileType.CSV.value:
                         # 6. Verify CSV file
                         try:
-                            x = ZakatTracker(db_path=database_path)
-                            result = x.import_csv(file_path, debug=debug)
-                            if debug:
-                                print(f'CSV imported: {result}')
-                            if len(result[2]) != 0:
-                                self.send_response(200)
-                                self.end_headers()
-                                self.wfile.write(json.dumps(result).encode())
+                            # x = ZakatTracker(db_path=database_path) # FATAL, Circular Imports Error
+                            # result = x.import_csv(file_path, debug=debug)
+                            if csv_callback is not None:
+                                result = csv_callback(file_path, database_path, debug)
+                                if debug:
+                                    print(f'CSV imported: {result}')
+                                if len(result[2]) != 0:
+                                    self.send_response(200)
+                                    self.end_headers()
+                                    self.wfile.write(json.dumps(result).encode())
+                                    return
                         except Exception as e:
                             self.send_error(400, str(e))
                             return
@@ -149,15 +168,27 @@ def shutdown_server():
         httpd.server_close()  # Close the socket
         server_thread.join()  # Wait for the thread to finish
 
-    server_thread.start()
-
-    return file_name, download_url, upload_url, shutdown_server
+    return file_name, download_url, upload_url, server_thread, shutdown_server
 
 
 def main():
+    from zakat_tracker import ZakatTracker, Action  # SAFE Circular Imports
     # Example usage (replace with your file path)
-    file_to_share = "your_file.txt"  # Or any other file type
-    file_name, download_url, upload_url, shutdown_server = start_file_server(file_to_share, debug=True)
+    file_to_share = f"{uuid.uuid4()}.pickle"  # Or any other file type
+
+    def database_callback(file_path):
+        ZakatTracker(db_path=file_path)
+
+    def csv_callback(file_path, database_path, debug):
+        x = ZakatTracker(db_path=database_path)
+        return x.import_csv(file_path, debug=debug)
+
+    file_name, download_url, upload_url, server_thread, shutdown_server = start_file_server(
+        file_to_share,
+        database_callback=database_callback,
+        csv_callback=csv_callback,
+        debug=True,
+    )
 
     print(f"\nTo download '{file_name}', use this URL:")
     print(download_url)
@@ -166,8 +197,11 @@ def main():
     print(upload_url)
     print("(The uploaded file will replace the existing one.)")
 
-    input("\nPress Enter to stop the server...")
+    print("\nString the server...")
+    server_thread.start()
+    print("The server started.")
 
+    input("\nPress Enter to stop the server...")
     shutdown_server()
 
 

zakat/zakat_tracker.py

@@ -1020,7 +1020,7 @@ def transfer(self, amount: int, from_account: str, to_account: str, desc: str =
         ValueError: The log transaction happened again in the same nanosecond time.
         """
         if from_account == to_account:
-        	raise ValueError(f'Transfer to the same account is forbidden. {to_account}')
+            raise ValueError(f'Transfer to the same account is forbidden. {to_account}')
         if amount <= 0:
             return []
         if created is None:
@@ -1533,7 +1533,8 @@ def generate_random_date(start_date: datetime.datetime, end_date: datetime.datet
         return start_date + datetime.timedelta(days=random_number_of_days)
 
     @staticmethod
-    def generate_random_csv_file(path: str = "data.csv", count: int = 1000, with_rate: bool = False, debug: bool = False) -> int:
+    def generate_random_csv_file(path: str = "data.csv", count: int = 1000, with_rate: bool = False,
+                                 debug: bool = False) -> int:
         """
         Generate a random CSV file with specified parameters.
 
@@ -1563,7 +1564,7 @@ def generate_random_csv_file(path: str = "data.csv", count: int = 1000, with_rat
                     value *= -1
                 row = [account, desc, value, date]
                 if with_rate:
-                    rate = random.randint(1,100) * 0.12
+                    rate = random.randint(1, 100) * 0.12
                     if debug:
                         print('before-append', row)
                     row.append(rate)
@@ -1766,12 +1767,12 @@ def test(self, debug: bool = False) -> bool:
 
             # Same account transfer
             for x in [1, 'a', True, 1.8, None]:
-            	failed = False
-            	try:
-            		self.transfer(1, x, x, 'same-account', debug= debug)
-            	except:
-            		failed = True
-            	assert failed is True
+                failed = False
+                try:
+                    self.transfer(1, x, x, 'same-account', debug=debug)
+                except:
+                    failed = True
+                assert failed is True
 
             # Always preserve box age during transfer
 
@@ -2404,4 +2405,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()