Update app.py

app.py

@@ -14,7 +14,7 @@ import string
 app = Flask(__name__)
 app.secret_key = os.getenv("FLASK_SECRET_KEY", "supersecretkey")
 DATA_FILE = 'cloud_data.json'
-REPO_ID = "Eluza133/Z1e1u"  # Новый репозиторий
+REPO_ID = "Eluza133/Z1e1u"
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ") or HF_TOKEN_WRITE
 ADMIN_PASSWORD = "87132morflot"
@@ -86,7 +86,7 @@ def download_db_from_hf():
 def periodic_backup():
     while True:
         upload_db_to_hf()
-        time.sleep(1800)  # Бэкап каждые 30 минут
+        time.sleep(1800)
 
 # Генерация 13-значного токена
 def generate_token():
@@ -149,7 +149,7 @@ h1 {
     -webkit-background-clip: text;
     color: transparent;
 }
-input, textarea {
+input, textarea, select {
     width: 100%;
     padding: 14px;
     margin: 12px 0;
@@ -160,10 +160,10 @@ input, textarea {
     font-size: 1.1em;
     box-shadow: inset 0 3px 10px rgba(0, 0, 0, 0.1);
 }
-body.dark input, body.dark textarea {
+body.dark input, body.dark textarea, body.dark select {
     color: var(--text-dark);
 }
-input:focus, textarea:focus {
+input:focus, textarea:focus, select:focus {
     outline: none;
     box-shadow: 0 0 0 4px var(--primary);
 }
@@ -192,6 +192,22 @@ input:focus, textarea: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;
@@ -199,11 +215,11 @@ input:focus, textarea:focus {
 }
 .file-grid {
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
     gap: 20px;
     margin-top: 20px;
 }
-.file-item {
+.folder-item, .file-item {
     background: var(--card-bg);
     padding: 15px;
     border-radius: 16px;
@@ -211,12 +227,18 @@ input:focus, textarea: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;
@@ -225,15 +247,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 {
@@ -255,6 +277,51 @@ body.dark .file-item {
     border-radius: 20px;
     box-shadow: var(--shadow);
 }
+.upload-progress {
+    width: 100%;
+    margin: 20px 0;
+    display: none;
+}
+.progress-bar-container {
+    width: 100%;
+    height: 20px;
+    background: var(--glass-bg);
+    border-radius: 10px;
+    overflow: hidden;
+    position: relative;
+}
+.progress-bar {
+    height: 100%;
+    width: 0%;
+    background: linear-gradient(90deg, var(--primary), var(--accent));
+    transition: width 0.3s ease;
+}
+.progress-text {
+    position: absolute;
+    width: 100%;
+    text-align: center;
+    font-size: 0.9em;
+    color: var(--text-light);
+    top: 50%;
+    transform: translateY(-50%);
+}
+body.dark .progress-text {
+    color: var(--text-dark);
+}
+@media (max-width: 768px) {
+    .file-grid {
+        grid-template-columns: repeat(2, 1fr);
+    }
+}
+@media (max-width: 480px) {
+    .file-grid {
+        grid-template-columns: 1fr;
+    }
+    .btn {
+        padding: 12px 20px;
+        font-size: 1em;
+    }
+}
 '''
 
 # Регистрация через /admhosto
@@ -267,7 +334,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': {}}}
             }
             save_data(data)
             flash(f'Ваш токен: {token}. Сохраните его!')
@@ -300,6 +367,12 @@ def register():
             <button type="submit" class="btn">Зарегистрироваться</button>
         </form>
     </div>
+    <script>
+        window.onload = () => {
+            const token = localStorage.getItem('token');
+            if (token) window.location = '/dashboard';
+        };
+    </script>
 </body>
 </html>
 '''
@@ -337,20 +410,40 @@ def login():
                 {% endfor %}
             {% endif %}
         {% endwith %}
-        <form method="POST">
+        <form method="POST" id="login-form">
             <input type="text" name="token" placeholder="Введите ваш токен" required>
             <button type="submit" class="btn">Войти</button>
         </form>
         <p style="margin-top: 20px;">Нет токена? <a href="{{ url_for('register') }}">Зарегистрируйтесь</a></p>
     </div>
+    <script>
+        window.onload = () => {
+            const token = localStorage.getItem('token');
+            if (token) window.location = '/dashboard';
+            document.getElementById('login-form').onsubmit = (e) => {
+                const token = e.target.querySelector('input[name="token"]').value;
+                localStorage.setItem('token', token);
+            };
+        };
+    </script>
 </body>
 </html>
 '''
     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'))
@@ -362,40 +455,70 @@ def dashboard():
         flash('Токен недействителен!')
         return redirect(url_for('login'))
     
-    user_files = data['users'][token]['files']
+    current_folder = get_folder(data, token, folder_path)
 
     if request.method == 'POST':
-        file = request.files.get('file')
-        if file and file.filename:
-            filename = secure_filename(file.filename)
-            temp_path = os.path.join('uploads', filename)
-            os.makedirs('uploads', exist_ok=True)
-            file.save(temp_path)
-            
-            api = HfApi()
-            file_path = f"cloud_files/{token}/{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}"
-            )
-            
-            file_info = {
-                'filename': filename,
-                'path': file_path,
-                'type': get_file_type(filename),
-                'upload_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-            }
-            data['users'][token]['files'].append(file_info)
+        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)
-            
-            if os.path.exists(temp_path):
-                os.remove(temp_path)
         
-        return redirect(url_for('dashboard'))
+        elif 'upload_files' in request.files:
+            files = request.files.getlist('files')
+            for file in files:
+                if file and file.filename:
+                    filename = secure_filename(file.filename)
+                    temp_path = os.path.join('uploads', filename)
+                    os.makedirs('uploads', exist_ok=True)
+                    file.save(temp_path)
+                    
+                    api = HfApi()
+                    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,
+                        'type': get_file_type(filename),
+                        'upload_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+                    }
+                    current_folder['files'].append(file_info)
+                    
+                    if os.path.exists(temp_path):
+                        os.remove(temp_path)
+            save_data(data)
+        
+        return redirect(url_for('dashboard', folder_path=folder_path))
 
     html = '''
 <!DOCTYPE html>
@@ -411,13 +534,43 @@ def dashboard():
     <div class="container">
         <h1>Zues Cloud Dashboard</h1>
         <p>Токен: {{ token }}</p>
-        <form method="POST" enctype="multipart/form-data">
-            <input type="file" name="file" required>
-            <button type="submit" class="btn">Загрузить файл</button>
+        <p>Текущая папка: {{ folder_path }}</p>
+        {% 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>
+        <form method="POST" enctype="multipart/form-data" id="upload-form">
+            <input type="file" name="files" multiple required>
+            <button type="submit" name="upload_files" class="btn">Загрузить</button>
         </form>
-        <h2 style="margin-top: 30px;">Ваши файлы</h2>
+        <div class="upload-progress" id="upload-progress">
+            <div class="progress-bar-container">
+                <div class="progress-bar" id="progress-bar"></div>
+                <span class="progress-text" id="progress-text">0%</span>
+            </div>
+        </div>
+
+        <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)">
@@ -430,10 +583,20 @@ def dashboard():
                     {% endif %}
                     <p>{{ file['upload_date'] }}</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>
@@ -459,11 +622,47 @@ def dashboard():
                 modal.innerHTML = '<div id="modalContent"></div>';
             }
         }
+        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');
+            const progressBar = document.getElementById('progress-bar');
+            const progressText = document.getElementById('progress-text');
+            
+            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);
+        };
+        window.onload = () => {
+            const token = localStorage.getItem('token');
+            if (!token) window.location = '/';
+            else sessionStorage.setItem('token', token);
+        };
     </script>
 </body>
 </html>
 '''
-    return render_template_string(html, token=token, user_files=user_files, repo_id=REPO_ID)
+    return render_template_string(html, token=token, current_folder=current_folder, folder_path=folder_path, repo_id=REPO_ID)
 
 # Выход
 @app.route('/logout')