Update app.py

app.py

@@ -444,7 +444,11 @@ 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:]:
+    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
 
@@ -463,7 +467,12 @@ def dashboard(folder_path='root'):
         flash('Токен недействителен!')
         return redirect(url_for('login'))
     
-    current_folder = get_folder(data, token, folder_path)
+    try:
+        current_folder = get_folder(data, token, folder_path)
+    except KeyError as e:
+        flash(str(e))
+        return redirect(url_for('dashboard', folder_path='root'))
+
     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
@@ -516,14 +525,20 @@ def dashboard(folder_path='root'):
                         
                         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}"
-                        )
+                        try:
+                            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}"
+                            )
+                        except Exception as e:
+                            flash(f"Ошибка при загрузке файла на Hugging Face: {str(e)}")
+                            if os.path.exists(temp_path):
+                                os.remove(temp_path)
+                            continue
                         
                         file_info = {
                             'filename': filename,
@@ -538,6 +553,7 @@ def dashboard(folder_path='root'):
                         if os.path.exists(temp_path):
                             os.remove(temp_path)
                 save_data(data)
+                flash('Файлы успешно загружены!')
         
         return redirect(url_for('dashboard', folder_path=folder_path))
 
@@ -657,36 +673,19 @@ def dashboard(folder_path='root'):
                 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;
+        document.getElementById('upload-form').onsubmit = function(e) {
             const progressContainer = document.getElementById('upload-progress');
+            progressContainer.style.display = 'block';
             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);
+            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);
         };
     </script>
 </body>