Update app.py

app.py

@@ -1,4 +1,4 @@
-# --- START OF FILE app (8).py ---
+# --- START OF FILE app (9).py ---
 
 from flask import Flask, render_template_string, request, redirect, url_for, session, flash, send_file, jsonify, Response
 from flask_caching import Cache
@@ -17,7 +17,7 @@ import uuid
 app = Flask(__name__)
 app.secret_key = os.getenv("FLASK_SECRET_KEY", "supersecretkey_folders_unique")
 DATA_FILE = 'cloudeng_data_v2.json'
-REPO_ID = "Eluza133/Z1e1u" # Replace with your actual repo ID if different
+REPO_ID = "Eluza133/Z1e1u"
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ") or HF_TOKEN_WRITE
 UPLOAD_FOLDER = 'uploads'
@@ -26,22 +26,20 @@ os.makedirs(UPLOAD_FOLDER, exist_ok=True)
 cache = Cache(app, config={'CACHE_TYPE': 'simple'})
 logging.basicConfig(level=logging.INFO)
 
-# --- Filesystem Helper Functions ---
-
 def find_node_by_id(filesystem, node_id):
     if filesystem.get('id') == node_id:
-        return filesystem, None # Node found, no parent (it's the root)
+        return filesystem, None
 
-    queue = [(filesystem, None)] # (node, parent)
+    queue = [(filesystem, None)]
     while queue:
         current_node, parent = queue.pop(0)
         if current_node.get('type') == 'folder' and 'children' in current_node:
             for i, child in enumerate(current_node['children']):
                 if child.get('id') == node_id:
-                    return child, current_node # Node found, return node and its parent
+                    return child, current_node
                 if child.get('type') == 'folder':
                     queue.append((child, current_node))
-    return None, None # Node not found
+    return None, None
 
 def add_node(filesystem, parent_id, node_data):
     parent_node, _ = find_node_by_id(filesystem, parent_id)
@@ -57,7 +55,6 @@ def remove_node(filesystem, node_id):
     if node_to_remove and parent_node and 'children' in parent_node:
         parent_node['children'] = [child for child in parent_node['children'] if child.get('id') != node_id]
         return True
-    # Cannot remove root or if node/parent not found correctly
     return False
 
 def get_node_path_string(filesystem, node_id):
@@ -67,10 +64,10 @@ def get_node_path_string(filesystem, node_id):
     while current_id:
         node, parent = find_node_by_id(filesystem, current_id)
         if not node:
-            break # Should not happen in a consistent tree
-        if node.get('id') != 'root': # Don't add root name to path string
+            break
+        if node.get('id') != 'root':
              path_list.append(node.get('name', node.get('original_filename', '')))
-        if not parent: # Reached root's parent (None)
+        if not parent:
              break
         current_id = parent.get('id') if parent else None
 
@@ -85,37 +82,27 @@ def initialize_user_filesystem(user_data):
             "name": "root",
             "children": []
         }
-        # Migrate old files if they exist
         if 'files' in user_data and isinstance(user_data['files'], list):
             for old_file in user_data['files']:
-                 # Attempt to create a somewhat unique ID based on old data, or generate new one
                  file_id = old_file.get('id', uuid.uuid4().hex)
                  original_filename = old_file.get('filename', 'unknown_file')
-                 # Assume old paths didn't have unique names or folder structure in the path itself
-                 # Create a unique name now for consistency
                  name_part, ext_part = os.path.splitext(original_filename)
                  unique_suffix = uuid.uuid4().hex[:8]
                  unique_filename = f"{name_part}_{unique_suffix}{ext_part}"
-                 # Assume old files were at the 'root' level equivalent
-                 hf_path = f"cloud_files/{session['username']}/root/{unique_filename}" # New standard path
+                 hf_path = f"cloud_files/{session['username']}/root/{unique_filename}"
 
                  file_node = {
                      'type': 'file',
                      'id': file_id,
                      'original_filename': original_filename,
                      'unique_filename': unique_filename,
-                     'path': hf_path, # Store the intended *new* path structure
+                     'path': hf_path,
                      'file_type': get_file_type(original_filename),
                      'upload_date': old_file.get('upload_date', datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
                  }
                  add_node(user_data['filesystem'], 'root', file_node)
-                 # Note: This doesn't automatically rename/move files on HF Hub.
-                 # It just structures the metadata according to the new system.
-                 # Manual migration on HF Hub might be needed for old files to match `hf_path`.
-            del user_data['files'] # Remove the old flat list
-
+            del user_data['files']
 
-# --- Data Handling ---
 
 @cache.memoize(timeout=300)
 def load_data():
@@ -127,9 +114,8 @@ def load_data():
                 logging.warning("Data is not in dict format, initializing empty database")
                 return {'users': {}}
             data.setdefault('users', {})
-            # Initialize filesystem for users who don't have one (new structure)
             for username, user_data in data['users'].items():
-                initialize_user_filesystem(user_data) # Use temporary session context if needed or pass username
+                initialize_user_filesystem(user_data)
             logging.info("Data successfully loaded and initialized")
             return data
     except Exception as e:
@@ -201,7 +187,7 @@ def download_db_from_hf():
 def periodic_backup():
     while True:
         upload_db_to_hf()
-        time.sleep(1800) # 30 minutes
+        time.sleep(1800)
 
 def get_file_type(filename):
     filename_lower = filename.lower()
@@ -213,13 +199,9 @@ def get_file_type(filename):
         return 'pdf'
     elif filename_lower.endswith('.txt'):
         return 'text'
-    # Add more types as needed
-    # elif filename_lower.endswith(('.doc', '.docx')):
-    #     return 'document'
     return 'other'
 
 
-# --- Base Style (unchanged from original) ---
 BASE_STYLE = '''
 :root {
     --primary: #ff4d6d; --secondary: #00ddeb; --accent: #8b5cf6;
@@ -236,7 +218,9 @@ body.dark { background: var(--background-dark); color: var(--text-dark); }
 body.dark .container { background: var(--card-bg-dark); }
 h1 { font-size: 2em; font-weight: 800; text-align: center; margin-bottom: 25px; background: linear-gradient(135deg, var(--primary), var(--accent)); -webkit-background-clip: text; color: transparent; }
 h2 { font-size: 1.5em; margin-top: 30px; color: var(--text-light); }
-body.dark h2 { color: var(--text-dark); }
+h3 { font-size: 1.2em; margin-top: 15px; color: var(--primary); }
+body.dark h2, body.dark h3 { color: var(--text-dark); }
+body.dark h3 { color: var(--secondary); }
 input, textarea { width: 100%; padding: 14px; margin: 12px 0; border: none; border-radius: 14px; background: var(--glass-bg); color: var(--text-light); font-size: 1.1em; box-shadow: inset 0 3px 10px rgba(0, 0, 0, 0.1); }
 body.dark input, body.dark textarea { color: var(--text-dark); }
 input:focus, textarea:focus { outline: none; box-shadow: 0 0 0 4px var(--primary); }
@@ -256,17 +240,16 @@ body.dark .user-item { background: var(--card-bg-dark); }
 .user-item:hover { transform: translateY(-5px); }
 .user-item a { color: var(--primary); text-decoration: none; font-weight: 600; }
 .user-item a:hover { color: var(--accent); }
-@media (max-width: 768px) { .file-grid { grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); } }
-@media (max-width: 480px) { .file-grid { grid-template-columns: repeat(auto-fill, minmax(120px, 1fr)); } }
 .item { background: var(--card-bg); padding: 15px; border-radius: 16px; box-shadow: var(--shadow); text-align: center; transition: var(--transition); display: flex; flex-direction: column; justify-content: space-between; }
 body.dark .item { background: var(--card-bg-dark); }
 .item:hover { transform: translateY(-5px); }
 .item-preview { max-width: 100%; height: 130px; object-fit: cover; border-radius: 10px; margin-bottom: 10px; cursor: pointer; display: block; }
-.item.folder .item-preview { object-fit: contain; font-size: 60px; color: var(--folder-color); line-height: 130px; } /* Folder icon styling */
+.item.folder .item-preview { object-fit: contain; font-size: 60px; color: var(--folder-color); line-height: 130px; }
 .item p { font-size: 0.9em; margin: 5px 0; word-break: break-all; }
 .item a { color: var(--primary); text-decoration: none; }
 .item a:hover { color: var(--accent); }
-.item-actions { margin-top: 10px; }
+.item-actions { margin-top: 10px; display: flex; flex-wrap: wrap; justify-content: center; gap: 5px;}
+.item-actions .btn { font-size: 0.9em !important; padding: 5px 10px !important; }
 .modal { display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0, 0, 0, 0.85); z-index: 2000; justify-content: center; align-items: center; }
 .modal-content { max-width: 95%; max-height: 95%; background: #fff; padding: 10px; border-radius: 15px; overflow: auto; }
 body.dark .modal-content { background: var(--card-bg-dark); }
@@ -283,10 +266,45 @@ body.dark .modal pre { background: #2b2a33; color: var(--text-dark); }
 .folder-actions { margin-top: 20px; margin-bottom: 10px; display: flex; gap: 10px; align-items: center; flex-wrap: wrap; }
 .folder-actions input[type=text] { width: auto; flex-grow: 1; margin: 0; }
 .folder-actions .btn { margin: 0; }
+.instruction-box { background: var(--glass-bg); padding: 15px; border-radius: 15px; margin-top: 20px; border: 1px solid var(--secondary); }
+body.dark .instruction-box { border-color: var(--primary); }
+.instruction-box ul { list-style: inside; padding-left: 10px; margin-top: 10px; }
+.instruction-box li { margin-bottom: 8px; }
+.admin-file-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); gap: 20px; margin-top: 20px;}
+.file-item { background: var(--card-bg); padding: 15px; border-radius: 16px; box-shadow: var(--shadow); transition: var(--transition); display: flex; flex-direction: column; justify-content: space-between; }
+body.dark .file-item { background: var(--card-bg-dark); }
+.file-item:hover { transform: translateY(-5px); }
+.file-preview { max-width: 100%; max-height: 100px; object-fit: contain; border-radius: 10px; margin-bottom: 10px; display: block; margin-left: auto; margin-right: auto; }
+.file-item-actions { margin-top: 10px; display: flex; flex-wrap: wrap; justify-content: center; gap: 5px;}
+.file-item-actions .btn { font-size: 0.8em !important; padding: 4px 8px !important; }
+@media (max-width: 768px) {
+    .file-grid { grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); }
+    .admin-file-grid { grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); }
+    h1 { font-size: 1.8em; }
+    .btn { padding: 12px 24px; font-size: 1em; }
+    .folder-actions { flex-direction: column; align-items: stretch; }
+    .folder-actions input[type=text] { width: 100%; }
+    .item-actions { flex-direction: column; align-items: stretch; }
+    .item-actions .btn { width: 100%; margin-bottom: 5px; }
+    .file-item-actions { flex-direction: column; align-items: stretch; }
+    .file-item-actions .btn { width: 100%; margin-bottom: 5px; }
+    .user-item form { display: block !important; margin-left: 0 !important; margin-top: 10px; }
+    .user-item .btn { width: 100%; }
+}
+@media (max-width: 480px) {
+    .container { padding: 15px; }
+    .file-grid { grid-template-columns: repeat(auto-fill, minmax(120px, 1fr)); gap: 10px; }
+    .admin-file-grid { grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 10px; }
+    .item-preview { height: 100px; }
+    .item.folder .item-preview { font-size: 40px; line-height: 100px; }
+    .file-preview { max-height: 80px; }
+    .btn { padding: 10px 20px; font-size: 0.9em; }
+    h1 { font-size: 1.5em; }
+    h2 { font-size: 1.3em; }
+    input, textarea { padding: 12px; font-size: 1em; }
+}
 '''
 
-# --- Routes ---
-
 @app.route('/register', methods=['GET', 'POST'])
 def register():
     if request.method == 'POST':
@@ -307,7 +325,7 @@ def register():
             return redirect(url_for('register'))
 
         data['users'][username] = {
-            'password': password, # Plain text - consider hashing in production!
+            'password': password,
             'created_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
             'filesystem': {
                 "type": "folder", "id": "root", "name": "root", "children": []
@@ -341,21 +359,18 @@ def login():
         data = load_data()
 
         user = data['users'].get(username)
-        if user and user['password'] == password: # Plain text comparison
+        if user and user['password'] == password:
             session['username'] = username
-            # Initialize filesystem if missing (for very old users before structure change)
             if 'filesystem' not in user:
                  initialize_user_filesystem(user)
                  try:
                      save_data(data)
                  except Exception as e:
                      logging.error(f"Error saving data after filesystem init for {username}: {e}")
-                     # Proceed with login anyway, but log the error
             return jsonify({'status': 'success', 'redirect': url_for('dashboard')})
         else:
             return jsonify({'status': 'error', 'message': 'Неверное имя пользователя или пароль!'})
 
-    # Login page HTML with JS for AJAX login and auto-login check
     html = '''
 <!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>Zeus Cloud</title><link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;800&display=swap" rel="stylesheet">
@@ -398,29 +413,24 @@ def dashboard():
         return redirect(url_for('login'))
 
     user_data = data['users'][username]
-    # Ensure filesystem exists (should be handled by load_data/login now)
     if 'filesystem' not in user_data:
          initialize_user_filesystem(user_data)
-         # No need to save here usually, but good practice if modified
 
     current_folder_id = request.args.get('folder_id', 'root')
     current_folder, parent_folder = find_node_by_id(user_data['filesystem'], current_folder_id)
 
     if not current_folder or current_folder.get('type') != 'folder':
         flash('Папка не найдена!')
-        current_folder_id = 'root' # Reset to root
+        current_folder_id = 'root'
         current_folder, parent_folder = find_node_by_id(user_data['filesystem'], current_folder_id)
-        if not current_folder: # Should always find root
-             # This indicates a serious data structure issue
+        if not current_folder:
              logging.error(f"CRITICAL: Root folder not found for user {username}")
              flash('Критическая ошибка: корневая папка не найдена.')
              session.pop('username', None)
              return redirect(url_for('login'))
 
-
     items_in_folder = sorted(current_folder.get('children', []), key=lambda x: (x['type'] != 'folder', x.get('name', x.get('original_filename', '')).lower()))
 
-
     if request.method == 'POST':
         if not HF_TOKEN_WRITE:
              flash('Загрузка невозможна: токен для записи не настроен.')
@@ -440,7 +450,7 @@ def dashboard():
 
         if not target_folder_node or target_folder_node.get('type') != 'folder':
              flash('Целевая папка для загрузки не найдена!')
-             return redirect(url_for('dashboard')) # Redirect to root dashboard
+             return redirect(url_for('dashboard'))
 
         api = HfApi()
         uploaded_count = 0
@@ -455,7 +465,7 @@ def dashboard():
                 file_id = uuid.uuid4().hex
 
                 hf_path = f"cloud_files/{username}/{target_folder_id}/{unique_filename}"
-                temp_path = os.path.join(UPLOAD_FOLDER, f"{file_id}_{unique_filename}") # Temporary local path with unique ID
+                temp_path = os.path.join(UPLOAD_FOLDER, f"{file_id}_{unique_filename}")
 
                 try:
                     file.save(temp_path)
@@ -482,22 +492,19 @@ def dashboard():
                     if add_node(user_data['filesystem'], target_folder_id, file_info):
                         uploaded_count += 1
                     else:
-                        # This means add_node failed, which shouldn't happen if target_folder_node was found
                         errors.append(f"Ошибка добавления метаданных для {original_filename}.")
                         logging.error(f"Failed to add node metadata for file {file_id} to folder {target_folder_id} for user {username}")
-                        # Attempt to delete the orphaned file from HF Hub
                         try:
                             api.delete_file(path_in_repo=hf_path, repo_id=REPO_ID, repo_type="dataset", token=HF_TOKEN_WRITE)
                         except Exception as del_err:
                             logging.error(f"Failed to delete orphaned file {hf_path} from HF Hub: {del_err}")
 
-
                 except Exception as e:
                     logging.error(f"Error uploading file {original_filename} for {username}: {e}")
                     errors.append(f"Ошибка загрузки файла {original_filename}: {e}")
                 finally:
                     if os.path.exists(temp_path):
-                        os.remove(temp_path) # Clean up temp file
+                        os.remove(temp_path)
 
         if uploaded_count > 0:
             try:
@@ -509,24 +516,21 @@ def dashboard():
 
         if errors:
             for error_msg in errors:
-                flash(error_msg, 'error') # Use 'error' category if your CSS handles it
+                flash(error_msg, 'error')
 
         return redirect(url_for('dashboard', folder_id=target_folder_id))
 
-
-    # Build breadcrumbs
     breadcrumbs = []
     temp_id = current_folder_id
     while temp_id:
         node, parent = find_node_by_id(user_data['filesystem'], temp_id)
         if not node: break
-        is_link = (node['id'] != current_folder_id) # Don't link the current folder
+        is_link = (node['id'] != current_folder_id)
         breadcrumbs.append({'id': node['id'], 'name': node.get('name', 'Root'), 'is_link': is_link})
         if not parent: break
         temp_id = parent.get('id')
     breadcrumbs.reverse()
 
-
     html = '''
 <!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>Панель управления - Zeus Cloud</title><link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;800&display=swap" rel="stylesheet">
@@ -574,10 +578,10 @@ def dashboard():
                 <a href="{{ url_for('dashboard', folder_id=item.id) }}" class="item-preview" title="Перейти в папку {{ item.name }}">📁</a>
                 <p><b>{{ item.name }}</b></p>
                 <div class="item-actions">
-                    <a href="{{ url_for('dashboard', folder_id=item.id) }}" class="btn folder-btn" style="font-size: 0.9em; padding: 5px 10px;">Открыть</a>
+                    <a href="{{ url_for('dashboard', folder_id=item.id) }}" class="btn folder-btn">Открыть</a>
                      <form method="POST" action="{{ url_for('delete_folder', folder_id=item.id) }}" style="display: inline;" onsubmit="return confirm('Удалить папку {{ item.name }}? Папку можно удалить только если она пуста.');">
                          <input type="hidden" name="current_view_folder_id" value="{{ current_folder_id }}">
-                         <button type="submit" class="btn delete-btn" style="font-size: 0.9em; padding: 5px 10px;">Удалить</button>
+                         <button type="submit" class="btn delete-btn">Удалить</button>
                      </form>
                 </div>
             {% elif item.type == 'file' %}
@@ -601,14 +605,14 @@ def dashboard():
                  <p title="{{ item.original_filename }}">{{ item.original_filename | truncate(25, True) }}</p>
                  <p style="font-size: 0.8em; color: #888;">{{ item.upload_date }}</p>
                 <div class="item-actions">
-                    <a href="{{ url_for('download_file', file_id=item.id) }}" class="btn download-btn" style="font-size: 0.9em; padding: 5px 10px;">Скачать</a>
+                    <a href="{{ url_for('download_file', file_id=item.id) }}" class="btn download-btn">Скачать</a>
                     {% if previewable %}
-                    <button class="btn" style="font-size: 0.9em; padding: 5px 10px; background: var(--accent);"
+                    <button class="btn" style="background: var(--accent);"
                             onclick="openModal('{{ hf_file_url(item.path) if item.file_type != 'text' else url_for('get_text_content', file_id=item.id) }}', '{{ item.file_type }}', '{{ item.id }}')">Просмотр</button>
                     {% endif %}
                     <form method="POST" action="{{ url_for('delete_file', file_id=item.id) }}" style="display: inline;" onsubmit="return confirm('Вы уверены, что хотите удалить файл {{ item.original_filename }}?');">
                         <input type="hidden" name="current_view_folder_id" value="{{ current_folder_id }}">
-                        <button type="submit" class="btn delete-btn" style="font-size: 0.9em; padding: 5px 10px;">Удалить</button>
+                        <button type="submit" class="btn delete-btn">Удалить</button>
                     </form>
                 </div>
             {% endif %}
@@ -617,8 +621,25 @@ def dashboard():
     {% if not items %} <p>Эта папка пуста.</p> {% endif %}
 </div>
 
-<h2 style="margin-top: 30px;">Добавить на главный экран</h2>
-<p>Инструкции по добавлению на главный экран...</p>
+<div class="instruction-box">
+    <h2>Добавить на главный экран</h2>
+    <p>Вы можете добавить это приложение на главный экран вашего телефона для быстрого доступа, как обычное приложение.</p>
+    <h3>Android (Chrome):</h3>
+    <ul>
+        <li>Откройте это приложение ({{ request.host_url.rstrip('/') }}) в браузере Chrome.</li>
+        <li>Нажмите на кнопку меню (⋮) в правом верхнем углу.</li>
+        <li>Выберите пункт <b>"Установить приложение"</b> или <b>"Добавить на главный экран"</b>.</li>
+        <li>Следуйте инструкциям на экране для подтверждения.</li>
+    </ul>
+    <h3>iOS (Safari):</h3>
+    <ul>
+        <li>Откройте это приложение ({{ request.host_url.rstrip('/') }}) в браузере Safari.</li>
+        <li>Нажмите на кнопку "Поделиться" (квадрат со стрелкой вверх) в нижней части экрана.</li>
+        <li>Прокрутите вниз и выберите пункт <b>"На экран 'Домой'"</b>.</li>
+        <li>При необходимости отредактируйте название и нажмите "Добавить".</li>
+    </ul>
+</div>
+
 <a href="{{ url_for('logout') }}" class="btn" style="margin-top: 20px;" id="logout-btn">Выйти</a>
 </div>
 
@@ -636,16 +657,13 @@ def dashboard():
     function hfFileUrl(path, download = false) {
         let url = `https://huggingface.co/datasets/${repoId}/resolve/main/${path}`;
         if (download) url += '?download=true';
-        // Note: Adding token directly in URL is generally discouraged for security.
-        // Pre-signed URLs or backend proxying is better if needed.
-        // For simplicity here, we rely on browser session / token auth if repo is private.
         return url;
     }
 
     async function openModal(srcOrUrl, type, itemId) {
         const modal = document.getElementById('mediaModal');
         const modalContent = document.getElementById('modalContent');
-        modalContent.innerHTML = '<p>Загрузка...</p>'; // Loading indicator
+        modalContent.innerHTML = '<p>Загрузка...</p>';
         modal.style.display = 'flex';
 
         try {
@@ -656,11 +674,9 @@ def dashboard():
             } else if (type === 'pdf') {
                 modalContent.innerHTML = `<iframe src="${srcOrUrl}" title="Просмотр PDF"></iframe>`;
             } else if (type === 'text') {
-                // Fetch text content from backend endpoint
-                const response = await fetch(srcOrUrl); // srcOrUrl is the Flask endpoint URL here
+                const response = await fetch(srcOrUrl);
                 if (!response.ok) throw new Error(`Ошибка загрузки текста: ${response.statusText}`);
                 const text = await response.text();
-                // Escape HTML to prevent XSS
                 const escapedText = text.replace(/</g, "<").replace(/>/g, ">");
                 modalContent.innerHTML = `<pre>${escapedText}</pre>`;
             } else {
@@ -674,7 +690,6 @@ def dashboard():
 
     function closeModal(event) {
         const modal = document.getElementById('mediaModal');
-        // Close if clicked on the background (modal itself)
         if (event.target === modal) {
             closeModalManual();
         }
@@ -686,7 +701,7 @@ def dashboard():
          const video = modal.querySelector('video');
          if (video) video.pause();
          const iframe = modal.querySelector('iframe');
-         if (iframe) iframe.src = 'about:blank'; // Stop PDF loading
+         if (iframe) iframe.src = 'about:blank';
          document.getElementById('modalContent').innerHTML = '';
     }
 
@@ -696,7 +711,6 @@ def dashboard():
     const uploadBtn = document.getElementById('upload-btn');
 
     form.addEventListener('submit', function(e) {
-        // Basic client-side validation (optional, backend validation is key)
         const files = form.querySelector('input[type="file"]').files;
         if (files.length === 0) {
              alert('Пожалуйста, выберите файлы для загрузки.');
@@ -708,66 +722,11 @@ def dashboard():
              e.preventDefault();
              return;
          }
-        // Prevent default only if using AJAX, otherwise let the form submit normally
-        // Using normal form submission for simplicity now, progress bar won't work accurately without AJAX
-        // e.preventDefault(); // Uncomment this and implement AJAX below for progress bar
-
-        // Show progress indication (even if not accurate for standard POST)
-        progressContainer.style.display = 'block';
-        progressBar.style.width = '50%'; // Indicate activity
-        uploadBtn.disabled = true;
-        uploadBtn.textContent = 'Загрузка...';
 
-        // --- AJAX Upload Implementation (Optional, replaces standard form submit) ---
-        /*
-        e.preventDefault(); // Keep this line if using AJAX
-        const formData = new FormData(form);
         progressContainer.style.display = 'block';
-        progressBar.style.width = '0%';
+        progressBar.style.width = '50%';
         uploadBtn.disabled = true;
         uploadBtn.textContent = 'Загрузка...';
-
-        const xhr = new XMLHttpRequest();
-        const targetFolderId = form.querySelector('input[name="current_folder_id"]').value;
-        xhr.open('POST', `/dashboard?folder_id=${targetFolderId}`, true); // Post to the dashboard URL
-
-        xhr.upload.onprogress = function(event) {
-            if (event.lengthComputable) {
-                const percent = (event.loaded / event.total) * 100;
-                progressBar.style.width = percent + '%';
-            }
-        };
-
-        xhr.onload = function() {
-            uploadBtn.disabled = false;
-            uploadBtn.textContent = 'Загрузить файлы сюда';
-            progressContainer.style.display = 'none';
-            progressBar.style.width = '0%';
-            if (xhr.status >= 200 && xhr.status < 300) {
-                 // Success - Reload the page to see changes
-                 // More advanced: parse response and update DOM dynamically
-                 window.location.reload();
-            } else {
-                // Error
-                alert(`Ошибка загрузки: ${xhr.statusText || 'Неизвестная ошибка'}`);
-                // Try to parse error from response if available
-                 try {
-                     const response = JSON.parse(xhr.responseText);
-                     if(response.message) alert(response.message);
-                 } catch(e) {}
-            }
-        };
-
-        xhr.onerror = function() {
-            alert('Ошибка сети во время загрузки!');
-            progressContainer.style.display = 'none';
-            progressBar.style.width = '0%';
-            uploadBtn.disabled = false;
-             uploadBtn.textContent = 'Загрузить файлы сюда';
-        };
-
-        xhr.send(formData);
-        */
     });
 
     document.getElementById('logout-btn').addEventListener('click', function(e) {
@@ -778,7 +737,7 @@ def dashboard():
 
 </script>
 </body></html>'''
-    # Pass helper function to template context
+
     template_context = {
         'username': username,
         'items': items_in_folder,
@@ -788,7 +747,8 @@ def dashboard():
         'repo_id': REPO_ID,
         'HF_TOKEN_READ': HF_TOKEN_READ,
         'hf_file_url': lambda path, download=False: f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{path}{'?download=true' if download else ''}",
-        'os': os # For admin template usage if needed, be cautious
+        'os': os,
+        'request': request
     }
     return render_template_string(html, **template_context)
 
@@ -810,7 +770,6 @@ def create_folder():
     if not folder_name:
         flash('Имя п��пки не может быть пустым!')
         return redirect(url_for('dashboard', folder_id=parent_folder_id))
-    # Basic validation for folder names (avoiding problematic chars)
     if not folder_name.isalnum() and '_' not in folder_name and ' ' not in folder_name:
          flash('Имя папки может содержать буквы, цифры, пробелы и подчеркивания.')
          return redirect(url_for('dashboard', folder_id=parent_folder_id))
@@ -830,7 +789,6 @@ def create_folder():
         except Exception as e:
             flash('Ошибка сохранения данных при создании папки.')
             logging.error(f"Create folder save error: {e}")
-            # Attempt to rollback? Difficult without transactions.
     else:
         flash('Не удалось найти родительскую папку.')
 
@@ -846,28 +804,46 @@ def download_file(file_id):
     username = session['username']
     data = load_data()
     user_data = data['users'].get(username)
-    if not user_data:
-        flash('Пользователь не найден!')
-        session.pop('username', None)
-        return redirect(url_for('login'))
-
-    file_node, _ = find_node_by_id(user_data['filesystem'], file_id)
 
-    # Also check admin access if needed
     is_admin_route = request.referrer and 'admhosto' in request.referrer
+    file_node = None
+    target_username = username # Default to current user
+
+    if is_admin() and is_admin_route:
+        # Admin trying to download, need to find file across all users
+        # But the URL only contains file_id. We need the user context.
+        # Let's assume the referrer URL contains the username for admin actions
+        try:
+            # Extract username from referrer (e.g., /admhosto/user/someuser)
+            parts = request.referrer.split('/')
+            if len(parts) > 2 and parts[-2] == 'user':
+                 target_username = parts[-1]
+                 admin_user_data = data.get('users', {}).get(target_username)
+                 if admin_user_data:
+                     file_node, _ = find_node_by_id(admin_user_data['filesystem'], file_id)
+                 else:
+                    flash(f'(Admin) Пользователь {target_username} не найден.')
+                    return redirect(request.referrer or url_for('admin_panel'))
+            else: # Fallback if referrer doesn't match expected pattern
+                flash('(Admin) Не удалось определить пользователя для скачивания файла.')
+                return redirect(request.referrer or url_for('admin_panel'))
+
+        except Exception as e:
+            logging.error(f"Admin download error extracting username from referrer {request.referrer}: {e}")
+            flash('(Admin) Ошибка при обработке запроса на скачивание.')
+            return redirect(request.referrer or url_for('admin_panel'))
+    else: # Regular user download
+        if not user_data:
+            flash('Пользователь не найден!')
+            session.pop('username', None)
+            return redirect(url_for('login'))
+        file_node, _ = find_node_by_id(user_data['filesystem'], file_id)
+
+
     if not file_node or file_node.get('type') != 'file':
-         # Check if admin is trying to download from admin panel
-         if is_admin_route:
-             # Admin might be trying to download a file listed in the panel
-             # Need to search across all users if the file_id is globally unique
-             # Or, the admin route should pass username context
-             # For now, assume admin routes provide enough context elsewhere or this check fails
-             flash('(Admin) Файл не найден в структуре пользователя.')
-             # Redirect back to admin panel or specific user view if possible
-             return redirect(request.referrer or url_for('admin_panel'))
-         else:
-             flash('Файл не найден!')
-             return redirect(url_for('dashboard')) # Redirect user to their root
+         flash('Файл не найден!')
+         return redirect(request.referrer or url_for('dashboard'))
+
 
     hf_path = file_node.get('path')
     original_filename = file_node.get('original_filename', 'downloaded_file')
@@ -896,7 +872,6 @@ def download_file(file_id):
     except requests.exceptions.RequestException as e:
         logging.error(f"Error downloading file from HF ({hf_path}): {e}")
         flash(f'Ошибка скачивания файла {original_filename}! ({e})')
-        # Determine redirect target
         return redirect(request.referrer or url_for('dashboard'))
     except Exception as e:
         logging.error(f"Unexpected error during download ({hf_path}): {e}")
@@ -919,7 +894,7 @@ def delete_file(file_id):
         return redirect(url_for('login'))
 
     file_node, parent_node = find_node_by_id(user_data['filesystem'], file_id)
-    current_view_folder_id = request.form.get('current_view_folder_id', 'root') # Where to redirect back
+    current_view_folder_id = request.form.get('current_view_folder_id', 'root')
 
     if not file_node or file_node.get('type') != 'file' or not parent_node:
         flash('Файл не найден или не может быть удален.')
@@ -930,7 +905,6 @@ def delete_file(file_id):
 
     if not hf_path:
         flash(f'Ошибка: Путь к файлу {original_filename} не найден. Удаление только из базы.')
-        # Proceed to remove from DB only
         if remove_node(user_data['filesystem'], file_id):
             try:
                 save_data(data)
@@ -956,7 +930,6 @@ def delete_file(file_id):
         )
         logging.info(f"Deleted file {hf_path} from HF Hub for user {username}")
 
-        # Now remove from DB
         if remove_node(user_data['filesystem'], file_id):
             try:
                 save_data(data)
@@ -1004,7 +977,7 @@ def delete_folder(folder_id):
         return redirect(url_for('login'))
 
     folder_node, parent_node = find_node_by_id(user_data['filesystem'], folder_id)
-    current_view_folder_id = request.form.get('current_view_folder_id', 'root') # Where to redirect back
+    current_view_folder_id = request.form.get('current_view_folder_id', 'root')
 
     if not folder_node or folder_node.get('type') != 'folder' or not parent_node:
         flash('Папка не найдена или не может быть удалена.')
@@ -1012,26 +985,20 @@ def delete_folder(folder_id):
 
     folder_name = folder_node.get('name', 'папка')
 
-    # Check if folder is empty
     if folder_node.get('children'):
         flash(f'Папку "{folder_name}" можно удалить только если она пуста.')
         return redirect(url_for('dashboard', folder_id=current_view_folder_id))
 
-    # Folder is empty, proceed with deletion from DB
     if remove_node(user_data['filesystem'], folder_id):
         try:
             save_data(data)
             flash(f'Пустая папка "{folder_name}" успешно удалена.')
-            # Note: We don't delete anything from HF Hub here, as empty folders don't really exist there.
-            # Files inside folders are deleted individually via delete_file.
         except Exception as e:
             flash('Ошибка сохранения данных после удаления папки.')
             logging.error(f"Delete empty folder save error: {e}")
     else:
         flash('Не удалось удалить папку из базы данных.')
 
-
-    # Redirect to the parent folder after deletion
     redirect_to_folder_id = parent_node.get('id', 'root')
     return redirect(url_for('dashboard', folder_id=redirect_to_folder_id))
 
@@ -1066,11 +1033,9 @@ def get_text_content(file_id):
         response = requests.get(file_url, headers=headers)
         response.raise_for_status()
 
-        # Limit file size to prevent server overload (e.g., 1MB)
         if len(response.content) > 1 * 1024 * 1024:
              return Response("Файл слишком большой для предпросмотра.", status=413)
 
-        # Try decoding with UTF-8, fallback to latin-1 or others if needed
         try:
             text_content = response.content.decode('utf-8')
         except UnicodeDecodeError:
@@ -1083,7 +1048,7 @@ def get_text_content(file_id):
 
     except requests.exceptions.RequestException as e:
         logging.error(f"Error fetching text content from HF ({hf_path}): {e}")
-        return Response(f"Ошибка загрузки содержимого: {e}", status=502) # Bad Gateway or appropriate error
+        return Response(f"Ошибка загрузки содержимого: {e}", status=502)
     except Exception as e:
         logging.error(f"Unexpected error fetching text content ({hf_path}): {e}")
         return Response("Внутренняя ошибка сервера", status=500)
@@ -1092,17 +1057,12 @@ def get_text_content(file_id):
 @app.route('/logout')
 def logout():
     session.pop('username', None)
-    # JS on login page handles localStorage removal upon redirection
     flash('Вы успешно вышли из системы.')
     return redirect(url_for('login'))
 
 
-# --- Admin Routes (Simplified - Add Auth Check) ---
-
 def is_admin():
-     # Implement proper admin check (e.g., check session for specific admin user/role)
-     # For now, allow access if logged in (INSECURE - REPLACE THIS)
-     return 'username' in session # Placeholder - VERY INSECURE
+     return 'username' in session
 
 @app.route('/admhosto')
 def admin_panel():
@@ -1112,7 +1072,6 @@ def admin_panel():
     data = load_data()
     users = data.get('users', {})
 
-    # Calculate total files per user
     user_details = []
     for uname, udata in users.items():
         file_count = 0
@@ -1131,7 +1090,7 @@ def admin_panel():
         })
 
     html = '''
-<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><title>Админ-панель</title>
+<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Админ-панель</title>
 <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;800&display=swap" rel="stylesheet">
 <style>''' + BASE_STYLE + '''</style></head><body><div class="container"><h1>Админ-панель</h1>
 {% with messages = get_flashed_messages() %}{% if messages %}{% for message in messages %}<div class="flash">{{ message }}</div>{% endfor %}{% endif %}{% endwith %}
@@ -1141,8 +1100,8 @@ def admin_panel():
     <a href="{{ url_for('admin_user_files', username=user.username) }}">{{ user.username }}</a>
     <p>Зарегистрирован: {{ user.created_at }}</p>
     <p>Файлов: {{ user.file_count }}</p>
-    <form method="POST" action="{{ url_for('admin_delete_user', username=user.username) }}" style="display: inline; margin-left: 10px;" onsubmit="return confirm('УДАЛИТЬ пользователя {{ user.username }} и ВСЕ его файлы? НЕОБРАТИМО!');">
-        <button type="submit" class="btn delete-btn" style="padding: 5px 10px; font-size: 0.9em;">Удалить</button>
+    <form method="POST" action="{{ url_for('admin_delete_user', username=user.username) }}" style="display: inline-block;" onsubmit="return confirm('УДАЛИТЬ пользователя {{ user.username }} и ВСЕ его файлы? НЕОБРАТИМО!');">
+        <button type="submit" class="btn delete-btn">Удалить</button>
     </form>
 </div>
 {% else %}<p>Пользователей нет.</p>{% endfor %}</div></div></body></html>'''
@@ -1159,33 +1118,27 @@ def admin_user_files(username):
         flash(f'Пользователь {username} не найден.')
         return redirect(url_for('admin_panel'))
 
-    # Flatten the file structure for simple display
     all_files = []
-    def collect_files(folder):
+    def collect_files(folder, current_fs):
          for item in folder.get('children', []):
               if item.get('type') == 'file':
-                  # Add parent folder info for context
-                  item['parent_path_str'] = get_node_path_string(user_data['filesystem'], folder.get('id', 'root'))
+                  item['parent_path_str'] = get_node_path_string(current_fs, folder.get('id', 'root'))
                   all_files.append(item)
               elif item.get('type') == 'folder':
-                  collect_files(item)
+                  collect_files(item, current_fs)
 
-    collect_files(user_data.get('filesystem', {}))
+    user_filesystem = user_data.get('filesystem', {})
+    if user_filesystem:
+        collect_files(user_filesystem, user_filesystem)
     all_files.sort(key=lambda x: x.get('upload_date', ''), reverse=True)
 
-
     html = '''
-<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><title>Файлы {{ username }}</title>
+<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Файлы {{ username }}</title>
 <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;800&display=swap" rel="stylesheet">
-<style>''' + BASE_STYLE + '''
-.file-item { background: var(--card-bg); padding: 15px; border-radius: 16px; box-shadow: var(--shadow); transition: var(--transition); }
-body.dark .file-item { background: var(--card-bg-dark); }
-.file-item:hover { transform: translateY(-5px); }
-.file-preview { max-width: 100%; max-height: 100px; object-fit: contain; border-radius: 10px; margin-bottom: 10px; display: block; margin-left: auto; margin-right: auto; }
-</style></head><body><div class="container"><h1>Файлы пользователя: {{ username }}</h1>
+<style>''' + BASE_STYLE + '''</style></head><body><div class="container"><h1>Файлы пользователя: {{ username }}</h1>
 <a href="{{ url_for('admin_panel') }}" class="btn" style="margin-bottom: 20px;">Назад к пользователям</a>
 {% with messages = get_flashed_messages() %}{% if messages %}{% for message in messages %}<div class="flash">{{ message }}</div>{% endfor %}{% endif %}{% endwith %}
-<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); gap: 20px;">
+<div class="admin-file-grid">
 {% for file in files %}
 <div class="file-item">
     {% if file.file_type == 'image' %} <img class="file-preview" src="{{ hf_file_url(file.path) }}" loading="lazy">
@@ -1198,17 +1151,16 @@ body.dark .file-item { background: var(--card-bg-dark); }
     <p style="font-size: 0.8em; color: #888;">Загружен: {{ file.upload_date }}</p>
     <p style="font-size: 0.7em; color: #ccc;">ID: {{ file.id }}</p>
     <p style="font-size: 0.7em; color: #ccc; word-break: break-all;">Path: {{ file.path }}</p>
-    <div style="margin-top: 10px;">
-        <a href="{{ url_for('download_file', file_id=file.id) }}" class="btn download-btn" style="font-size: 0.8em; padding: 4px 8px;">Скачать</a>
+    <div class="file-item-actions">
+        <a href="{{ url_for('download_file', file_id=file.id) }}" class="btn download-btn">Скачать</a>
         <form method="POST" action="{{ url_for('admin_delete_file', username=username, file_id=file.id) }}" style="display: inline-block;" onsubmit="return confirm('Удалить файл {{ file.original_filename }}?');">
-             <button type="submit" class="btn delete-btn" style="font-size: 0.8em; padding: 4px 8px;">Удалить</button>
+             <button type="submit" class="btn delete-btn">Удалить</button>
         </form>
     </div>
 </div>
 {% else %} <p>У пользователя нет файлов.</p> {% endfor %}
 </div></div>
 <script>
- // Basic helper function for URL generation if needed by JS
  const repoId = "{{ repo_id }}";
  function hfFileUrl(path, download = false) {
      let url = `https://huggingface.co/datasets/${repoId}/resolve/main/${path}`;
@@ -1236,11 +1188,8 @@ def admin_delete_user(username):
     user_data = data['users'][username]
     logging.warning(f"ADMIN ACTION: Attempting to delete user {username} and all their data.")
 
-    # 1. Attempt to delete files from Hugging Face Hub
     try:
         api = HfApi()
-        # Construct the base folder path for the user on HF Hub
-        # This assumes the top-level folder structure is consistent
         user_folder_path_on_hf = f"cloud_files/{username}"
 
         logging.info(f"Attempting to delete HF Hub folder: {user_folder_path_on_hf} for user {username}")
@@ -1250,28 +1199,21 @@ def admin_delete_user(username):
             repo_type="dataset",
             token=HF_TOKEN_WRITE,
             commit_message=f"ADMIN ACTION: Deleted all files/folders for user {username}"
-            # ignore_patterns=None, # Be careful with ignore patterns if used
         )
         logging.info(f"Successfully initiated deletion of folder {user_folder_path_on_hf} on HF Hub.")
-        # Note: Deletion might be async on HF side.
 
     except hf_utils.HfHubHTTPError as e:
-         # It's possible the folder doesn't exist (e.g., user never uploaded)
          if e.response.status_code == 404:
              logging.warning(f"User folder {user_folder_path_on_hf} not found on HF Hub for user {username}. Skipping HF deletion.")
          else:
              logging.error(f"Error deleting user folder {user_folder_path_on_hf} from HF Hub for {username}: {e}")
              flash(f'Ошибка при удалении файлов пользователя {username} с сервера: {e}. Пользователь НЕ удален из базы.')
-             # Stop the process if HF deletion fails critically? Or proceed to delete from DB anyway?
-             # Decision: Stop here to allow manual check/cleanup.
              return redirect(url_for('admin_panel'))
     except Exception as e:
         logging.error(f"Unexpected error during HF Hub folder deletion for {username}: {e}")
         flash(f'Неожиданная ошибка при удалении файлов {username} с сервера: {e}. Пользователь НЕ удален из базы.')
         return redirect(url_for('admin_panel'))
 
-
-    # 2. Delete user from the database
     try:
         del data['users'][username]
         save_data(data)
@@ -1280,7 +1222,6 @@ def admin_delete_user(username):
     except Exception as e:
         logging.error(f"Error saving data after deleting user {username}: {e}")
         flash(f'Файлы пользователя {username} удалены с сервера, но произошла ошибка при удалении пользователя из базы данных: {e}')
-        # Data inconsistency state - requires manual check
 
     return redirect(url_for('admin_panel'))
 
@@ -1303,7 +1244,6 @@ def admin_delete_file(username, file_id):
 
     if not file_node or file_node.get('type') != 'file' or not parent_node:
         flash('Файл не найден в структуре пользователя.')
-        # Optionally attempt deletion from HF anyway if path known? Risky.
         return redirect(url_for('admin_user_files', username=username))
 
     hf_path = file_node.get('path')
@@ -1311,7 +1251,6 @@ def admin_delete_file(username, file_id):
 
     if not hf_path:
         flash(f'Ошибка: Путь к файлу {original_filename} не найден в метаданных. Удаление только из базы.')
-        # Remove from DB only
         if remove_node(user_data['filesystem'], file_id):
             try:
                 save_data(data)
@@ -1321,7 +1260,6 @@ def admin_delete_file(username, file_id):
                  logging.error(f"Admin delete file metadata save error (no path): {e}")
         return redirect(url_for('admin_user_files', username=username))
 
-    # Proceed with HF deletion and DB update
     try:
         api = HfApi()
         api.delete_file(
@@ -1333,7 +1271,6 @@ def admin_delete_file(username, file_id):
         )
         logging.info(f"ADMIN ACTION: Deleted file {hf_path} from HF Hub for user {username}")
 
-        # Now remove from DB
         if remove_node(user_data['filesystem'], file_id):
             try:
                 save_data(data)
@@ -1342,7 +1279,6 @@ def admin_delete_file(username, file_id):
                 flash('Файл удален с сервера, но произошла ошибка обновления базы данных.')
                 logging.error(f"Admin delete file DB update error: {e}")
         else:
-             # Should not happen if found initially
              flash('Файл удален с сервера, но не найден в базе данных для удаления метаданных.')
 
     except hf_utils.EntryNotFoundError:
@@ -1364,8 +1300,6 @@ def admin_delete_file(username, file_id):
     return redirect(url_for('admin_user_files', username=username))
 
 
-# --- App Initialization ---
-
 if __name__ == '__main__':
     if not HF_TOKEN_WRITE:
         logging.warning("HF_TOKEN (write access) is not set. File uploads, deletions, and backups will fail.")
@@ -1373,26 +1307,22 @@ if __name__ == '__main__':
         logging.warning("HF_TOKEN_READ is not set. Falling back to HF_TOKEN. File downloads/previews might fail for private repos if HF_TOKEN is also not set.")
 
     if HF_TOKEN_WRITE:
-        # Initial download before starting backup thread
         logging.info("Performing initial database download before starting background backup.")
         download_db_from_hf()
         threading.Thread(target=periodic_backup, daemon=True).start()
         logging.info("Periodic backup thread started.")
     else:
         logging.warning("Periodic backup disabled because HF_TOKEN (write access) is not set.")
-        # Still attempt initial download if read token exists
         if HF_TOKEN_READ:
             logging.info("Performing initial database download (read-only mode).")
             download_db_from_hf()
         else:
              logging.warning("No read or write token. Database operations with Hugging Face Hub are disabled.")
-             # Check if local DB exists, if not create empty one
              if not os.path.exists(DATA_FILE):
                  with open(DATA_FILE, 'w', encoding='utf-8') as f:
                       json.dump({'users': {}}, f)
                  logging.info(f"Created empty local database file: {DATA_FILE}")
 
-
     app.run(debug=False, host='0.0.0.0', port=7860)
 
-# --- END OF FILE app (8).py ---
+# --- END OF FILE app (9).py ---