0.2.6 V Alpha

Instance.py

@@ -3,12 +3,11 @@ import requests
 import json
 import urllib.request
 import time
-from threading import Thread
+from threading import Thread, Event
 from requests.exceptions import RequestException
 from tqdm import tqdm
 from indexer import indexer
 import logging
-from threading import Event
 
 CACHE_DIR = os.getenv("CACHE_DIR")
 
@@ -16,7 +15,7 @@ download_progress = {}
 
 class Instance:
     def __init__(self, id, url, cache_dir, index_file, token, repo, load_balancer_api, max_retries=20, initial_delay=1):
-        self.version = "0.2.5 V Alpha"
+        self.version = "0.2.6 V Alpha"
         self.id = id
         self.url = url
         self.CACHE_DIR = cache_dir
@@ -42,21 +41,36 @@ class Instance:
                 with open(path, 'w') as json_file:
                     json.dump({}, json_file)
 
-        # Index the file structure
-        indexer()
+        # Index the file structure and load it
+        self.run_indexer_and_load()
+
+        # Start prefetching metadata and monitoring registration
+        self.register_to_load_balancer()
+        registration_thread = Thread(target=self.monitor_registration)
+        registration_thread.daemon = True
+        registration_thread.start()
+
+        # Start the thread to re-index every 2 minutes
+        indexer_thread = Thread(target=self.run_indexer_periodically)
+        indexer_thread.daemon = True
+        indexer_thread.start()
 
-        # Load the file structure JSON
+    def run_indexer_and_load(self):
+        """Runs the indexer and loads the file structure from INDEX_FILE."""
+        indexer()
         if not os.path.exists(self.INDEX_FILE):
             raise FileNotFoundError(f"{self.INDEX_FILE} not found. Please make sure the file exists.")
 
         with open(self.INDEX_FILE, 'r') as f:
             self.file_structure = json.load(f)
+        logging.info("File structure reloaded successfully.")
 
-        # Start prefetching metadata and monitoring registration
-        self.register_to_load_balancer()
-        registration_thread = Thread(target=self.monitor_registration)
-        registration_thread.daemon = True
-        registration_thread.start()
+    def run_indexer_periodically(self):
+        """Periodically reruns the indexer and reloads the file structure."""
+        while True:
+            time.sleep(120)  # Wait for 2 minutes
+            logging.info("Re-running indexer and reloading file structure.")
+            self.run_indexer_and_load()
 
     def compile_report(self):
         self.last_report_time = time.time()  # Update the last report time