Update app.py

app.py

@@ -36,17 +36,10 @@ def load_data():
             data.setdefault('users', {})
             data.setdefault('files', {})
             for token, user_data in data['users'].items():
-                if 'folders' not in user_data:
-                    files = user_data.get('files', [])
-                    user_data['folders'] = {
-                        'root': {
-                            'name': 'root',
-                            'files': files,
-                            'subfolders': {}
-                        }
-                    }
-                    if 'files' in user_data:
-                        del user_data['files']
+                # Удаляем структуру папок, храним файлы напрямую
+                if 'folders' in user_data:
+                    user_data['files'] = user_data['folders'].get('root', {}).get('files', [])
+                    del user_data['folders']
                 if 'storage_used' not in user_data:
                     user_data['storage_used'] = 0
             logging.info("Данные успешно загружены")
@@ -207,22 +200,6 @@ input:focus, textarea:focus, select:focus {
 .download-btn:hover {
     background: #00b8c5;
 }
-.edit-btn {
-    background: var(--accent);
-    padding: 8px 16px;
-    font-size: 0.9em;
-}
-.edit-btn:hover {
-    background: #7a4de3;
-}
-.delete-btn {
-    background: #ff3b30;
-    padding: 8px 16px;
-    font-size: 0.9em;
-}
-.delete-btn:hover {
-    background: #e02a20;
-}
 .flash {
     color: var(--secondary);
     text-align: center;
@@ -234,7 +211,7 @@ input:focus, textarea:focus, select:focus {
     gap: 20px;
     margin-top: 20px;
 }
-.folder-item, .file-item {
+.file-item {
     background: var(--card-bg);
     padding: 15px;
     border-radius: 16px;
@@ -242,18 +219,12 @@ input:focus, textarea:focus, select:focus {
     text-align: center;
     transition: var(--transition);
 }
-body.dark .folder-item, body.dark .file-item {
+body.dark .file-item {
     background: var(--card-bg-dark);
 }
-.folder-item:hover, .file-item:hover {
+.file-item:hover {
     transform: translateY(-5px);
 }
-.folder-item {
-    background: rgba(139, 92, 246, 0.1);
-}
-body.dark .folder-item {
-    background: rgba(139, 92, 246, 0.2);
-}
 .file-preview {
     max-width: 100%;
     max-height: 200px;
@@ -262,15 +233,15 @@ body.dark .folder-item {
     margin-bottom: 10px;
     loading: lazy;
 }
-.folder-item p, .file-item p {
+.file-item p {
     font-size: 0.9em;
     margin: 5px 0;
 }
-.folder-item a, .file-item a {
+.file-item a {
     color: var(--primary);
     text-decoration: none;
 }
-.folder-item a:hover, .file-item a:hover {
+.file-item a:hover {
     color: var(--accent);
 }
 .modal {
@@ -351,7 +322,7 @@ def register():
             data = load_data()
             data['users'][token] = {
                 'created_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-                'folders': {'root': {'name': 'root', 'files': [], 'subfolders': {}}},
+                'files': [],
                 'storage_used': 0
             }
             save_data(data)
@@ -439,23 +410,9 @@ def login():
 '''
     return render_template_string(html)
 
-# Функция для получения папки по пути
-def get_folder(data, token, folder_path):
-    current = data['users'][token]['folders']
-    if folder_path == 'root':
-        return current['root']
-    path_parts = folder_path.split('/')
-    for folder_name in path_parts[1:]:
-        if 'subfolders' not in current or folder_name not in current['subfolders']:
-            logging.error(f"Папка {folder_name} не найдена в пути {folder_path} для токена {token}")
-            raise KeyError(f"Папка {folder_name} не найдена")
-        current = current['subfolders'][folder_name]
-    return current
-
 # Личный dashboard
 @app.route('/dashboard', methods=['GET', 'POST'])
-@app.route('/dashboard/<path:folder_path>', methods=['GET', 'POST'])
-def dashboard(folder_path='root'):
+def dashboard():
     if 'token' not in session:
         flash('Пожалуйста, войдите!')
         return redirect(url_for('login'))
@@ -467,12 +424,7 @@ def dashboard(folder_path='root'):
         flash('Токен недействителен!')
         return redirect(url_for('login'))
     
-    try:
-        current_folder = get_folder(data, token, folder_path)
-    except KeyError as e:
-        flash(str(e))
-        return redirect(url_for('dashboard', folder_path='root'))
-
+    user_files = data['users'][token]['files']
     storage_used = data['users'][token]['storage_used']
     max_storage_bytes = MAX_STORAGE_GB * 1024 * 1024 * 1024
     storage_percent = (storage_used / max_storage_bytes) * 100 if max_storage_bytes > 0 else 0
@@ -480,36 +432,7 @@ def dashboard(folder_path='root'):
     storage_remaining_gb = MAX_STORAGE_GB - storage_used_gb
 
     if request.method == 'POST':
-        if 'create_folder' in request.form:
-            folder_name = request.form.get('folder_name')
-            if folder_name and folder_name not in current_folder['subfolders']:
-                current_folder['subfolders'][folder_name] = {'name': folder_name, 'files': [], 'subfolders': {}}
-                save_data(data)
-        
-        elif 'edit_folder' in request.form:
-            old_name = request.form.get('old_name')
-            new_name = request.form.get('new_name')
-            if old_name in current_folder['subfolders'] and new_name and new_name not in current_folder['subfolders']:
-                current_folder['subfolders'][new_name] = current_folder['subfolders'].pop(old_name)
-                current_folder['subfolders'][new_name]['name'] = new_name
-                save_data(data)
-        
-        elif 'delete_folder' in request.form:
-            folder_name = request.form.get('folder_name')
-            if folder_name in current_folder['subfolders']:
-                del current_folder['subfolders'][folder_name]
-                save_data(data)
-        
-        elif 'move_file' in request.form:
-            file_index = int(request.form.get('file_index'))
-            target_folder = request.form.get('target_folder')
-            file = current_folder['files'][file_index]
-            current_folder['files'].pop(file_index)
-            target = get_folder(data, token, target_folder)
-            target['files'].append(file)
-            save_data(data)
-        
-        elif 'upload_files' in request.files:
+        if 'upload_files' in request.files:
             files = request.files.getlist('files')
             total_size = sum(f.content_length for f in files if f)
             if storage_used + total_size > max_storage_bytes:
@@ -524,18 +447,22 @@ def dashboard(folder_path='root'):
                         file_size = os.path.getsize(temp_path)
                         
                         api = HfApi()
-                        file_path = f"cloud_files/{token}/{folder_path}/{filename}"
+                        file_path = f"cloud_files/{token}/{filename}"
                         try:
+                            logging.info(f"Попытка загрузки файла: {file_path} в репозиторий {REPO_ID}")
+                            logging.info(f"Используемый токен: {HF_TOKEN_WRITE[:5]}... (скрыт для безопасности)")
                             api.upload_file(
                                 path_or_fileobj=temp_path,
                                 path_in_repo=file_path,
                                 repo_id=REPO_ID,
                                 repo_type="dataset",
                                 token=HF_TOKEN_WRITE,
-                                commit_message=f"Загружен файл для {token} в {folder_path}"
+                                commit_message=f"Загружен файл для {token}"
                             )
+                            logging.info(f"Файл {filename} успешно загружен в Hugging Face")
                         except Exception as e:
-                            flash(f"Ошибка при загрузке файла на Hugging Face: {str(e)}")
+                            logging.error(f"Ошибка при загрузке файла на Hugging Face: {str(e)}")
+                            flash(f"Ошибка при загрузке файла {filename}: {str(e)}")
                             if os.path.exists(temp_path):
                                 os.remove(temp_path)
                             continue
@@ -547,7 +474,7 @@ def dashboard(folder_path='root'):
                             'upload_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
                             'size': file_size
                         }
-                        current_folder['files'].append(file_info)
+                        user_files.append(file_info)
                         data['users'][token]['storage_used'] += file_size
                         
                         if os.path.exists(temp_path):
@@ -555,7 +482,7 @@ def dashboard(folder_path='root'):
                 save_data(data)
                 flash('Файлы успешно загружены!')
         
-        return redirect(url_for('dashboard', folder_path=folder_path))
+        return redirect(url_for('dashboard'))
 
     html = '''
 <!DOCTYPE html>
@@ -571,7 +498,6 @@ def dashboard(folder_path='root'):
     <div class="container">
         <h1>Zues Cloud Dashboard</h1>
         <p>Токен: {{ token }}</p>
-        <p>Текущая папка: {{ folder_path }}</p>
         <div class="storage-indicator">
             <p>Использовано места: {{ "%.2f" % storage_used_gb }} ГБ из {{ MAX_STORAGE_GB }} ГБ (Осталось: {{ "%.2f" % storage_remaining_gb }} ГБ)</p>
             <div class="storage-bar-container">
@@ -579,16 +505,7 @@ def dashboard(folder_path='root'):
                 <span class="storage-text">{{ "%.1f" % storage_percent }}%</span>
             </div>
         </div>
-        {% if folder_path != 'root' %}
-            <a href="{{ url_for('dashboard', folder_path='/'.join(folder_path.split('/')[:-1]) or 'root') }}" class="btn">Назад</a>
-        {% endif %}
         
-        <h2 style="margin-top: 20px;">Создать папку</h2>
-        <form method="POST">
-            <input type="text" name="folder_name" placeholder="Название папки" required>
-            <button type="submit" name="create_folder" class="btn">Создать</button>
-        </form>
-
         <h2 style="margin-top: 20px;">Загрузить файлы</h2>
         {% with messages = get_flashed_messages() %}
             {% if messages %}
@@ -608,20 +525,9 @@ def dashboard(folder_path='root'):
             </div>
         </div>
 
-        <h2 style="margin-top: 30px;">Папки и файлы</h2>
+        <h2 style="margin-top: 30px;">Файлы</h2>
         <div class="file-grid">
-            {% for folder_name, folder in current_folder['subfolders'].items() %}
-                <div class="folder-item">
-                    <p><a href="{{ url_for('dashboard', folder_path=folder_path + '/' + folder_name) }}">{{ folder_name }}</a></p>
-                    <form method="POST" style="margin-top: 10px;">
-                        <input type="text" name="new_name" placeholder="Новое имя" value="{{ folder_name }}">
-                        <input type="hidden" name="old_name" value="{{ folder_name }}">
-                        <button type="submit" name="edit_folder" class="btn edit-btn">Переименовать</button>
-                        <button type="submit" name="delete_folder" class="btn delete-btn" onclick="return confirm('Удалить папку?');">Удалить</button>
-                    </form>
-                </div>
-            {% endfor %}
-            {% for file in current_folder['files'] %}
+            {% for file in user_files %}
                 <div class="file-item">
                     {% if file['type'] == 'video' %}
                         <video class="file-preview" preload="metadata" muted loading="lazy" onclick="openModal('https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}', true)">
@@ -634,20 +540,10 @@ def dashboard(folder_path='root'):
                     {% endif %}
                     <p>{{ file['upload_date'] }} ({{ "%.2f" % (file['size'] / (1024 * 1024)) }} МБ)</p>
                     <a href="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}" class="btn download-btn" download="{{ file['filename'] }}">Скачать</a>
-                    <form method="POST" style="margin-top: 10px;">
-                        <input type="hidden" name="file_index" value="{{ loop.index0 }}">
-                        <select name="target_folder">
-                            <option value="">Переместить в...</option>
-                            {% for f_name in current_folder['subfolders'] %}
-                                <option value="{{ folder_path + '/' + f_name }}">{{ f_name }}</option>
-                            {% endfor %}
-                        </select>
-                        <button type="submit" name="move_file" class="btn edit-btn">Переместить</button>
-                    </form>
                 </div>
             {% endfor %}
-            {% if not current_folder['files'] and not current_folder['subfolders'] %}
-                <p>Папка пуста.</p>
+            {% if not user_files %}
+                <p>Файлов нет.</p>
             {% endif %}
         </div>
         <a href="{{ url_for('logout') }}" class="btn" style="margin-top: 20px;">Выйти</a>
@@ -694,8 +590,7 @@ def dashboard(folder_path='root'):
     return render_template_string(
         html, 
         token=token, 
-        current_folder=current_folder, 
-        folder_path=folder_path, 
+        user_files=user_files,
         repo_id=REPO_ID,
         storage_used_gb=storage_used_gb,
         storage_remaining_gb=storage_remaining_gb,