Update app.py

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, render_template_string, request, redirect, url_for, session, flash
+from flask import Flask, render_template_string, request, redirect, url_for, session, flash, jsonify
 from flask_caching import Cache
 import json
 import os
@@ -21,70 +21,53 @@ ADMIN_PASSWORD = "87132morflot"
 MAX_STORAGE_GB = 500
 
 cache = Cache(app, config={'CACHE_TYPE': 'simple'})
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-# Проверка токена
-if not HF_TOKEN_WRITE:
-    logging.error("HF_TOKEN_WRITE не установлен. Убедитесь, что переменная окружения HF_TOKEN задана.")
-else:
-    logging.info(f"HF_TOKEN_WRITE установлен (первые 5 символов: {HF_TOKEN_WRITE[:5]}...)")
-
-# Инициализация файла базы данных только если он не существует
-def initialize_data_file():
-    if not os.path.exists(DATA_FILE):
-        logging.info(f"Файл {DATA_FILE} не найден, создается новый.")
-        with open(DATA_FILE, 'w', encoding='utf-8') as f:
-            json.dump({'users': {}, 'files': {}}, f)
+logging.basicConfig(level=logging.INFO)
 
+# Функции для работы с базой данных и Hugging Face
 @cache.memoize(timeout=300)
 def load_data():
     try:
-        # Сначала пытаемся загрузить локальный файл, если он существует
-        if os.path.exists(DATA_FILE):
-            with open(DATA_FILE, 'r', encoding='utf-8') as file:
-                data = json.load(file)
-                logging.info("Данные загружены из локального файла")
-        else:
-            # Если локального файла нет, скачиваем с Hugging Face
-            download_db_from_hf()
-            with open(DATA_FILE, 'r', encoding='utf-8') as file:
-                data = json.load(file)
-                logging.info("Данные загружены с Hugging Face")
-
-        if not isinstance(data, dict):
-            logging.warning("Данные не в формате dict, инициализация пустой базы")
-            return {'users': {}, 'files': {}}
-        data.setdefault('users', {})
-        data.setdefault('files', {})
-        for token, user_data in data['users'].items():
-            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
-        return data
+        download_db_from_hf()
+        with open(DATA_FILE, 'r', encoding='utf-8') as file:
+            data = json.load(file)
+            if not isinstance(data, dict):
+                logging.warning("Данные не в формате dict, инициализация пустой базы")
+                return {'users': {}, 'files': {}}
+            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 'storage_used' not in user_data:
+                    user_data['storage_used'] = 0
+            logging.info("Данные успешно загружены")
+            return data
     except Exception as e:
         logging.error(f"Ошибка при загрузке данных: {e}")
-        initialize_data_file()
-        with open(DATA_FILE, 'r', encoding='utf-8') as file:
-            return json.load(file)
+        return {'users': {}, 'files': {}}
 
 def save_data(data):
     try:
         with open(DATA_FILE, 'w', encoding='utf-8') as file:
             json.dump(data, file, ensure_ascii=False, indent=4)
-        logging.info(f"Данные успешно сохранены в {DATA_FILE}")
         upload_db_to_hf()
         cache.clear()
+        logging.info("Данные сохранены и загружены на HF")
     except Exception as e:
         logging.error(f"Ошибка при сохранении данных: {e}")
         raise
 
 def upload_db_to_hf():
     try:
-        if not os.path.exists(DATA_FILE):
-            logging.warning(f"Файл {DATA_FILE} не существует, пропускаем загрузку")
-            return
         api = HfApi()
         api.upload_file(
             path_or_fileobj=DATA_FILE,
@@ -94,9 +77,9 @@ def upload_db_to_hf():
             token=HF_TOKEN_WRITE,
             commit_message=f"Бэкап {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
         )
-        logging.info("База данных успешно загружена на Hugging Face")
+        logging.info("База данных загружена на Hugging Face")
     except Exception as e:
-        logging.error(f"Ошибка при загрузке базы данных на Hugging Face: {e}")
+        logging.error(f"Ошибка при загрузке базы данных: {e}")
 
 def download_db_from_hf():
     try:
@@ -108,20 +91,23 @@ def download_db_from_hf():
             local_dir=".",
             local_dir_use_symlinks=False
         )
-        logging.info("База данных успешно скачана с Hugging Face")
+        logging.info("База данных скачана с Hugging Face")
     except Exception as e:
         logging.error(f"Ошибка при скачивании базы данных: {e}")
         if not os.path.exists(DATA_FILE):
-            initialize_data_file()
+            with open(DATA_FILE, 'w', encoding='utf-8') as f:
+                json.dump({'users': {}, 'files': {}}, f)
 
 def periodic_backup():
     while True:
         upload_db_to_hf()
-        time.sleep(1800)  # 30 минут
+        time.sleep(1800)
 
+# Генерация 13-значного токена
 def generate_token():
     return ''.join(random.choices(string.ascii_letters + string.digits, k=13))
 
+# Определение типа файла для предпросмотра
 def get_file_type(filename):
     video_extensions = ('.mp4', '.mov', '.avi')
     image_extensions = ('.jpg', '.jpeg', '.png', '.gif')
@@ -131,6 +117,7 @@ def get_file_type(filename):
         return 'image'
     return 'other'
 
+# Базовый стиль CSS
 BASE_STYLE = '''
 :root {
     --primary: #ff4d6d;
@@ -220,6 +207,22 @@ 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;
@@ -231,7 +234,7 @@ input:focus, textarea:focus, select:focus {
     gap: 20px;
     margin-top: 20px;
 }
-.file-item {
+.folder-item, .file-item {
     background: var(--card-bg);
     padding: 15px;
     border-radius: 16px;
@@ -239,12 +242,18 @@ input:focus, textarea:focus, select:focus {
     text-align: center;
     transition: var(--transition);
 }
-body.dark .file-item {
+body.dark .folder-item, body.dark .file-item {
     background: var(--card-bg-dark);
 }
-.file-item:hover {
+.folder-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;
@@ -253,15 +262,15 @@ body.dark .file-item {
     margin-bottom: 10px;
     loading: lazy;
 }
-.file-item p {
+.folder-item p, .file-item p {
     font-size: 0.9em;
     margin: 5px 0;
 }
-.file-item a {
+.folder-item a, .file-item a {
     color: var(--primary);
     text-decoration: none;
 }
-.file-item a:hover {
+.folder-item a:hover, .file-item a:hover {
     color: var(--accent);
 }
 .modal {
@@ -332,6 +341,7 @@ body.dark .progress-text, body.dark .storage-text {
 }
 '''
 
+# Регистрация через /admhosto
 @app.route('/admhosto', methods=['GET', 'POST'])
 def register():
     if request.method == 'POST':
@@ -341,7 +351,7 @@ def register():
             data = load_data()
             data['users'][token] = {
                 'created_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-                'files': [],
+                'folders': {'root': {'name': 'root', 'files': [], 'subfolders': {}}},
                 'storage_used': 0
             }
             save_data(data)
@@ -352,7 +362,7 @@ def register():
     
     html = '''
 <!DOCTYPE html>
-<html lang="ru">
+<html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -380,6 +390,7 @@ def register():
 '''
     return render_template_string(html)
 
+# Главная страница с вводом токена
 @app.route('/', methods=['GET', 'POST'])
 def login():
     if request.method == 'POST':
@@ -387,13 +398,14 @@ def login():
         data = load_data()
         if token in data['users'] and len(token) == 13:
             session['token'] = token
+            # Сохранение токена в localStorage перенесено в JavaScript
             return redirect(url_for('dashboard'))
         else:
             flash('Неверный токен! Токен должен быть 13 символов.')
     
     html = '''
 <!DOCTYPE html>
-<html lang="ru">
+<html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -428,8 +440,19 @@ 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']
+    for folder_name in folder_path.split('/')[1:]:
+        current = current['subfolders'][folder_name]
+    return current
+
+# Личный dashboard
 @app.route('/dashboard', methods=['GET', 'POST'])
-def dashboard():
+@app.route('/dashboard/<path:folder_path>', methods=['GET', 'POST'])
+def dashboard(folder_path='root'):
     if 'token' not in session:
         flash('Пожалуйста, войдите!')
         return redirect(url_for('login'))
@@ -441,7 +464,7 @@ def dashboard():
         flash('Токен недействителен!')
         return redirect(url_for('login'))
     
-    user_files = data['users'][token]['files']
+    current_folder = get_folder(data, token, folder_path)
     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
@@ -449,61 +472,78 @@ def dashboard():
     storage_remaining_gb = MAX_STORAGE_GB - storage_used_gb
 
     if request.method == 'POST':
-        if 'upload_files' in request.files:
+        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'].pop(file_index)
+            target = get_folder(data, token, target_folder)
+            target['files'].append(file)
+            save_data(data)
+        
+        elif '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:
                 flash('Недостаточно места для загрузки файлов!')
             else:
-                uploads_dir = 'uploads'
-                os.makedirs(uploads_dir, exist_ok=True)
                 for file in files:
                     if file and file.filename:
                         filename = secure_filename(file.filename)
-                        temp_path = os.path.join(uploads_dir, filename)
+                        temp_path = os.path.join('uploads', filename)
+                        os.makedirs('uploads', exist_ok=True)
                         file.save(temp_path)
                         file_size = os.path.getsize(temp_path)
                         
                         api = HfApi()
-                        file_path = f"cloud_files/{token}_{filename}"
-                        try:
-                            logging.info(f"Попытка загрузки файла: {filename} в {file_path}")
-                            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"Загружен файл {filename} для {token}"
-                            )
-                            logging.info(f"Файл {filename} успешно загружен в Hugging Face")
-                        except Exception as e:
-                            logging.error(f"Ошибка при загрузке файла на Hugging Face: {e}")
-                            flash(f"Ошибка при загрузке файла {filename}: {str(e)}")
-                            if os.path.exists(temp_path):
-                                os.remove(temp_path)
-                            continue
+                        file_path = f"cloud_files/{token}/{folder_path}/{filename}"
+                        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}"
+                        )
                         
                         file_info = {
                             'filename': filename,
                             'path': file_path,
-                            ' éxtra': get_file_type(filename),
+                            'type': get_file_type(filename),
                             'upload_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
                             'size': file_size
                         }
-                        user_files.append(file_info)
+                        current_folder['files'].append(file_info)
                         data['users'][token]['storage_used'] += file_size
                         
                         if os.path.exists(temp_path):
                             os.remove(temp_path)
                 save_data(data)
-                flash('Файлы успешно загружены!')
         
-        return redirect(url_for('dashboard'))
+        return redirect(url_for('dashboard', folder_path=folder_path))
 
     html = '''
 <!DOCTYPE html>
-<html lang="ru">
+<html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -515,6 +555,7 @@ def dashboard():
     <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">
@@ -522,7 +563,16 @@ def dashboard():
                 <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 %}
@@ -542,9 +592,20 @@ def dashboard():
             </div>
         </div>
 
-        <h2 style="margin-top: 30px;">Файлы</h2>
+        <h2 style="margin-top: 30px;">Папки и файлы</h2>
         <div class="file-grid">
-            {% for file in user_files %}
+            {% 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 i, file in enumerate(current_folder['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)">
@@ -557,10 +618,20 @@ def dashboard():
                     {% 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="{{ i }}">
+                        <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 user_files %}
-                <p>Файлов нет.</p>
+            {% if not current_folder['files'] and not current_folder['subfolders'] %}
+                <p>Папка пуста.</p>
             {% endif %}
         </div>
         <a href="{{ url_for('logout') }}" class="btn" style="margin-top: 20px;">Выйти</a>
@@ -586,19 +657,36 @@ def dashboard():
                 modal.innerHTML = '<div id="modalContent"></div>';
             }
         }
-        document.getElementById('upload-form').onsubmit = function(e) {
+        document.getElementById('upload-form').onsubmit = async function(e) {
+            e.preventDefault();
+            const formData = new FormData(this);
+            const files = formData.getAll('files');
+            const totalFiles = files.length;
             const progressContainer = document.getElementById('upload-progress');
-            progressContainer.style.display = 'block';
             const progressBar = document.getElementById('progress-bar');
             const progressText = document.getElementById('progress-text');
-            let percent = 0;
-            const interval = setInterval(() => {
-                percent += 10;
-                if (percent > 100) percent = 100;
-                progressBar.style.width = percent + '%';
-                progressText.textContent = percent + '%';
-                if (percent === 100) clearInterval(interval);
-            }, 200);
+            
+            progressContainer.style.display = 'block';
+            let uploadedFiles = 0;
+
+            const xhr = new XMLHttpRequest();
+            xhr.open('POST', window.location.pathname, true);
+            xhr.upload.onprogress = function(event) {
+                if (event.lengthComputable) {
+                    const percent = Math.round((event.loaded / event.total) * 100);
+                    progressBar.style.width = percent + '%';
+                    progressText.textContent = `Загрузка ${uploadedFiles + 1}/${totalFiles} (${percent}%)`;
+                }
+            };
+            xhr.onload = function() {
+                uploadedFiles++;
+                if (uploadedFiles === totalFiles) {
+                    window.location.reload();
+                } else {
+                    progressText.textContent = `Загружено ${uploadedFiles}/${totalFiles}`;
+                }
+            };
+            xhr.send(formData);
         };
     </script>
 </body>
@@ -607,7 +695,8 @@ def dashboard():
     return render_template_string(
         html, 
         token=token, 
-        user_files=user_files,
+        current_folder=current_folder, 
+        folder_path=folder_path, 
         repo_id=REPO_ID,
         storage_used_gb=storage_used_gb,
         storage_remaining_gb=storage_remaining_gb,
@@ -615,13 +704,12 @@ def dashboard():
         MAX_STORAGE_GB=MAX_STORAGE_GB
     )
 
+# Выход
 @app.route('/logout')
 def logout():
     session.pop('token', None)
     return redirect(url_for('login'))
 
 if __name__ == '__main__':
-    # Инициализация только если файла нет
-    initialize_data_file()
     threading.Thread(target=periodic_backup, daemon=True).start()
     app.run(debug=True, host='0.0.0.0', port=7860)