Update app.py

app.py

@@ -16,31 +16,28 @@ from huggingface_hub import HfApi, hf_hub_download, list_repo_files
 from huggingface_hub.utils import RepositoryNotFoundError, EntryNotFoundError
 import mimetypes
 import io
+import math
 
-# --- Configuration ---
-BOT_TOKEN = os.getenv("BOT_TOKEN", "6750208873:AAE2hvPlJ99dBdhGa_Brre0IIpUdOvXxHt4") # Use environment variable or default
+BOT_TOKEN = os.getenv("BOT_TOKEN", "6750208873:AAE2hvPlJ99dBdhGa_Brre0IIpUdOvXxHt4")
 HOST = '0.0.0.0'
 PORT = 7860
-DATA_FILE = 'data.json' # Local file for user and file metadata
+DATA_FILE = 'data.json'
 
-# Hugging Face Settings
-REPO_ID = os.getenv("HF_REPO_ID", "Eluza133/Z1e1u") # Target repository
-HF_DATA_FILE_PATH = "data.json" # Path for the metadata file within the HF repo
-HF_UPLOAD_FOLDER = "uploads"    # Folder within the HF repo to store user files
-HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE") # Token with write access
-HF_TOKEN_READ = os.getenv("HF_TOKEN_READ") # Token with read access (can be same as write)
+REPO_ID = os.getenv("HF_REPO_ID", "Eluza133/Z1e1u")
+HF_DATA_FILE_PATH = "data.json"
+HF_UPLOAD_FOLDER = "uploads"
+HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE")
+HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
-# Constants
 MAX_UPLOAD_FILES = 20
-AUTH_TIMEOUT = 86400 # 24 hours validity for initData
+AUTH_TIMEOUT = 86400
 
 app = Flask(__name__)
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-app.secret_key = os.urandom(24) # For potential future session use
+app.secret_key = os.urandom(24)
 
-# --- Hugging Face & Data Handling ---
-_data_lock = threading.Lock()
-metadata_cache = {} # In-memory cache for data.json
+_data_lock = threading.RLock()
+metadata_cache = {}
 
 def get_hf_api(write=False):
     token = HF_TOKEN_WRITE if write else HF_TOKEN_READ
@@ -76,15 +73,12 @@ def download_metadata_from_hf():
             except (FileNotFoundError, json.JSONDecodeError) as e:
                  logging.error(f"Error reading downloaded metadata file: {e}. Resetting cache.")
                  metadata_cache = {}
-            # Clean up downloaded file? hf_hub_download uses a cache, maybe not needed.
-            # if os.path.exists(DATA_FILE) and download_path != DATA_FILE:
-            #     os.remove(download_path) # Remove temp download if different name
         return True
     except EntryNotFoundError:
         logging.warning(f"Metadata file '{HF_DATA_FILE_PATH}' not found in repo '{REPO_ID}'. Starting fresh.")
         with _data_lock:
             metadata_cache = {}
-        return True # It's not an error, just no existing data
+        return True
     except RepositoryNotFoundError:
         logging.error(f"Hugging Face repository '{REPO_ID}' not found. Cannot download metadata.")
     except Exception as e:
@@ -94,7 +88,7 @@ def download_metadata_from_hf():
 def load_local_metadata():
     global metadata_cache
     with _data_lock:
-        if not metadata_cache: # Only load from file if cache is empty
+        if not metadata_cache:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
                     metadata_cache = json.load(f)
@@ -115,16 +109,10 @@ def save_metadata(data_to_update=None):
     with _data_lock:
         try:
             if data_to_update:
-                # Deep merge might be needed if updating nested structures
-                # For now, simple update assumes top-level keys (user IDs)
                 metadata_cache.update(data_to_update)
-
-            # Save updated cache to local file
             with open(DATA_FILE, 'w', encoding='utf-8') as f:
                 json.dump(metadata_cache, f, ensure_ascii=False, indent=4)
             logging.info(f"Metadata successfully saved locally to {DATA_FILE}.")
-
-            # Trigger async upload to HF after successful local save
             upload_metadata_to_hf_async()
             return True
         except Exception as e:
@@ -136,11 +124,8 @@ def update_user_file_metadata(user_id, file_info_list):
     with _data_lock:
         if user_id_str not in metadata_cache:
              metadata_cache[user_id_str] = {"user_info": {}, "files": []}
-
         if "files" not in metadata_cache[user_id_str]:
              metadata_cache[user_id_str]["files"] = []
-
-        # Add new files, potentially checking for duplicates if needed
         existing_filenames = {f['filename'] for f in metadata_cache[user_id_str]["files"]}
         new_files_added = 0
         for file_info in file_info_list:
@@ -149,24 +134,14 @@ def update_user_file_metadata(user_id, file_info_list):
                  existing_filenames.add(file_info['filename'])
                  new_files_added += 1
              else:
-                 # Handle update logic if a file with the same name is re-uploaded
-                 # For now, we just log it. Replace or versioning could be added.
                  logging.warning(f"File '{file_info['filename']}' already exists for user {user_id}. Skipping add.")
-                 # Example: Update existing entry
-                 # for i, existing_file in enumerate(metadata_cache[user_id_str]["files"]):
-                 #    if existing_file['filename'] == file_info['filename']:
-                 #        metadata_cache[user_id_str]["files"][i] = file_info # Replace with new metadata
-                 #        break
-
         if new_files_added > 0:
              logging.info(f"Added {new_files_added} file metadata entries for user {user_id}.")
-             # Save metadata (which will trigger HF upload)
              if not save_metadata():
-                  return False # Propagate save error
+                  return False
         else:
              logging.info(f"No new file metadata added for user {user_id}.")
-
-    return True # Indicate metadata was processed (even if no new files added)
+    return True
 
 def _upload_metadata_to_hf_task():
     api = get_hf_api(write=True)
@@ -176,17 +151,12 @@ def _upload_metadata_to_hf_task():
     if not os.path.exists(DATA_FILE):
         logging.warning(f"{DATA_FILE} does not exist locally. Skipping upload.")
         return
-
     try:
-        # Acquire lock only for reading the file path and ensuring it has content
         with _data_lock:
             if os.path.getsize(DATA_FILE) == 0:
                 logging.warning(f"{DATA_FILE} is empty. Skipping upload.")
-                # Optionally upload an empty file or a default structure like {}
-                # For now, skip.
                 return
-            file_to_upload = DATA_FILE # Use the local file path
-
+            file_to_upload = DATA_FILE
         logging.info(f"Attempting to upload {file_to_upload} to {REPO_ID}/{HF_DATA_FILE_PATH}...")
         api.upload_file(
             path_or_fileobj=file_to_upload,
@@ -203,41 +173,27 @@ def upload_metadata_to_hf_async():
      upload_thread = threading.Thread(target=_upload_metadata_to_hf_task, daemon=True)
      upload_thread.start()
 
-# --- Telegram Verification ---
 def verify_telegram_data(init_data_str):
     try:
         parsed_data = parse_qs(init_data_str)
         received_hash = parsed_data.pop('hash', [None])[0]
-
         if not received_hash:
             logging.warning("Verification failed: Hash missing from initData.")
             return None, False, "Hash missing"
-
         data_check_list = []
-        # Sort keys alphabetically for consistent string generation
         for key, value in sorted(parsed_data.items()):
-            # Make sure values are handled correctly (they are lists in parse_qs)
             data_check_list.append(f"{key}={value[0]}")
         data_check_string = "\n".join(data_check_list)
-
-        # Calculate secret key
         secret_key = hmac.new("WebAppData".encode(), BOT_TOKEN.encode(), hashlib.sha256).digest()
-        # Calculate data hash
         calculated_hash = hmac.new(secret_key, data_check_string.encode(), hashlib.sha256).hexdigest()
-
-        # Compare hashes
         if calculated_hash != received_hash:
             logging.warning(f"Verification failed: Hash mismatch. Calculated: {calculated_hash}, Received: {received_hash}")
             return parsed_data, False, "Invalid hash"
-
-        # Check auth_date (timestamp)
         auth_date = int(parsed_data.get('auth_date', [0])[0])
         current_time = int(time.time())
         if current_time - auth_date > AUTH_TIMEOUT:
             logging.warning(f"Verification failed: initData expired. Auth time: {auth_date}, Current time: {current_time}")
             return parsed_data, False, "Data expired"
-
-        # Extract user info if present
         user_info_dict = None
         if 'user' in parsed_data:
             try:
@@ -245,29 +201,21 @@ def verify_telegram_data(init_data_str):
                 user_info_dict = json.loads(user_json_str)
             except Exception as e:
                 logging.error(f"Could not parse user JSON from initData: {e}")
-                # Continue verification, but user info might be missing
-
         logging.info(f"Telegram data verified successfully for user ID: {user_info_dict.get('id') if user_info_dict else 'Unknown'}")
         return user_info_dict, True, "Verified"
-
     except Exception as e:
         logging.error(f"Error during Telegram data verification: {e}", exc_info=True)
         return None, False, "Verification exception"
 
-# --- User Authentication & Data Update ---
 def authenticate_and_get_user(init_data_str):
     user_info, is_valid, message = verify_telegram_data(init_data_str)
     if not is_valid:
         return None, message
-
     user_id = user_info.get('id') if user_info else None
     if not user_id:
         logging.warning("Verification successful but user ID is missing in user data.")
         return None, "User ID missing"
-
     user_id_str = str(user_id)
-
-    # Ensure user exists in metadata cache and update basic info if needed
     with _data_lock:
         should_save = False
         if user_id_str not in metadata_cache:
@@ -278,28 +226,14 @@ def authenticate_and_get_user(init_data_str):
             logging.info(f"New user registered: {user_id}")
             should_save = True
         else:
-            # Optionally update user_info if it has changed (e.g., name, username, photo)
-            # This requires comparing fields and deciding if an update is needed.
-            # Simple approach: Always update if provided.
             if "user_info" not in metadata_cache[user_id_str] or metadata_cache[user_id_str]["user_info"] != user_info:
                  metadata_cache[user_id_str]["user_info"] = user_info
-                 # logging.info(f"User info updated for user: {user_id}") # Can be noisy
-                 should_save = True # Save if info changed or was missing
-
-    # Save metadata only if the user was new or info was updated
+                 should_save = True
     if should_save:
-        # save_metadata is already thread-safe and uploads async
         if not save_metadata():
-            # Handle save failure, though it's unlikely to fail just for user info update
             logging.error(f"Failed to save metadata after updating/adding user {user_id}")
-            # Decide if this should prevent the user from proceeding. For now, allow.
-
     return user_info, "Authenticated"
 
-
-# --- HTML Templates ---
-
-# Main User Interface Template
 USER_TEMPLATE = """
 <!DOCTYPE html>
 <html lang="ru">
@@ -334,8 +268,8 @@ USER_TEMPLATE = """
             background-color: var(--tg-theme-bg-color);
             color: var(--tg-theme-text-color);
             padding: var(--padding);
-            padding-bottom: 100px; /* Space for upload button */
-            visibility: hidden; /* Hide until ready */
+            padding-bottom: 100px;
+            visibility: hidden;
             line-height: 1.5;
         }
         .container { max-width: 700px; margin: 0 auto; display: flex; flex-direction: column; gap: var(--padding); }
@@ -371,8 +305,8 @@ USER_TEMPLATE = """
             border: none; border-radius: var(--border-radius);
             font-size: 1em; font-weight: 600;
             cursor: pointer; transition: background-color 0.2s ease;
-            opacity: 0.5; /* Disabled initially */
-            pointer-events: none; /* Disabled initially */
+            opacity: 0.5;
+            pointer-events: none;
         }
         #upload-button.enabled { opacity: 1; pointer-events: auto; }
         #upload-status { margin-top: 12px; font-size: 0.9em; color: var(--tg-theme-hint-color); min-height: 1.2em; }
@@ -406,13 +340,10 @@ USER_TEMPLATE = """
         }
         .file-actions a:hover, .file-actions button:hover { opacity: 0.8; }
         .download-btn { background-color: var(--tg-theme-button-color); color: var(--tg-theme-button-text-color); }
-        .delete-btn { background-color: #dc3545; color: white; } /* Add delete styling */
-
+        .delete-btn { background-color: #dc3545; color: white; }
         .loading, .no-files { text-align: center; padding: 20px; color: var(--tg-theme-hint-color); }
         .progress-bar { width: 100%; background-color: #ddd; border-radius: 4px; height: 8px; margin-top: 5px; display: none; }
         .progress-bar-inner { height: 100%; width: 0%; background-color: var(--tg-theme-button-color); border-radius: 4px; transition: width 0.1s linear; }
-
-        /* Modal for viewing */
         .modal {
             display: none; position: fixed; z-index: 1001;
             left: 0; top: 0; width: 100%; height: 100%;
@@ -427,7 +358,7 @@ USER_TEMPLATE = """
         }
         .modal-content img, .modal-content video, .modal-content audio {
             display: block; width: auto; height: auto; max-width: 100%; max-height: 100%; margin: auto;
-            background-color: var(--tg-theme-bg-color); /* Add background for audio/video */
+            background-color: var(--tg-theme-bg-color);
         }
          .modal-close {
             position: absolute; top: 15px; right: 35px; color: #f1f1f1; font-size: 40px;
@@ -440,7 +371,6 @@ USER_TEMPLATE = """
             color: #ccc; padding: 10px 0; height: 50px; position: absolute; bottom: 15px; left: 50%; transform: translateX(-50%);
             background: rgba(0,0,0,0.5); border-radius: 8px;
         }
-         /* Add spinner styles */
         .spinner {
             border: 4px solid rgba(255, 255, 255, 0.3);
             border-radius: 50%;
@@ -449,10 +379,9 @@ USER_TEMPLATE = """
             height: 40px;
             animation: spin 1s linear infinite;
             margin: 20px auto;
-            display: none; /* Initially hidden */
+            display: none;
         }
         @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
-
     </style>
 </head>
 <body>
@@ -461,7 +390,6 @@ USER_TEMPLATE = """
             <h1>Zeus Cloud</h1>
             <div class="user-info" id="user-greeting">Загрузка...</div>
         </header>
-
         <section class="upload-section">
             <h2>Загрузить файлы</h2>
             <label for="file-input" class="file-input-label">Выбрать файлы (до {{ max_files }})</label>
@@ -471,7 +399,6 @@ USER_TEMPLATE = """
             <div class="progress-bar" id="progress-bar"><div class="progress-bar-inner" id="progress-bar-inner"></div></div>
             <div id="upload-status"></div>
         </section>
-
         <section class="file-list-section">
             <h2>Ваши файлы</h2>
             <div class="spinner" id="loading-spinner"></div>
@@ -480,23 +407,17 @@ USER_TEMPLATE = """
             </ul>
         </section>
     </div>
-
-    <!-- The Modal -->
     <div id="viewerModal" class="modal">
       <span class="modal-close" id="modalCloseBtn">×</span>
       <div id="modalContent" class="modal-content">
-          <!-- Content (img/video/audio) will be loaded here -->
       </div>
       <div id="modalCaption" class="modal-caption"></div>
     </div>
-
     <script>
         const tg = window.Telegram.WebApp;
         const MAX_FILES = {{ max_files }};
-        let currentFiles = []; // To hold selected File objects
+        let currentFiles = [];
         let userInitData = '';
-
-        // Elements
         const fileInput = document.getElementById('file-input');
         const uploadButton = document.getElementById('upload-button');
         const selectedFilesDiv = document.getElementById('selected-files');
@@ -507,8 +428,6 @@ USER_TEMPLATE = """
         const loadingSpinner = document.getElementById('loading-spinner');
         const progressBar = document.getElementById('progress-bar');
         const progressBarInner = document.getElementById('progress-bar-inner');
-
-        // Modal elements
         const modal = document.getElementById('viewerModal');
         const modalContent = document.getElementById('modalContent');
         const modalCaption = document.getElementById('modalCaption');
@@ -520,7 +439,6 @@ USER_TEMPLATE = """
                 const cssVar = `--tg-theme-${key.replace(/_/g, '-')}`;
                 root.style.setProperty(cssVar, themeParams[key]);
             });
-             // Add fallback defaults for CSS vars used in the template
              const defaults = {
                  'bg_color': '#181818', 'text_color': '#ffffff', 'hint_color': '#aaaaaa',
                  'link_color': '#62bcf9', 'button_color': '#31a5f5',
@@ -544,79 +462,53 @@ USER_TEMPLATE = """
         }
 
         function displayFiles(files) {
-            fileListUl.innerHTML = ''; // Clear existing list
+            fileListUl.innerHTML = '';
             loadingSpinner.style.display = 'none';
-
             if (!files || files.length === 0) {
                 noFilesMessage.style.display = 'block';
                 return;
             }
             noFilesMessage.style.display = 'none';
-
-            files.sort((a, b) => b.uploaded_at_ts - a.uploaded_at_ts); // Sort by timestamp descending
-
+            files.sort((a, b) => b.uploaded_at_ts - a.uploaded_at_ts);
             files.forEach(file => {
                 const li = document.createElement('li');
                 li.classList.add('file-item');
-
                 const fileInfoDiv = document.createElement('div');
                 fileInfoDiv.classList.add('file-info');
-
                 const fileNameSpan = document.createElement('span');
                 fileNameSpan.classList.add('file-name');
                 fileNameSpan.textContent = file.filename;
                 fileInfoDiv.appendChild(fileNameSpan);
-
                 const fileMetaSpan = document.createElement('span');
                 fileMetaSpan.classList.add('file-meta');
                 const date = new Date(file.uploaded_at_ts * 1000).toLocaleString();
                 const size = file.size ? formatBytes(file.size) : '';
                 fileMetaSpan.textContent = `${date}${size ? ' - ' + size : ''}`;
                 fileInfoDiv.appendChild(fileMetaSpan);
-
                 const fileActionsDiv = document.createElement('div');
                 fileActionsDiv.classList.add('file-actions');
-
-                 // Add View button for specific types
                 const mimeType = file.content_type || '';
                 if (mimeType.startsWith('image/') || mimeType.startsWith('video/') || mimeType.startsWith('audio/')) {
                     const viewButton = document.createElement('button');
-                    viewButton.textContent = '👁️'; // View icon
-                    viewButton.classList.add('view-btn'); // Add class if needed for specific styling
-                    viewButton.style.backgroundColor = '#6f42c1'; // Purple-ish
+                    viewButton.textContent = '👁️';
+                    viewButton.classList.add('view-btn');
+                    viewButton.style.backgroundColor = '#6f42c1';
                     viewButton.style.color = 'white';
                     viewButton.title = 'Просмотр';
                     viewButton.onclick = (e) => {
-                        e.stopPropagation(); // Prevent triggering li click if any
+                        e.stopPropagation();
                         openViewer(file);
                     };
                     fileActionsDiv.appendChild(viewButton);
                 }
-
-
                 const downloadLink = document.createElement('a');
                 downloadLink.classList.add('download-btn');
                 downloadLink.textContent = 'Скачать';
                 downloadLink.href = `/download/${encodeURIComponent(file.filename)}?initData=${encodeURIComponent(userInitData)}`;
-                downloadLink.target = '_blank'; // Open in new tab or trigger download
+                downloadLink.target = '_blank';
                 downloadLink.title = 'Скачать файл';
-                // Prevent modal opening if clicking download
                 downloadLink.onclick = (e) => e.stopPropagation();
-
                 fileActionsDiv.appendChild(downloadLink);
-
-                // Optional: Delete button
-                /*
-                const deleteButton = document.createElement('button');
-                deleteButton.classList.add('delete-btn');
-                deleteButton.textContent = 'Удалить';
-                deleteButton.onclick = (e) => {
-                    e.stopPropagation();
-                    deleteFile(file.filename);
-                };
-                fileActionsDiv.appendChild(deleteButton);
-                */
-
                 li.appendChild(fileInfoDiv);
                 li.appendChild(fileActionsDiv);
                 fileListUl.appendChild(li);
@@ -644,20 +536,17 @@ USER_TEMPLATE = """
                  uploadStatusDiv.textContent = `Ошибка загрузки списка файлов: ${error.message}`;
                  uploadStatusDiv.style.color = 'red';
                  loadingSpinner.style.display = 'none';
-                 noFilesMessage.style.display = 'block'; // Show no files message on error
+                 noFilesMessage.style.display = 'block';
                  noFilesMessage.textContent = 'Не удалось загрузить список файлов.';
              }
          }
 
-
         function handleFileSelection(event) {
             currentFiles = Array.from(event.target.files);
             if (currentFiles.length > MAX_FILES) {
                 alert(`Вы можете выбрать не более ${MAX_FILES} файлов за раз.`);
-                currentFiles = currentFiles.slice(0, MAX_FILES); // Keep only the first MAX_FILES
-                // Reset file input visually? Difficult, maybe just update text.
+                currentFiles = currentFiles.slice(0, MAX_FILES);
             }
-
             if (currentFiles.length > 0) {
                 selectedFilesDiv.textContent = `${currentFiles.length} файл(ов) выбрано: ${currentFiles.map(f => f.name).join(', ')}`;
                 uploadButton.classList.add('enabled');
@@ -667,7 +556,6 @@ USER_TEMPLATE = """
                 uploadButton.classList.remove('enabled');
                 uploadButton.disabled = true;
             }
-            // Clear previous status
             uploadStatusDiv.textContent = '';
             progressBar.style.display = 'none';
             progressBarInner.style.width = '0%';
@@ -678,86 +566,77 @@ USER_TEMPLATE = """
                 uploadStatusDiv.textContent = 'Выберите файлы для загрузки.';
                 return;
             }
-
-            uploadButton.classList.remove('enabled');
             uploadButton.disabled = true;
+            uploadButton.classList.remove('enabled');
             uploadStatusDiv.textContent = 'Загрузка началась...';
             uploadStatusDiv.style.color = 'var(--tg-theme-hint-color)';
             progressBar.style.display = 'block';
             progressBarInner.style.width = '0%';
-
             const formData = new FormData();
             currentFiles.forEach(file => {
-                formData.append('files', file); // Key must match Flask backend: request.files.getlist('files')
+                formData.append('files', file);
             });
-            formData.append('initData', userInitData); // Send auth data
+            formData.append('initData', userInitData);
 
             try {
-                // Use XMLHttpRequest for progress tracking
-                const xhr = new XMLHttpRequest();
-                xhr.open('POST', '/upload', true);
-
-                 // Progress event
-                 xhr.upload.onprogress = function(event) {
-                     if (event.lengthComputable) {
-                         const percentComplete = (event.loaded / event.total) * 100;
-                         progressBarInner.style.width = percentComplete + '%';
-                         uploadStatusDiv.textContent = `Загрузка... ${Math.round(percentComplete)}%`;
-                     }
-                 };
-
-                 // Upload finished event
-                 xhr.onload = function() {
-                     progressBar.style.display = 'none'; // Hide progress bar on completion
-                     if (xhr.status >= 200 && xhr.status < 300) {
-                         const data = JSON.parse(xhr.responseText);
-                         uploadStatusDiv.textContent = data.message || 'Загрузка успешно завершена!';
-                         uploadStatusDiv.style.color = 'green';
-                         // Clear selection and refresh file list
-                         fileInput.value = ''; // Reset file input
-                         currentFiles = [];
-                         selectedFilesDiv.textContent = 'Файлы не выбраны';
-                         fetchFiles(); // Refresh list
-                     } else {
-                         // Handle error
-                         let errorMessage = `Ошибка загрузки (Статус: ${xhr.status})`;
-                         try {
-                             const errorData = JSON.parse(xhr.responseText);
-                             errorMessage = errorData.message || errorMessage;
-                         } catch (e) {
-                             // Use default message if response is not JSON
-                         }
-                         throw new Error(errorMessage);
-                     }
-                 };
-
-                 // Upload error event
-                 xhr.onerror = function() {
-                     progressBar.style.display = 'none';
-                     throw new Error('Сетевая ошибка при загрузке.');
-                 };
-
-                 xhr.send(formData);
-
-             } catch (error) {
-                 console.error('Upload error:', error);
-                 uploadStatusDiv.textContent = `Ошибка: ${error.message}`;
-                 uploadStatusDiv.style.color = 'red';
-                 // Re-enable button on error
-                 uploadButton.classList.add('enabled');
-                 uploadButton.disabled = false;
-                 progressBar.style.display = 'none';
-             }
+                const responseText = await new Promise((resolve, reject) => {
+                    const xhr = new XMLHttpRequest();
+                    xhr.open('POST', '/upload', true);
+                    xhr.upload.onprogress = function(event) {
+                        if (event.lengthComputable) {
+                            const percentComplete = (event.loaded / event.total) * 100;
+                            progressBarInner.style.width = percentComplete + '%';
+                            uploadStatusDiv.textContent = `Загрузка... ${Math.round(percentComplete)}%`;
+                        }
+                    };
+                    xhr.onload = function() {
+                        if (xhr.status >= 200 && xhr.status < 300) {
+                            resolve(xhr.responseText);
+                        } else {
+                            let errorMessage = `Ошибка загрузки (Статус: ${xhr.status})`;
+                            try {
+                                const errorData = JSON.parse(xhr.responseText);
+                                errorMessage = errorData.message || errorMessage;
+                            } catch (e) { /* use default */ }
+                            reject(new Error(errorMessage));
+                        }
+                    };
+                    xhr.onerror = function() {
+                        reject(new Error('Сетевая ошибка при загрузке.'));
+                    };
+                    xhr.send(formData);
+                });
+
+                const data = JSON.parse(responseText);
+                uploadStatusDiv.textContent = data.message || 'Загрузка успешно завершена!';
+                uploadStatusDiv.style.color = 'green';
+                fileInput.value = '';
+                currentFiles = [];
+                selectedFilesDiv.textContent = 'Файлы не выбраны';
+                fetchFiles();
+            } catch (error) {
+                console.error('Upload error:', error);
+                uploadStatusDiv.textContent = `Ошибка: ${error.message}`;
+                uploadStatusDiv.style.color = 'red';
+            } finally {
+                progressBar.style.display = 'none';
+                if (currentFiles.length > 0) {
+                    uploadButton.classList.add('enabled');
+                    uploadButton.disabled = false;
+                } else {
+                    uploadButton.classList.remove('enabled');
+                    uploadButton.disabled = true;
+                    selectedFilesDiv.textContent = 'Файлы не выбраны';
+                }
+            }
         }
 
-         // --- Viewer Modal Logic ---
          function openViewer(file) {
              modal.style.display = 'block';
-             modalContent.innerHTML = ''; // Clear previous content
+             modalContent.innerHTML = '';
              modalCaption.textContent = file.filename;
              const mimeType = file.content_type || '';
              const downloadUrl = `/download/${encodeURIComponent(file.filename)}?initData=${encodeURIComponent(userInitData)}`;
-
              let element;
              if (mimeType.startsWith('image/')) {
                  element = document.createElement('img');
@@ -767,15 +646,14 @@ USER_TEMPLATE = """
                  element = document.createElement('video');
                  element.src = downloadUrl;
                  element.controls = true;
-                 element.autoplay = true; // Optional: start playing
+                 element.autoplay = true;
              } else if (mimeType.startsWith('audio/')) {
                  element = document.createElement('audio');
                  element.src = downloadUrl;
                  element.controls = true;
-                 element.autoplay = true; // Optional: start playing
-                 element.style.padding = '20px'; // Add some padding for controls
+                 element.autoplay = true;
+                 element.style.padding = '20px';
              }
-
              if (element) {
                  modalContent.appendChild(element);
                  if (tg.HapticFeedback) {
@@ -788,43 +666,33 @@ USER_TEMPLATE = """
 
          function closeViewer() {
              modal.style.display = 'none';
-             // Important: Stop video/audio playback when closing
              const mediaElement = modalContent.querySelector('video, audio');
              if (mediaElement) {
                  mediaElement.pause();
-                 mediaElement.src = ''; // Detach source
+                 mediaElement.src = '';
              }
-             modalContent.innerHTML = ''; // Clear content
+             modalContent.innerHTML = '';
          }
 
-         // Close modal listeners
          modalCloseBtn.onclick = closeViewer;
          modal.onclick = function(event) {
-             // Close if clicking on the background, not the content itself
              if (event.target === modal) {
                  closeViewer();
              }
          };
-         // --- End Viewer Modal Logic ---
-
 
         function setupTelegram() {
              if (!tg || !tg.initData) {
                  console.error("Telegram WebApp script not loaded or initData is missing.");
                  userGreeting.textContent = 'Ошибка: Не удалось инициализировать Telegram.';
-                 document.body.style.visibility = 'visible'; // Show body anyway
+                 document.body.style.visibility = 'visible';
                  return;
              }
-
              tg.ready();
              tg.expand();
-
              applyTheme(tg.themeParams);
              tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
-
              userInitData = tg.initData;
-
-             // Display user greeting
              const user = tg.initDataUnsafe?.user;
              if (user) {
                  const name = user.first_name || user.username || 'Пользователь';
@@ -832,25 +700,17 @@ USER_TEMPLATE = """
              } else {
                  userGreeting.textContent = 'Привет!';
              }
-
-             // Initial fetch of files
              fetchFiles();
-
-             // Add event listeners
              fileInput.addEventListener('change', handleFileSelection);
              uploadButton.addEventListener('click', handleUpload);
-
              document.body.style.visibility = 'visible';
          }
 
-
-        // --- Initialization ---
         if (window.Telegram && window.Telegram.WebApp) {
              setupTelegram();
          } else {
              console.warn("Telegram WebApp script not immediately available, waiting for window.onload");
              window.addEventListener('load', setupTelegram);
-              // Fallback timeout
               setTimeout(() => {
                   if (document.body.style.visibility !== 'visible') {
                        console.error("Telegram WebApp script fallback timeout triggered.");
@@ -859,13 +719,11 @@ USER_TEMPLATE = """
                    }
               }, 3500);
          }
-
     </script>
 </body>
 </html>
 """
 
-# Admin Panel Template
 ADMIN_TEMPLATE = """
 <!DOCTYPE html>
 <html lang="ru">
@@ -909,7 +767,7 @@ ADMIN_TEMPLATE = """
         }
         .view-files-btn:hover { background-color: #0b5ed7; }
         .no-users { text-align: center; color: var(--admin-secondary); margin-top: 2rem; font-size: 1.1em; }
-         .admin-controls { /* Style as needed, similar to original */
+         .admin-controls {
              background: var(--admin-card-bg); padding: var(--padding); border-radius: var(--border-radius);
              box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border);
              margin-bottom: var(--padding); text-align: center;
@@ -927,14 +785,12 @@ ADMIN_TEMPLATE = """
     <div class="container">
         <h1>Zeus Cloud - Админ Панель</h1>
         <div class="alert">ВНИМАНИЕ: Этот раздел не защищен! Добавьте аутентификацию для реального использования.</div>
-
          <div class="admin-controls">
              <h2>Управление метаданными</h2>
              <button class="btn btn-refresh-meta" onclick="triggerDownloadMeta()">Скачать data.json с HF</button>
              <div class="loader" id="loader"></div>
              <div class="status" id="status-message"></div>
          </div>
-
         {% if users %}
             <div class="user-grid">
                 {% for user_id, data in users.items() %}
@@ -967,7 +823,6 @@ ADMIN_TEMPLATE = """
     <script>
          const loader = document.getElementById('loader');
          const statusMessage = document.getElementById('status-message');
-
          async function handleFetch(url, action) {
              loader.style.display = 'inline-block';
              statusMessage.textContent = `Выполняется ${action}...`;
@@ -977,16 +832,16 @@ ADMIN_TEMPLATE = """
                  const data = await response.json();
                  if (response.ok && data.status === 'ok') {
                      statusMessage.textContent = data.message;
-                     statusMessage.style.color = '#198754'; // Success color
+                     statusMessage.style.color = '#198754';
                      if (action === 'скачивание метаданных') {
-                         setTimeout(() => location.reload(), 1500); // Reload after download success
+                         setTimeout(() => location.reload(), 1500);
                      }
                  } else {
                      throw new Error(data.message || 'Произошла ошибка');
                  }
              } catch (error) {
                  statusMessage.textContent = `Ошибка ${action}: ${error.message}`;
-                 statusMessage.style.color = '#dc3545'; // Danger color
+                 statusMessage.style.color = '#dc3545';
                  console.error(`Error during ${action}:`, error);
              } finally {
                  loader.style.display = 'none';
@@ -1011,7 +866,7 @@ ADMIN_USER_FILES_TEMPLATE = """
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" rel="stylesheet">
     <style>
-        :root { /* Use same vars as admin */
+        :root {
             --admin-bg: #f8f9fa; --admin-text: #212529; --admin-card-bg: #ffffff;
             --admin-border: #dee2e6; --admin-shadow: rgba(0, 0, 0, 0.05);
             --admin-primary: #0d6efd; --admin-secondary: #6c757d;
@@ -1037,7 +892,6 @@ ADMIN_USER_FILES_TEMPLATE = """
         }
         .actions a:hover { background-color: #0b5ed7; }
         .no-files { text-align: center; color: var(--admin-secondary); margin-top: 2rem; font-size: 1.1em; }
-         /* Responsive table */
          @media screen and (max-width: 768px) {
              .file-table { border: 0; box-shadow: none; }
              .file-table thead { display: none; }
@@ -1049,7 +903,7 @@ ADMIN_USER_FILES_TEMPLATE = """
                  font-size: 0.9em; text-transform: uppercase; color: var(--admin-secondary);
              }
              .file-table td:last-child { border-bottom: 0; }
-             .actions { text-align: right !important; } /* Force right align actions on mobile */
+             .actions { text-align: right !important; }
          }
     </style>
 </head>
@@ -1058,7 +912,6 @@ ADMIN_USER_FILES_TEMPLATE = """
         <a href="{{ url_for('admin_panel') }}" class="back-link">← Назад к списку пользователей</a>
         <h1>Файлы пользователя</h1>
         <div class="user-identifier">{{ user_info.first_name or '' }} {{ user_info.last_name or '' }} (ID: {{ user_id }})</div>
-
         {% if files %}
             <table class="file-table">
                 <thead>
@@ -1089,7 +942,6 @@ ADMIN_USER_FILES_TEMPLATE = """
         {% endif %}
     </div>
      <script>
-         // Simple filesize formatter (alternative to Jinja filter if needed)
          function formatBytes(bytes, decimals = 2) {
              if (!+bytes) return '0 Bytes'
              const k = 1024
@@ -1098,19 +950,11 @@ ADMIN_USER_FILES_TEMPLATE = """
              const i = Math.floor(Math.log(bytes) / Math.log(k))
              return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`
          }
-         // Example usage: Add this if not using Jinja filter
-         // document.querySelectorAll('.filesize').forEach(el => {
-         //     const bytes = parseInt(el.getAttribute('data-bytes'), 10);
-         //     if (!isNaN(bytes)) {
-         //         el.textContent = formatBytes(bytes);
-         //     }
-         // });
      </script>
 </body>
 </html>
 """
 
-# --- Jinja Filters ---
 @app.template_filter('filesizeformat')
 def filesizeformat(value):
     try:
@@ -1122,17 +966,11 @@ def filesizeformat(value):
         return f"{bytes_val / math.pow(k, i):.2f} {sizes[i]}"
     except (ValueError, TypeError):
         return value
-    except Exception: # Catch log(0) or other math errors
+    except Exception:
         return 'N/A'
 
-import math # Needs import for the filter
-
-# --- Flask Routes ---
-
 @app.route('/')
 def index():
-    # Render the main user interface
-    # Theme params will be applied by JS after tg.ready()
     return render_template_string(USER_TEMPLATE, theme={}, max_files=MAX_UPLOAD_FILES)
 
 @app.route('/files', methods=['POST'])
@@ -1141,16 +979,13 @@ def get_user_files():
     init_data_str = req_data.get('initData')
     if not init_data_str:
         return jsonify({"status": "error", "message": "Missing initData"}), 400
-
     user_info, message = authenticate_and_get_user(init_data_str)
     if not user_info:
         return jsonify({"status": "error", "message": message}), 403
-
     user_id_str = str(user_info['id'])
     with _data_lock:
         user_data = metadata_cache.get(user_id_str, {})
         files = user_data.get('files', [])
-
     return jsonify({"status": "ok", "files": files}), 200
 
 @app.route('/upload', methods=['POST'])
@@ -1158,41 +993,32 @@ def upload_files():
     init_data_str = request.form.get('initData')
     if not init_data_str:
         return jsonify({"status": "error", "message": "Missing initData"}), 400
-
     user_info, message = authenticate_and_get_user(init_data_str)
     if not user_info:
         return jsonify({"status": "error", "message": message}), 403
-
     user_id = user_info['id']
     user_id_str = str(user_id)
-
-    uploaded_files = request.files.getlist('files') # Key matches JS FormData
+    uploaded_files = request.files.getlist('files')
     if not uploaded_files or len(uploaded_files) == 0:
         return jsonify({"status": "error", "message": "No files selected for upload."}), 400
     if len(uploaded_files) > MAX_UPLOAD_FILES:
         return jsonify({"status": "error", "message": f"Cannot upload more than {MAX_UPLOAD_FILES} files at once."}), 400
-
     api = get_hf_api(write=True)
     if not api:
         return jsonify({"status": "error", "message": "Server error: Cannot connect to storage."}), 500
-
     successful_uploads_metadata = []
     errors = []
-
     for file_storage in uploaded_files:
         filename = file_storage.filename
         if not filename:
             errors.append("Received a file without a name.")
             continue
-
         path_in_repo = f"{HF_UPLOAD_FOLDER}/{user_id_str}/{filename}"
-        file_content = file_storage.read() # Read content into memory
+        file_content = file_storage.read()
         file_size = len(file_content)
         content_type, _ = mimetypes.guess_type(filename)
-
         try:
             logging.info(f"Uploading '{filename}' for user {user_id} to {path_in_repo}...")
-            # Use upload_file with path_or_fileobj=BytesIO(file_content)
             file_obj = io.BytesIO(file_content)
             api.upload_file(
                 path_or_fileobj=file_obj,
@@ -1200,7 +1026,6 @@ def upload_files():
                 repo_id=REPO_ID,
                 repo_type="dataset",
                 commit_message=f"User {user_id} uploaded {filename}"
-                # Consider adding run_as_future=True for concurrency if needed, but handle results
             )
             logging.info(f"Successfully uploaded '{filename}' for user {user_id}.")
             now = time.time()
@@ -1214,81 +1039,59 @@ def upload_files():
             })
         except Exception as e:
             logging.error(f"Failed to upload '{filename}' for user {user_id}: {e}", exc_info=True)
-            errors.append(f"Ошибка загрузки {filename}: {e}")
-
-    # Update metadata only if there were successful uploads
+            errors.append(f"Ошибка загрузки {filename}: {str(e)}")
     if successful_uploads_metadata:
         if not update_user_file_metadata(user_id, successful_uploads_metadata):
-             # Add metadata update errors to the list shown to the user
              errors.append("Ошибка обновления списка файлов после загрузки.")
-
     if not errors:
         return jsonify({"status": "ok", "message": f"Загружено {len(successful_uploads_metadata)} файл(ов)."}), 200
     else:
-        # Return partial success/error message
         return jsonify({
             "status": "error" if not successful_uploads_metadata else "partial_success",
             "message": f"Загружено {len(successful_uploads_metadata)} из {len(uploaded_files)}. Ошибки: {'; '.join(errors)}",
             "uploaded_files": [f['filename'] for f in successful_uploads_metadata],
             "errors": errors
-        }), 207 # Multi-Status or choose appropriate code
-
+        }), 207
 
 @app.route('/download/<path:filename>', methods=['GET'])
 def download_file(filename):
     init_data_str = request.args.get('initData')
     if not init_data_str:
         return "Authentication required.", 401
-
     user_info, message = authenticate_and_get_user(init_data_str)
     if not user_info:
         return f"Access denied: {message}", 403
-
     user_id = user_info['id']
     user_id_str = str(user_id)
-
-    # Check if user actually owns this file according to metadata
     with _data_lock:
         user_data = metadata_cache.get(user_id_str, {})
         user_files = user_data.get('files', [])
         file_metadata = next((f for f in user_files if f['filename'] == filename), None)
-
     if not file_metadata:
         logging.warning(f"User {user_id} attempted to download unlisted/unowned file: {filename}")
         return "File not found or access denied.", 404
-
     api = get_hf_api(write=False)
     if not api:
         return "Server error: Cannot connect to storage.", 500
-
     path_in_repo = file_metadata.get('hf_path', f"{HF_UPLOAD_FOLDER}/{user_id_str}/{filename}")
-
     try:
         logging.info(f"User {user_id} requesting download of {path_in_repo}")
-        # Download the file from HF Hub to the server's cache
         local_file_path = hf_hub_download(
             repo_id=REPO_ID,
             filename=path_in_repo,
             repo_type="dataset",
             token=api.token,
-            # local_dir=".", # Let it use the default HF cache
-            # local_dir_use_symlinks=False,
-            force_download=False, # Use cache if available
+            force_download=False,
             etag_timeout=10
         )
         logging.info(f"File {path_in_repo} downloaded to cache: {local_file_path}")
-
-        # Send the file from the cache path
-        # Guess mimetype again for safety, or use stored one
         content_type = file_metadata.get('content_type') or mimetypes.guess_type(filename)[0] or 'application/octet-stream'
-
         return send_file(
             local_file_path,
             mimetype=content_type,
-            as_attachment=False, # Try to display inline first for media
-            download_name=filename # Original filename for download prompt
+            as_attachment=False,
+            download_name=filename
         )
-
     except EntryNotFoundError:
         logging.error(f"File not found on Hugging Face: {path_in_repo}")
         return "File not found on storage.", 404
@@ -1299,13 +1102,9 @@ def download_file(filename):
         logging.error(f"Error downloading file {path_in_repo} for user {user_id}: {e}", exc_info=True)
         return "Server error during download.", 500
 
-
-# --- Admin Routes ---
-# WARNING: These routes are unprotected! Add proper authentication.
-
 @app.route('/admin')
 def admin_panel():
-    current_data = load_local_metadata() # Load latest from cache/local file
+    current_data = load_local_metadata()
     return render_template_string(ADMIN_TEMPLATE, users=current_data)
 
 @app.route('/admin/user/<user_id>')
@@ -1314,10 +1113,8 @@ def admin_user_files(user_id):
     user_data = current_data.get(str(user_id))
     if not user_data:
         return "User not found", 404
-
-    user_info = user_data.get("user_info", {"id": user_id}) # Basic info for display
+    user_info = user_data.get("user_info", {"id": user_id})
     files = user_data.get("files", [])
-
     return render_template_string(ADMIN_USER_FILES_TEMPLATE,
                                   user_id=user_id,
                                   user_info=user_info,
@@ -1325,23 +1122,18 @@ def admin_user_files(user_id):
 
 @app.route('/admin/download/<user_id>/<path:filename>', methods=['GET'])
 def admin_download_file(user_id, filename):
-    # WARNING: Add admin authentication check here!
     user_id_str = str(user_id)
     logging.info(f"Admin request to download file '{filename}' for user {user_id}")
-
     api = get_hf_api(write=False)
     if not api:
         return "Server error: Cannot connect to storage.", 500
-
-    # Find the file path from metadata if possible for accuracy
-    path_in_repo = f"{HF_UPLOAD_FOLDER}/{user_id_str}/{filename}" # Default assumption
+    path_in_repo = f"{HF_UPLOAD_FOLDER}/{user_id_str}/{filename}"
     with _data_lock:
         user_data = metadata_cache.get(user_id_str, {})
         user_files = user_data.get('files', [])
         file_metadata = next((f for f in user_files if f['filename'] == filename), None)
         if file_metadata and 'hf_path' in file_metadata:
              path_in_repo = file_metadata['hf_path']
-
     try:
         local_file_path = hf_hub_download(
             repo_id=REPO_ID,
@@ -1352,15 +1144,13 @@ def admin_download_file(user_id, filename):
             etag_timeout=10
         )
         logging.info(f"Admin download: File {path_in_repo} cached at {local_file_path}")
-
         content_type = mimetypes.guess_type(filename)[0] or 'application/octet-stream'
         if file_metadata and 'content_type' in file_metadata:
              content_type = file_metadata['content_type'] or content_type
-
         return send_file(
             local_file_path,
             mimetype=content_type,
-            as_attachment=True, # Force download for admin
+            as_attachment=True,
             download_name=filename
         )
     except EntryNotFoundError:
@@ -1372,16 +1162,12 @@ def admin_download_file(user_id, filename):
 
 @app.route('/admin/download_metadata', methods=['POST'])
 def admin_trigger_download_metadata():
-    # WARNING: Unprotected endpoint
     success = download_metadata_from_hf()
     if success:
          return jsonify({"status": "ok", "message": "Скачивание data.json с Hugging Face завершено. Обновите страницу."})
     else:
          return jsonify({"status": "error", "message": "Ошибка скачивания data.json. Проверьте логи."}), 500
 
-# Removed admin upload metadata trigger - upload happens automatically on save
-
-# --- App Initialization ---
 if __name__ == '__main__':
     print("---")
     print("--- ZEUS CLOUD MINI APP SERVER ---")
@@ -1392,7 +1178,6 @@ if __name__ == '__main__':
     print(f"Hugging Face Repo: {REPO_ID}")
     print(f"HF Metadata Path: {HF_DATA_FILE_PATH}")
     print(f"HF Upload Folder: {HF_UPLOAD_FOLDER}/<user_id>/")
-
     if not HF_TOKEN_READ or not HF_TOKEN_WRITE:
          print("---")
          print("--- WARNING: HUGGING FACE TOKEN(S) NOT SET ---")
@@ -1401,20 +1186,13 @@ if __name__ == '__main__':
     else:
          print("--- Hugging Face tokens found.")
          print("--- Attempting initial metadata download from Hugging Face...")
-         download_metadata_from_hf() # Attempt to get latest metadata on startup
-
-    # Load initial data from local file (might have been updated by download)
+         download_metadata_from_hf()
     load_local_metadata()
     print(f"--- Initial metadata cache loaded with {len(metadata_cache)} user(s).")
-
     print("---")
     print("--- SECURITY WARNING ---")
     print("--- The /admin routes are NOT protected by authentication.")
     print("--- Implement proper auth before any production deployment.")
     print("---")
     print("--- Server Ready ---")
-
-    # Use Waitress or Gunicorn for production
-    # from waitress import serve
-    # serve(app, host=HOST, port=PORT)
-    app.run(host=HOST, port=PORT, debug=False, threaded=True) # threaded=True useful for async tasks like HF uploads
+    app.run(host=HOST, port=PORT, debug=False, threaded=True)