fix

app.py

@@ -7,8 +7,6 @@ from hf_scrapper import download_film, download_episode, get_system_proxies, get
 from indexer import indexer
 from tvdb import fetch_and_cache_json
 import re
-import psutil
-import shutil
 
 app = Flask(__name__)
 
@@ -112,6 +110,9 @@ def bytes_to_human_readable(num, suffix="B"):
         num /= 1024.0
     return f"{num:.1f} Y{suffix}"
 
+def encode_episodeid(title,season,episode):
+    f"{title}_{season}_{episode}"
+
 def get_all_tv_shows(indexed_cache):
     """Get all TV shows from the indexed cache structure JSON file."""
     tv_shows = {}
@@ -195,6 +196,7 @@ def get_tv_show_api():
     title = request.args.get('title')
     season = request.args.get('season')
     episode = request.args.get('episode')
+    
     if not title or not season or not episode:
         return jsonify({"error": "Title, season, and episode parameters are required"}), 400
 
@@ -203,12 +205,13 @@ def get_tv_show_api():
         tv_store_data = json.load(json_file)
 
     # Check if the episode is already cached
-    episode_key = f"{title}_S{season}_E{episode}"
-    if episode_key in tv_store_data:
-        cache_path = tv_store_data[episode_key]
-        if os.path.exists(cache_path):
-            return send_from_directory(os.path.dirname(cache_path), os.path.basename(cache_path))
-    
+    if title in tv_store_data and season in tv_store_data[title]:
+        for ep in tv_store_data[title][season]:
+            if episode in ep:
+                cache_path = tv_store_data[title][season][ep]
+                if os.path.exists(cache_path):
+                    return send_from_directory(os.path.dirname(cache_path), os.path.basename(cache_path))
+
     tv_path = find_tv_path(file_structure, title)
     
     if not tv_path:
@@ -220,9 +223,9 @@ def get_tv_show_api():
             for sub_directory in directory['contents']:
                 if sub_directory['type'] == 'directory' and title.lower() in sub_directory['path'].lower():
                     for season_dir in sub_directory['contents']:
-                        if season_dir['type'] == 'directory':
+                        if season_dir['type'] == 'directory' and season in season_dir['path']:
                             for episode_file in season_dir['contents']:
-                                if episode_file['type'] == 'file':
+                                if episode_file['type'] == 'file' and episode in episode_file['path']:
                                     episode_path = episode_file['path']
                                     break
 
@@ -232,7 +235,7 @@ def get_tv_show_api():
     cache_path = os.path.join(CACHE_DIR, episode_path)
     file_url = f"https://huggingface.co/{REPO}/resolve/main/{episode_path}"
     proxies = get_system_proxies()
-    episode_id = f"{title}_S{season}_E{episode}"
+    episode_id = encode_episodeid(title,season,episode)
     
     # Start the download in a separate thread if not already downloading
     if episode_id not in download_threads or not download_threads[episode_id].is_alive():
@@ -266,7 +269,7 @@ def get_episode_id_api():
     episode = request.args.get('episode')
     if not title or not season or not episode:
         return jsonify({"error": "Title, season, and episode parameters are required"}), 400
-    episode_id = f"{title}_S{season}_E{episode}"
+    episode_id = encode_episodeid(title,season,episode)
     return jsonify({"episode_id": episode_id})
 
 @app.route('/api/cache/size', methods=['GET'])

hf_scrapper.py

@@ -168,24 +168,37 @@ def download_episode(file_url, token, cache_path, proxies, episode_id, title, ch
 
 def update_tv_store_json(title, cache_path):
     """
-    Updates the tv store JSON with the new file.
+    Updates the TV store JSON with the new file, organizing by title, season, and episode.
 
     Args:
-        title (str): The title of the film.
+        title (str): The title of the TV show.
         cache_path (str): The local path where the file is saved.
     """
     TV_STORE_JSON_PATH = os.path.join(CACHE_DIR, "tv_store.json")
 
-    film_store_data = {}
+    tv_store_data = {}
     if os.path.exists(TV_STORE_JSON_PATH):
         with open(TV_STORE_JSON_PATH, 'r') as json_file:
-            film_store_data = json.load(json_file)
+            tv_store_data = json.load(json_file)
 
-    film_store_data[title] = cache_path
+    # Extract season and episode information from the cache_path
+    season_part = os.path.basename(os.path.dirname(cache_path))  # Extracts 'Season 1'
+    episode_part = os.path.basename(cache_path)  # Extracts 'Grand Blue Dreaming - S01E01 - Deep Blue HDTV-720p.mp4'
+
+    # Create the structure if not already present
+    if title not in tv_store_data:
+        tv_store_data[title] = {}
+    
+    if season_part not in tv_store_data[title]:
+        tv_store_data[title][season_part] = {}
+
+    # Assuming episode_part is unique for each episode within a season
+    tv_store_data[title][season_part][episode_part] = cache_path
 
     with open(TV_STORE_JSON_PATH, 'w') as json_file:
-        json.dump(film_store_data, json_file, indent=2)
-    print(f'TV store updated with {title}.')
+        json.dump(tv_store_data, json_file, indent=2)
+
+    print(f'TV store updated with {title}, {season_part}, {episode_part}.')
 
 ###############################################################################
 def get_file_structure(repo, token, path="", proxies=None):