Update app.py

app.py

@@ -7,6 +7,9 @@ import cv2
 import random
 from PIL import Image
 import string
+import subprocess
+import glob
+import shutil
 
 # Initialize the Hugging Face API with the token
 api = HfApi(token=os.getenv("HF_API_TOKEN"))
@@ -49,49 +52,50 @@ def generate_metadata(video_name, title, description, uploader, file_location, t
     }
 
 def update_index_file(new_metadata_path):
-    index_file_path = "metadata/index-video.json"
-    temp_dir = "temp"
-    temp_index_path = os.path.join(temp_dir, "temp_index.json")
+    # Create a temporary directory for cloning
+    temp_dir = "temp_repo"
+    if os.path.exists(temp_dir):
+        shutil.rmtree(temp_dir)
     
     try:
-        # Try to download existing index file
-        existing_content = api.download_file(
+        # Clone the repository
+        subprocess.run(['git', 'clone', 'https://huggingface.co/spaces/vericudebuget/ok4231', temp_dir], check=True)
+        
+        # Find all JSON files in the metadata directory
+        metadata_dir = os.path.join(temp_dir, 'metadata')
+        json_files = glob.glob(os.path.join(metadata_dir, '*-index.json'))
+        
+        # Create the paths string
+        base_url = "huggingface.co/spaces/vericudebuget/ok4231/raw/main/metadata/"
+        paths = [f"{base_url}{os.path.basename(f)}" for f in json_files]
+        
+        # Add the new metadata path if it's not already there
+        new_metadata_filename = os.path.basename(new_metadata_path)
+        new_full_path = f"{base_url}{new_metadata_filename}"
+        if new_full_path not in paths:
+            paths.append(new_full_path)
+        
+        # Create the index content
+        index_content = "{ " + "; ".join(paths) + "; }"
+        
+        # Write to a temporary file
+        index_path = os.path.join(temp_dir, 'metadata', 'video-index.json')
+        os.makedirs(os.path.dirname(index_path), exist_ok=True)
+        with open(index_path, 'w') as f:
+            f.write(index_content)
+        
+        # Upload the index file
+        api.upload_file(
+            path_or_fileobj=index_path,
+            path_in_repo="metadata/video-index.json",
             repo_id="vericudebuget/ok4231",
             repo_type="space",
-            path_in_repo=index_file_path
         )
-        current_paths = existing_content.decode().strip()
-        
-        # If the file exists but is empty, initialize it
-        if not current_paths:
-            updated_paths = new_metadata_path
-        else:
-            # Split existing paths and add the new one
-            paths_list = current_paths.split(';')
-            if new_metadata_path not in paths_list:
-                paths_list.append(new_metadata_path)
-            updated_paths = ';'.join(paths_list)
-    
-    except Exception as e:
-        # If file doesn't exist or can't be loaded, start with just the new path
-        updated_paths = new_metadata_path
-    
-    # Create temporary file for updated index
-    os.makedirs(temp_dir, exist_ok=True)
-    with open(temp_index_path, "w") as f:
-        f.write(updated_paths)
-    
-    # Upload updated index file
-    api.upload_file(
-        path_or_fileobj=temp_index_path,
-        path_in_repo=index_file_path,
-        repo_id="vericudebuget/ok4231",
-        repo_type="space",
-    )
     
-    # Clean up temporary file
-    if os.path.exists(temp_index_path):
-        os.remove(temp_index_path)
+    finally:
+        # Clean up
+        if os.path.exists(temp_dir):
+            shutil.rmtree(temp_dir)
 
 def upload_video_to_hf(video_file, original_video_name, title, description, uploader, custom_thumbnail=None):
     # Create temp paths
@@ -99,71 +103,72 @@ def upload_video_to_hf(video_file, original_video_name, title, description, uplo
     if not os.path.exists(temp_dir):
         os.makedirs(temp_dir)
     
-    # Generate randomized filenames
-    video_name = add_random_to_filename(original_video_name)
-    video_path = os.path.join(temp_dir, video_name)
-    
-    base_name = os.path.splitext(video_name)[0]
-    thumbnail_name = f"{base_name}_thumb.jpg"
-    thumbnail_path = os.path.join(temp_dir, thumbnail_name)
-    
-    json_name = f"{base_name}-index.json"
-    json_path = os.path.join(temp_dir, json_name)
-    
-    # Write the video content to a file
-    with open(video_path, "wb") as f:
-        f.write(video_file.read())
-    
-    # Handle thumbnail
-    if custom_thumbnail:
-        thumbnail_extracted = save_custom_thumbnail(custom_thumbnail, thumbnail_path)
-    else:
-        thumbnail_extracted = extract_thumbnail(video_path, thumbnail_path)
-    
-    if not thumbnail_extracted:
-        st.error("Failed to process thumbnail")
-        return None
-    
-    # Upload the video
-    video_location = f"videos/{video_name}"
-    api.upload_file(
-        path_or_fileobj=video_path,
-        path_in_repo=video_location,
-        repo_id="vericudebuget/ok4231",
-        repo_type="space",
-    )
-    
-    # Upload the thumbnail
-    thumbnail_location = f"thumbnails/{thumbnail_name}"
-    api.upload_file(
-        path_or_fileobj=thumbnail_path,
-        path_in_repo=thumbnail_location,
-        repo_id="vericudebuget/ok4231",
-        repo_type="space",
-    )
-    
-    # Generate and upload metadata JSON
-    metadata = generate_metadata(video_name, title, description, uploader, video_location, thumbnail_location)
-    with open(json_path, "w") as f:
-        json.dump(metadata, f, indent=2)
-    
-    metadata_location = f"metadata/{json_name}"
-    api.upload_file(
-        path_or_fileobj=json_path,
-        path_in_repo=metadata_location,
-        repo_id="vericudebuget/ok4231",
-        repo_type="space",
-    )
-    
-    # Update the index file
-    update_index_file(metadata_location)
-    
-    # Cleanup temp files
-    for file_path in [video_path, thumbnail_path, json_path]:
-        if os.path.exists(file_path):
-            os.remove(file_path)
+    try:
+        # Generate randomized filenames
+        video_name = add_random_to_filename(original_video_name)
+        video_path = os.path.join(temp_dir, video_name)
+        
+        base_name = os.path.splitext(video_name)[0]
+        thumbnail_name = f"{base_name}_thumb.jpg"
+        thumbnail_path = os.path.join(temp_dir, thumbnail_name)
+        
+        json_name = f"{base_name}-index.json"
+        json_path = os.path.join(temp_dir, json_name)
+        
+        # Write the video content to a file
+        with open(video_path, "wb") as f:
+            f.write(video_file.read())
+        
+        # Handle thumbnail
+        if custom_thumbnail:
+            thumbnail_extracted = save_custom_thumbnail(custom_thumbnail, thumbnail_path)
+        else:
+            thumbnail_extracted = extract_thumbnail(video_path, thumbnail_path)
+        
+        if not thumbnail_extracted:
+            st.error("Failed to process thumbnail")
+            return None
+        
+        # Upload the video
+        video_location = f"videos/{video_name}"
+        api.upload_file(
+            path_or_fileobj=video_path,
+            path_in_repo=video_location,
+            repo_id="vericudebuget/ok4231",
+            repo_type="space",
+        )
+        
+        # Upload the thumbnail
+        thumbnail_location = f"thumbnails/{thumbnail_name}"
+        api.upload_file(
+            path_or_fileobj=thumbnail_path,
+            path_in_repo=thumbnail_location,
+            repo_id="vericudebuget/ok4231",
+            repo_type="space",
+        )
+        
+        # Generate and upload metadata JSON
+        metadata = generate_metadata(video_name, title, description, uploader, video_location, thumbnail_location)
+        with open(json_path, "w") as f:
+            json.dump(metadata, f, indent=2)
+        
+        metadata_location = f"metadata/{json_name}"
+        api.upload_file(
+            path_or_fileobj=json_path,
+            path_in_repo=metadata_location,
+            repo_id="vericudebuget/ok4231",
+            repo_type="space",
+        )
+        
+        # Update the index file
+        update_index_file(metadata_location)
+        
+        return metadata
     
-    return metadata
+    finally:
+        # Cleanup temp files
+        if os.path.exists(temp_dir):
+            shutil.rmtree(temp_dir)
 
 # Streamlit app interface
 st.title("Upload your video")
@@ -202,6 +207,5 @@ if uploaded_video:
                     if metadata:
                         st.success("Upload completed successfully!")
                         st.json(metadata)
-
 else:
     st.info("Please upload a video file to begin.")