Регистрация в Zeus Cloud
- {% with messages = get_flashed_messages() %} +
+
@@ -391,81 +696,120 @@ def register():
@app.route('/', methods=['GET', 'POST'])
def login():
if request.method == 'POST':
- username = request.form.get('username')
- password = request.form.get('password')
+ content_type = request.headers.get('Content-Type')
+ is_json = content_type and 'application/json' in content_type
+
+ if is_json:
+ req_data = request.get_json()
+ username = req_data.get('username')
+ password = req_data.get('password')
+ else: # Assume form data
+ username = request.form.get('username')
+ password = request.form.get('password')
+
+ if not username or not password:
+ if is_json: return jsonify({'status': 'error', 'message': 'Имя пользователя и пароль обязательны!'}), 400
+ else: flash('Имя пользователя и пароль обязательны!', 'error'); return redirect(url_for('login'))
+
data = load_data()
- if username in data['users'] and data['users'][username]['password'] == password:
+
+ if username in data.get('users', {}) and data['users'][username].get('password') == password:
session['username'] = username
- return jsonify({'status': 'success', 'redirect': url_for('dashboard')})
+ session.permanent = True # Make session last longer
+ app.permanent_session_lifetime = timedelta(days=30) # Example: 30 days
+
+ if is_json: return jsonify({'status': 'success', 'redirect': url_for('dashboard')})
+ else: flash('Вход выполнен успешно!', 'success'); return redirect(url_for('dashboard'))
else:
- return jsonify({'status': 'error', 'message': 'Неверное имя пользователя или пароль!'})
+ if is_json: return jsonify({'status': 'error', 'message': 'Неверное имя пользователя или пароль!'}), 401
+ else: flash('Неверное имя пользователя или пароль!', 'error'); return redirect(url_for('login'))
+
+ # GET request
html = '''
- Регистрация
+ {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} - {% for message in messages %} -{{ message }}
+ {% for category, message in messages %}
+ {{ message }}
{% endfor %}
{% endif %}
{% endwith %}
- Уже есть аккаунт? Войти
+Уже есть аккаунт? Войти
- ', methods=['GET', 'POST'])
-def dashboard(folder_path=''):
- if 'username' not in session:
- flash('Пожалуйста, войдите в систему!')
- return redirect(url_for('login'))
+@app.route('/dashboard/', defaults={'path': ''})
+@app.route('/dashboard/', methods=['GET', 'POST'])
+@login_required
+def dashboard(path):
username = session['username']
data = load_data()
- if username not in data['users']:
- session.pop('username', None)
- flash('Пользователь не найден!')
- return redirect(url_for('login'))
- current_folder = folder_path if folder_path else 'root'
- user_folders = [f for f in data['users'][username].get('folders', []) if f['parent'] == current_folder]
- user_files = [f for f in data['users'][username].get('files', []) if f['folder'] == current_folder]
- user_folders = sorted(user_folders, key=lambda x: x['name'])
- user_files = sorted(user_files, key=lambda x: x['upload_date'], reverse=True)
+ user_data = data['users'][username]
+ current_path_list = parse_path(path)
+
+ if current_path_list is None:
+ flash('Недопустимый путь!', 'error')
+ return redirect(url_for('dashboard', path='')) # Redirect to root
+
+ current_folder_obj = navigate_to_path(user_data['root'], current_path_list)
+
+ if current_folder_obj is None:
+ flash('Папка не найдена!', 'error')
+ return redirect(url_for('dashboard', path='')) # Redirect to root
+
+ # Ensure structure is correct
+ current_folder_obj.setdefault('files', [])
+ current_folder_obj.setdefault('folders', {})
+
if request.method == 'POST':
- if 'create_folder' in request.form:
- folder_name = request.form.get('folder_name')
- if not folder_name:
- flash('Имя папки обязательно!')
- return redirect(url_for('dashboard', folder_path=folder_path))
- folder_id = str(uuid.uuid4())
- folder_path_full = f"{current_folder}/{folder_name}" if current_folder != 'root' else folder_name
- data['users'][username].setdefault('folders', []).append({
- 'id': folder_id,
- 'name': folder_name,
- 'parent': current_folder,
- 'path': folder_path_full,
- 'created_at",
- "created_at": datetime.now().strftime('%Y-%m-%d %H:%M:%S')
- })
- save_data(data)
- flash('Папка успешно создана!')
- return redirect(url_for('dashboard', folder_path=folder_path))
files = request.files.getlist('files')
- if files and len(files) > 20:
- flash('Максим��м 20 файлов за раз!')
- return redirect(url_for('dashboard', folder_path=folder_path))
- if files:
- os.makedirs('uploads', exist_ok=True)
- api = HfApi()
- temp_files = []
- for file in files:
- if file and file.filename:
- original_filename = secure_filename(file.filename)
- unique_filename = generate_unique_filename(original_filename)
- temp_path = os.path.join('uploads', unique_filename)
+ if not files or not files[0].filename: # Check if any file was actually selected
+ flash('Файлы для загрузки не выбраны.', 'warning')
+ return redirect(url_for('dashboard', path=path))
+
+ if len(files) > 20: # Limit concurrent uploads
+ flash('Максимум 20 файлов за раз!', 'warning')
+ return redirect(url_for('dashboard', path=path))
+
+ uploaded_count = 0
+ error_count = 0
+ api = _get_hf_api()
+ if not api:
+ flash('Ошибка конфигурации сервера: не удается получить доступ к хранилищу.', 'error')
+ return redirect(url_for('dashboard', path=path))
+
+ temp_upload_dir = os.path.join('uploads', username, *current_path_list)
+ os.makedirs(temp_upload_dir, exist_ok=True)
+
+ for file in files:
+ if file and file.filename: # and allowed_file(file.filename): # Re-enable if needed
+ original_filename = secure_filename(file.filename)
+ if not is_safe_name(original_filename, MAX_FILENAME_LENGTH):
+ logging.warning(f"Skipping file with invalid name: {original_filename}")
+ error_count += 1
+ continue
+
+ unique_filename = generate_unique_filename(original_filename)
+ hf_path = build_hf_path(username, current_path_list, unique_filename)
+ temp_path = os.path.join(temp_upload_dir, unique_filename) # Save with unique name locally too
+
+ try:
file.save(temp_path)
- temp_files.append((temp_path, unique_filename, original_filename))
- for temp_path, unique_filename, original_filename in temp_files:
- file_path = f"cloud_files/{username}/{unique_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"Uploaded file for {username}"
- )
- file_info = {
- 'filename': original_filename,
- 'unique_filename': unique_filename,
- 'path': file_path,
- 'type': get_file_type(original_filename),
- 'upload_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
- 'folder': current_folder
- }
- data['users'][username]['files'].append(file_info)
- if os.path.exists(temp_path):
- os.remove(temp_path)
- save_data(data)
- flash('Файлы успешно загружены!')
- return redirect(url_for('dashboard', folder_path=folder_path))
- parent_folder = 'root' if current_folder == 'root' else '/'.join(current_folder.split('/')[:-1])
+ logging.info(f"Uploading {original_filename} as {unique_filename} to {hf_path}")
+
+ api.upload_file(
+ path_or_fileobj=temp_path,
+ path_in_repo=hf_path,
+ repo_id=REPO_ID,
+ repo_type="dataset",
+ token=HF_TOKEN_WRITE,
+ commit_message=f"User {username} uploaded {original_filename} to {path}"
+ )
+
+ file_info = {
+ 'original_filename': original_filename,
+ 'unique_filename': unique_filename, # Stored name on HF
+ 'path': hf_path, # Full path on HF
+ 'type': get_file_type(original_filename),
+ 'upload_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+ # Add size later if needed: 'size': os.path.getsize(temp_path)
+ }
+ current_folder_obj['files'].append(file_info)
+ uploaded_count += 1
+
+ except Exception as e:
+ logging.error(f"Failed to upload {original_filename}: {e}", exc_info=True)
+ error_count += 1
+ finally:
+ # Clean up temp file
+ if os.path.exists(temp_path):
+ try:
+ os.remove(temp_path)
+ except OSError as e:
+ logging.error(f"Error removing temporary file {temp_path}: {e}")
+
+ # Cleanup potentially empty temp dirs
+ try:
+ if not os.listdir(temp_upload_dir):
+ os.rmdir(temp_upload_dir)
+ # Could recursively go up and delete empty parent dirs if needed
+ except OSError:
+ pass # Ignore if dir is not empty or cannot be removed
+
+ if uploaded_count > 0:
+ try:
+ save_data(data)
+ flash(f'{uploaded_count} файл(ов) успешно загружено.', 'success')
+ except Exception as e:
+ flash('Файлы загружены в хранилище, но произошла ошибка при обновлении списка файлов. Попробуйте обновить страницу.', 'error')
+ logging.error(f"Failed to save data after uploads for {username}: {e}")
+
+ if error_count > 0:
+ flash(f'Не удалось загрузить {error_count} файл(ов). Проверьте логи сервера для деталей.', 'error')
+
+ # Use JS for progress bar, redirect might interrupt it
+ # Return JSON for AJAX upload handler if implemented, otherwise redirect
+ # For now, simple redirect
+ return redirect(url_for('dashboard', path=path))
+
+
+ # GET request or after POST redirect
+ sorted_files = sorted(current_folder_obj['files'], key=lambda x: x.get('upload_date', ''), reverse=True)
+ sorted_folders = sorted(current_folder_obj['folders'].keys())
+ breadcrumbs = get_breadcrumbs(path)
+
html = '''
- Панель управления - Zeus Cloud
-
+ Панель управления - Zeus Cloud V2
+
+
+
+
Zeus Cloud
-
- {% with messages = get_flashed_messages() %}
- {% if messages %}
- {% for message in messages %}
-
-
- {{ message }}
- {% endfor %}
- {% endif %}
- {% endwith %}
- Нет аккаунта? Зарегистрируйтесь
+
+
@@ -474,802 +818,1187 @@ def login():
'''
return render_template_string(html)
-@app.route('/dashboard', methods=['GET', 'POST'])
-@app.route('/dashboard/Zeus Cloud V2
+
+ {% with messages = get_flashed_messages(with_categories=true) %}
+ {% if messages %}
+ {% for category, message in messages %}
+
+
+ {{ message }}
+ {% endfor %}
+ {% endif %}
+ {% endwith %}
+ Нет аккаунта? Зарегистрируйтесь
-
Панель управления Zeus Cloud
-Пользователь: {{ username }}
- {% with messages = get_flashed_messages() %} +
+
+
+ {% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
- {% for message in messages %}
- Панель управления
+
+ {{ username }}
+ Выйти
+
+ {{ message }}
+ {% for category, message in messages %}
+ {{ message }}
{% endfor %}
{% endif %}
{% endwith %}
- Текущая папка: {{ current_folder }}
- {% if current_folder != 'root' %} - Назад - {% endif %} - - -
-
-
- Папки
-
- {% for folder in user_folders %}
-
+
+
+
+
+
+
-
+
+
+
Файлы
-Ваши файлы под надежной защитой квантовой криптографии
+0%
Содержимое папки '{{ breadcrumbs[-1].name }}'
- {% for file in user_files %}
-
- {% if file['type'] == 'video' %}
-
- Добавить на главный экран
-Для быстрого доступа к Zeus Cloud, вы можете добавить это приложение на главный экран вашего телефона:
-
-
+
+
+ Для пользователей Android:
--
-
- Откройте Zeus Cloud в браузере Chrome. -
- Нажмите на меню браузера (обычно три точки вверху справа). -
- Выберите "Добавить на главный экран". -
- Подтвердите добавление, и иконка приложения появится на вашем главном экране. -
+
+
+ Добавить на главный экран
+Для быстрого доступа добавьте Zeus Cloud на главный экран телефона (PWA).
+-
+
- Android (Chrome): Меню (три точки) -> "Установить приложение" или "Добавить на главный экран". +
- iOS (Safari): Кнопка "Поделиться" (квадрат со стрелкой) -> "На экран «Домой»". +
+
+
'''
- return render_template_string(html, username=username, user_files=user_files, user_folders=user_folders, repo_id=REPO_ID, current_folder=current_folder, parent_folder=parent_folder)
+ # Pass helper functions/variables to template
+ from urllib.parse import quote, unquote
+
+ def encode_path_for_url(path):
+ # Simple base64 encoding for path to avoid issues with slashes in URL parameters
+ # Not true security, just for URL routing convenience.
+ import base64
+ return base64.urlsafe_b64encode(path.encode()).decode()
+
+ def get_hf_file_url_template(file_path):
+ # Use hf_hub_url which handles repo type and endpoint correctly
+ # Note: This doesn't automatically add tokens. Do that in JS if needed.
+ try:
+ return hf_hub_url(repo_id=REPO_ID, filename=file_path, repo_type="dataset")
+ except Exception as e:
+ logging.error(f"Error generating HF URL for {file_path}: {e}")
+ # Fallback or placeholder
+ return f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{file_path}" # Older method
+
+
+ return render_template_string(
+ html,
+ username=username,
+ user_files=sorted_files,
+ sorted_folders=sorted_folders,
+ path=path,
+ breadcrumbs=breadcrumbs,
+ REPO_ID=REPO_ID,
+ encode_path=encode_path_for_url, # Pass encoding function
+ get_hf_file_url=get_hf_file_url_template # Pass URL generation function
+ )
+
+@app.route('/create_folder', methods=['POST'])
+@login_required
+def create_folder():
+ username = session['username']
+ current_path_str = request.form.get('current_path', '')
+ new_folder_name = request.form.get('new_folder_name', '').strip()
+
+ if not is_safe_name(new_folder_name, MAX_FOLDER_NAME_LENGTH):
+ flash(f'Недопустимое имя папки. Имя не должно содержать символы {INVALID_CHARS} и быть длиннее {MAX_FOLDER_NAME_LENGTH} символов.', 'error')
+ return redirect(url_for('dashboard', path=current_path_str))
+
+ data = load_data()
+ user_data = data['users'][username]
+ current_path_list = parse_path(current_path_str)
+
+ if current_path_list is None:
+ flash('Недопустимый текущий путь!', 'error')
+ return redirect(url_for('dashboard', path=''))
+
+ parent_folder_obj = navigate_to_path(user_data['root'], current_path_list)
+
+ if parent_folder_obj is None:
+ flash('Родительская папка не найдена!', 'error')
+ return redirect(url_for('dashboard', path=''))
+
+ parent_folder_obj.setdefault('folders', {}) # Ensure 'folders' key exists
+
+ if new_folder_name in parent_folder_obj['folders']:
+ flash(f'Папка с именем "{new_folder_name}" уже существует здесь.', 'warning')
+ else:
+ parent_folder_obj['folders'][new_folder_name] = initialize_user_root() # Create new empty folder structure
+ try:
+ save_data(data)
+ flash(f'Папка "{new_folder_name}" успешно создана.', 'success')
+ logging.info(f"User {username} created folder '{new_folder_name}' at path '{current_path_str}'")
+ except Exception as e:
+ flash('Ошибка при сохранении данных. Не удалось создать папку.', 'error')
+ logging.error(f"Failed to save data after creating folder for {username}: {e}")
+ # Rollback the change in memory if save failed
+ if new_folder_name in parent_folder_obj['folders']:
+ del parent_folder_obj['folders'][new_folder_name]
+
+ return redirect(url_for('dashboard', path=current_path_str))
+
+@app.route('/delete_folder', methods=['POST'])
+@login_required
+def delete_folder():
+ username = session['username']
+ folder_path_str = request.form.get('folder_path', '') # The path to the folder to delete
+
+ if not folder_path_str:
+ flash('Не указан путь к папке для удаления.', 'error')
+ return redirect(url_for('dashboard', path=''))
+
+ data = load_data()
+ user_data = data['users'][username]
+ folder_path_list = parse_path(folder_path_str)
+
+ if folder_path_list is None:
+ flash('Недопустимый путь к папке.', 'error')
+ return redirect(url_for('dashboard', path=''))
+
+ # Find the parent folder and the name of the folder to delete
+ if not folder_path_list: # Cannot delete root
+ flash('Нельзя удалить корневую папку.', 'error')
+ return redirect(url_for('dashboard', path=''))
+
+ folder_name_to_delete = folder_path_list[-1]
+ parent_path_list = folder_path_list[:-1]
+ parent_folder_obj = navigate_to_path(user_data['root'], parent_path_list)
+
+ if parent_folder_obj is None or folder_name_to_delete not in parent_folder_obj.get('folders', {}):
+ flash('Папка не найдена или не существует.', 'error')
+ # Determine redirect path (parent path or root)
+ parent_redirect_path = '/'.join(parent_path_list)
+ return redirect(url_for('dashboard', path=parent_redirect_path))
+
+ # --- Deletion Logic ---
+ api = _get_hf_api()
+ if not api:
+ flash('Ошибка конфигурации сервера: не удается получить доступ к хранилищу.', 'error')
+ parent_redirect_path = '/'.join(parent_path_list)
+ return redirect(url_for('dashboard', path=parent_redirect_path))
+
+ hf_folder_path = f"cloud_files/{username}/{folder_path_str}"
-def get_text_file_content(file_path):
try:
- file_url = f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{file_path}?download=true"
- headers = {}
- if HF_TOKEN_READ:
- headers["authorization"] = f"Bearer {HF_TOKEN_READ}"
- response = requests.get(file_url, headers=headers)
- response.raise_for_status()
- content = response.text
- return b64encode(content.encode('utf-8')).decode('utf-8')
+ logging.info(f"Attempting to delete HF folder: {hf_folder_path}")
+ # Use HfApi.delete_folder - This should handle non-empty folders
+ api.delete_folder(
+ folder_path=hf_folder_path,
+ repo_id=REPO_ID,
+ repo_type="dataset",
+ token=HF_TOKEN_WRITE,
+ commit_message=f"User {username} deleted folder {folder_path_str}"
+ )
+ logging.info(f"Successfully deleted HF folder: {hf_folder_path}")
+
+ # If HF deletion is successful (or if it didn't exist - check API behavior), remove from JSON
+ del parent_folder_obj['folders'][folder_name_to_delete]
+ save_data(data)
+ flash(f'Папка "{folder_name_to_delete}" и её содержимое успешно удалены.', 'success')
+ logging.info(f"User {username} successfully deleted folder '{folder_path_str}'")
+
except Exception as e:
- logging.error(f"Error fetching text file content: {e}")
- return b64encode("Ошибка загрузки содержимого файла.".encode('utf-8')).decode('utf-8')
-
-@app.route('/download//')
-def download_file(unique_filename, filename):
- if 'username' not in session:
- flash('Пожалуйста, войдите в систему!')
- return redirect(url_for('login'))
+ # More specific error handling (e.g., huggingface_hub.utils.RepositoryNotFoundError)
+ logging.error(f"Error deleting folder '{folder_path_str}' for user {username}: {e}", exc_info=True)
+ # Check if it's a 'not found' error - maybe already deleted?
+ if "404" in str(e) or "not found" in str(e).lower():
+ logging.warning(f"Folder {hf_folder_path} likely already deleted on HF. Removing from local DB.")
+ # Proceed to remove from JSON if it exists there
+ if folder_name_to_delete in parent_folder_obj.get('folders', {}):
+ del parent_folder_obj['folders'][folder_name_to_delete]
+ try:
+ save_data(data)
+ flash(f'Папка "{folder_name_to_delete}" удалена (возможно, уже была удалена из хранилища).', 'warning')
+ except Exception as save_e:
+ flash('Ошибка при обновлении списка папок после удаления.', 'error')
+ logging.error(f"Failed to save data after attempting local delete of folder {folder_name_to_delete}: {save_e}")
+ else:
+ flash(f'Папка "{folder_name_to_delete}" не найдена.', 'error')
+
+ else:
+ # Other HF API error or save_data error
+ flash(f'Ошибка при удалении папки "{folder_name_to_delete}". {e}', 'error')
+
+
+ parent_redirect_path = '/'.join(parent_path_list)
+ return redirect(url_for('dashboard', path=parent_redirect_path))
+
+
+@app.route('/download/')
+@login_required
+def download_file(file_path_encoded):
username = session['username']
+ # Decode the path
+ import base64
+ try:
+ file_path = base64.urlsafe_b64decode(file_path_encoded.encode()).decode()
+ except Exception:
+ flash('Неверная ссылка на файл.', 'error')
+ return redirect(request.referrer or url_for('dashboard'))
+
+ # Basic validation of the decoded path
+ if not file_path.startswith(f"cloud_files/{username}/"):
+ # Check if it's an admin request coming from the admin panel
+ # This check is basic; a proper role/permission system is better
+ is_admin_request = request.referrer and 'admhosto' in request.referrer
+ if not is_admin_request:
+ flash('Доступ запрещен.', 'error')
+ logging.warning(f"User {username} attempted to access unauthorized path: {file_path}")
+ # Redirect back to where they came from, or their root dashboard
+ return redirect(request.referrer or url_for('dashboard'))
+ else:
+ # Admin access allowed (assuming admin is logged in, though no explicit check here)
+ logging.info(f"Admin access granted for download: {file_path}")
+ pass # Allow admin download
+
+ # Find the file in the data structure to get the original filename
data = load_data()
- if username not in data['users']:
- session.pop('username', None)
- flash('Пользователь не найден!')
- return redirect(url_for('login'))
- user_files = data['users'][username]['files']
- file_info = next((file for file in user_files if file['unique_filename'] == unique_filename), None)
- if not file_info:
- is_admin_route = request.referrer and 'admhosto' in request.referrer
- if not is_admin_route:
- flash('У вас нет доступа к этому файлу!')
- return redirect(url_for('dashboard'))
- file_path = file_info['path'] if file_info else f"cloud_files/{username}/{unique_filename}"
- file_url = f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{file_path}?download=true"
+ original_filename = "downloaded_file" # Default
+ file_found = False
+
+ # Need to search through the structure
+ path_parts = file_path.split('/')[2:] # Get parts after cloud_files/username/
+ unique_filename = path_parts[-1]
+ folder_path_list = path_parts[:-1]
+
+ # Navigate to the folder containing the file
+ target_folder = navigate_to_path(data['users'].get(username, {}).get('root', {}), folder_path_list)
+
+ if target_folder:
+ for file_info in target_folder.get('files', []):
+ if file_info.get('path') == file_path:
+ original_filename = file_info.get('original_filename', unique_filename)
+ file_found = True
+ break
+
+ # Admin check - if file wasn't found under session user, check the actual user in path
+ if not file_found and 'is_admin_request' in locals() and is_admin_request:
+ path_user = file_path.split('/')[1]
+ if path_user != username and path_user in data['users']:
+ target_folder_admin = navigate_to_path(data['users'][path_user]['root'], folder_path_list)
+ if target_folder_admin:
+ for file_info in target_folder_admin.get('files', []):
+ if file_info.get('path') == file_path:
+ original_filename = file_info.get('original_filename', unique_filename)
+ file_found = True
+ break
+
+ if not file_found:
+ # Even if file not in DB, maybe it exists on HF? Try downloading anyway?
+ # Or just fail here. Let's fail for consistency.
+ flash('Файл не найден в базе данных.', 'error')
+ logging.warning(f"File metadata not found in DB for path: {file_path}")
+ return redirect(request.referrer or url_for('dashboard'))
+
+ # --- Proceed with HF Download ---
+ token = _get_hf_token_read()
+ headers = {}
+ if token:
+ headers["authorization"] = f"Bearer {token}"
+
+ # Use hf_hub_url to get the correct download URL
try:
- api = HfApi()
- headers = {}
- if HF_TOKEN_READ:
- headers["authorization"] = f"Bearer {HF_TOKEN_READ}"
+ file_url = hf_hub_url(repo_id=REPO_ID, filename=file_path, repo_type="dataset")
+ # Append download=true manually if hf_hub_url doesn't add it
+ if '?' in file_url:
+ file_url += '&download=true'
+ else:
+ file_url += '?download=true'
+
+ logging.info(f"Attempting download from URL: {file_url.split('?')[0]}?...") # Log URL without query params
response = requests.get(file_url, headers=headers, stream=True)
- response.raise_for_status()
- file_content = BytesIO(response.content)
+ response.raise_for_status() # Check for HTTP errors (4xx, 5xx)
+
+ # Get content type if possible
+ content_type = response.headers.get('Content-Type', 'application/octet-stream')
+
+ # Stream the download
return send_file(
- file_content,
- as_attachment=True,
- download_name=filename,
- mimetype='application/octet-stream'
+ BytesIO(response.content), # Consider streaming for large files if needed
+ mimetype=content_type,
+ as_attachment=True,
+ download_name=original_filename # Use the original filename for the user
)
+
except requests.exceptions.RequestException as e:
- logging.error(f"Error downloading file from HF: {e}")
- flash('Ошибка скачивания файла!')
- if request.referrer and 'admhosto' in request.referrer:
- return redirect(url_for('admin_user_files', username=username))
- else:
- return redirect(url_for('dashboard'))
+ logging.error(f"Error downloading file '{file_path}' from HF: {e}")
+ flash(f'Ошибка скачивания файла с сервера ({e}).', 'error')
+ return redirect(request.referrer or url_for('dashboard'))
except Exception as e:
- logging.error(f"Unexpected error during download: {e}")
- flash('Произошла непредвиденная ошибка при скачивании файла.')
- if request.referrer and 'admhosto' in request.referrer:
- return redirect(url_for('admin_user_files', username=username))
- else:
- return redirect(url_for('dashboard'))
+ logging.error(f"Unexpected error during download of '{file_path}': {e}", exc_info=True)
+ flash('Произошла непредвиденная ошибка при скачивании файла.', 'error')
+ return redirect(request.referrer or url_for('dashboard'))
+
-@app.route('/delete/')
-def delete_file(unique_filename):
- if 'username' not in session:
- flash('Пожалуйста, войдите в систему!')
- return redirect(url_for('login'))
+@app.route('/delete_file', methods=['POST'])
+@login_required
+def delete_file():
username = session['username']
+ # Decode the path
+ import base64
+ file_path_encoded = request.form.get('file_path_encoded')
+ if not file_path_encoded:
+ flash('Не указан файл для удаления.', 'error')
+ return redirect(request.referrer or url_for('dashboard'))
+
+ try:
+ file_path = base64.urlsafe_b64decode(file_path_encoded.encode()).decode()
+ except Exception:
+ flash('Неверная ссылка на файл.', 'error')
+ return redirect(request.referrer or url_for('dashboard'))
+
+ # Validate ownership (user must own the file path)
+ if not file_path.startswith(f"cloud_files/{username}/"):
+ flash('Доступ запрещен.', 'error')
+ logging.warning(f"User {username} attempted unauthorized delete on path: {file_path}")
+ return redirect(request.referrer or url_for('dashboard'))
+
data = load_data()
- if username not in data['users']:
- session.pop('username', None)
- flash('Пользователь не найден!')
- return redirect(url_for('login'))
- user_files = data['users'][username]['files']
- file_to_delete = next((file for file in user_files if file['unique_filename'] == unique_filename), None)
- if not file_to_delete:
- flash('Файл не найден!')
- return redirect(url_for('dashboard'))
+ user_data = data['users'][username]
+
+ # Find the file's parent folder in the data structure
+ path_parts = file_path.split('/')[2:] # Get parts after cloud_files/username/
+ unique_filename = path_parts[-1]
+ folder_path_list = path_parts[:-1]
+
+ target_folder_obj = navigate_to_path(user_data['root'], folder_path_list)
+ file_info_index = -1
+ original_filename = unique_filename # Fallback name
+
+ if target_folder_obj and 'files' in target_folder_obj:
+ for i, file_info in enumerate(target_folder_obj['files']):
+ if file_info.get('path') == file_path:
+ file_info_index = i
+ original_filename = file_info.get('original_filename', unique_filename)
+ break
+
+ # --- Deletion Logic ---
+ api = _get_hf_api()
+ if not api:
+ flash('Ошибка конфигурации сервера: не удается получить доступ к хранилищу.', 'error')
+ return redirect(request.referrer or url_for('dashboard', path='/'.join(folder_path_list)))
+
try:
- api = HfApi()
+ logging.info(f"Attempting to delete HF file: {file_path}")
api.delete_file(
- path_in_repo=file_to_delete['path'],
+ path_in_repo=file_path,
repo_id=REPO_ID,
repo_type="dataset",
token=HF_TOKEN_WRITE,
- commit_message=f"Deleted file {file_to_delete['path']} for {username}"
+ commit_message=f"User {username} deleted file {original_filename}"
)
- data['users'][username]['files'] = [f for f in user_files if f['unique_filename'] != unique_filename]
- save_data(data)
- flash('Файл успешно удален!')
- except Exception as e:
- logging.error(f"Error deleting file: {e}")
- flash('Ошибка удаления файла!')
- return redirect(url_for('dashboard', folder_path=file_to_delete['folder']))
-
-@app.route('/delete_folder/')
-def delete_folder(folder_id):
- if 'username' not in session:
- flash('Пожалуйста, войдите в систему!')
- return redirect(url_for('login'))
- username = session['username']
- data = load_data()
- if username not in data['users']:
- session.pop('username', None)
- flash('Пользователь не найден!')
- return redirect(url_for('login'))
- user_folders = data['users'][username].get('folders', [])
- folder_to_delete = next((folder for folder in user_folders if folder['id'] == folder_id), None)
- if not folder_to_delete:
- flash('Папка не найдена!')
- return redirect(url_for('dashboard'))
- try:
- api = HfApi()
- files_to_delete = [f for f in data['users'][username]['files'] if f['folder'].startswith(folder_to_delete['path'])]
- for file in files_to_delete:
- api.delete_file(
- path_in_repo=file['path'],
- repo_id=REPO_ID,
- repo_type="dataset",
- token=HF_TOKEN_WRITE,
- commit_message=f"Deleted file {file['path']} for {username} during folder deletion"
- )
- data['users'][username]['files'] = [f for f in data['users'][username]['files'] if not f['folder'].startswith(folder_to_delete['path'])]
- data['users'][username]['folders'] = [f for f in user_folders if f['id'] != folder_id]
- save_data(data)
- flash('Папка и все её содержимое успешно удалены!')
+ logging.info(f"Successfully deleted HF file: {file_path}")
+
+ # If HF deletion successful (or file not found on HF), remove from JSON
+ if file_info_index != -1:
+ del target_folder_obj['files'][file_info_index]
+ save_data(data)
+ flash(f'Файл "{original_filename}" успешно удален.', 'success')
+ logging.info(f"User {username} successfully deleted file record: {file_path}")
+ else:
+ # File was deleted from HF, but not found in local DB (maybe inconsistent state?)
+ flash(f'Файл "{original_filename}" удален из хранилища, но не найден в локальном списке.', 'warning')
+ logging.warning(f"File record not found in DB for deleted path: {file_path}")
+ # Optionally, still save data if other changes occurred? For now, no save needed.
+
except Exception as e:
- logging.error(f"Error deleting folder: {e}")
- flash('Ошибка удаления папки!')
- return redirect(url_for('dashboard', folder_path=folder_to_delete['parent']))
+ logging.error(f"Error deleting file '{file_path}' for user {username}: {e}", exc_info=True)
+ # Check if it's a 'not found' error - maybe already deleted?
+ if "404" in str(e) or "not found" in str(e).lower():
+ logging.warning(f"File {file_path} likely already deleted on HF. Removing from local DB if exists.")
+ if file_info_index != -1:
+ del target_folder_obj['files'][file_info_index]
+ try:
+ save_data(data)
+ flash(f'Файл "{original_filename}" удален (возможно, уже был удален из хранилища).', 'warning')
+ except Exception as save_e:
+ flash('Ошибка при обновлении списка файлов после удаления.', 'error')
+ logging.error(f"Failed to save data after attempting local delete of file {file_path}: {save_e}")
+ else:
+ flash(f'Файл "{original_filename}" не найден.', 'error')
+ else:
+ flash(f'Ошибка при удалении файла "{original_filename}". {e}', 'error')
+
+ return redirect(url_for('dashboard', path='/'.join(folder_path_list)))
@app.route('/logout')
def logout():
- session.pop('username', None)
+ username = session.pop('username', None)
+ # No need for client-side local storage clearing here anymore,
+ # the login page JS handles clearing on failed auto-login or successful manual login.
+ # Manual logout on server is sufficient.
+ if username:
+ flash('Вы успешно вышли из системы.', 'success')
+ logging.info(f"User {username} logged out.")
return redirect(url_for('login'))
+
+# --- Admin Routes (Keep basic for now) ---
+# WARNING: These routes lack proper admin authentication! Add checks!
+def admin_required(f):
+ @wraps(f)
+ def decorated_function(*args, **kwargs):
+ # FIXME: Implement actual admin check here!
+ # Example: if session.get('is_admin') != True:
+ if session.get('username') != 'admin': # Example: only user 'admin' is admin
+ flash('Доступ запрещен. Требуются права администратора.', 'error')
+ return redirect(url_for('login'))
+ return f(*args, **kwargs)
+ return decorated_function
+
+
@app.route('/admhosto')
+@admin_required
def admin_panel():
data = load_data()
- users = data['users']
+ users = data.get('users', {})
+
+ # Calculate total files per user (recursive helper needed)
+ def count_files_recursive(folder_obj):
+ count = len(folder_obj.get('files', []))
+ for sub_folder in folder_obj.get('folders', {}).values():
+ count += count_files_recursive(sub_folder)
+ return count
+
+ users_with_counts = {}
+ for uname, udata in users.items():
+ file_count = count_files_recursive(udata.get('root', initialize_user_root()))
+ users_with_counts[uname] = {
+ 'created_at': udata.get('created_at', 'N/A'),
+ 'file_count': file_count
+ }
+
html = '''
-
-
- Админ-панель - Zeus Cloud
-
+
+ Админ-панель - Zeus Cloud V2
+
+
')
-def admin_user_files(username):
- data = load_data()
- if username not in data['users']:
- flash('Пользователь не найден!')
- return redirect(url_for('admin_panel'))
- user_folders = sorted(data['users'][username].get('folders', []), key=lambda x: x.get('name', ''))
- user_files = sorted(data['users'][username].get('files', []), key=lambda x: x.get('upload_date', ''), reverse=True)
- html = '''
-
-
-
-
-
- Файлы пользователя {{ username }} - Zeus Cloud
-
-
-
-
- /')
-def admin_user_folder(username, folder_path):
+@app.route('/admhosto/user/', defaults={'path': ''})
+@app.route('/admhosto/user//')
+@admin_required
+def admin_user_files(username, path):
data = load_data()
- if username not in data['users']:
- flash('Пользователь не найден!')
+ if username not in data.get('users', {}):
+ flash(f'Пользователь "{username}" не найден!', 'error')
return redirect(url_for('admin_panel'))
- current_folder = folder_path
- user_folders = [f for f in data['users'][username].get('folders', []) if f['parent'] == current_folder]
- user_files = [f for f in data['users'][username].get('files', []) if f['folder'] == current_folder]
- user_folders = sorted(user_folders, key=lambda x: x['name'])
- user_files = sorted(user_files, key=lambda x: x.get('upload_date', ''), reverse=True)
- parent_folder = 'root' if current_folder == 'root' else '/'.join(current_folder.split('/')[:-1])
+
+ user_data = data['users'][username]
+ current_path_list = parse_path(path)
+ if current_path_list is None:
+ flash('Недопустимый путь!', 'error')
+ return redirect(url_for('admin_user_files', username=username, path=''))
+
+ current_folder_obj = navigate_to_path(user_data.get('root', initialize_user_root()), current_path_list)
+
+ if current_folder_obj is None:
+ flash('Папка не найдена для этого пользователя!', 'error')
+ return redirect(url_for('admin_user_files', username=username, path=''))
+
+ current_folder_obj.setdefault('files', [])
+ current_folder_obj.setdefault('folders', {})
+
+ sorted_files = sorted(current_folder_obj['files'], key=lambda x: x.get('upload_date', ''), reverse=True)
+ sorted_folders = sorted(current_folder_obj['folders'].keys())
+ breadcrumbs = get_breadcrumbs(path)
+ # Modify breadcrumb URLs for admin view
+ admin_breadcrumbs = [{'name': 'Admin', 'path': url_for('admin_panel')}, {'name': username, 'path': url_for('admin_user_files', username=username)}]
+ current_admin_path_base = url_for('admin_user_files', username=username)
+ temp_path = []
+ for part in current_path_list:
+ temp_path.append(part)
+ admin_breadcrumbs.append({'name': part, 'path': f"{current_admin_path_base}/{'/'.join(temp_path)}"})
+
+
+ # Need encode_path and get_hf_file_url for the template
+ from urllib.parse import quote
+ import base64
+ def encode_path_for_url(path):
+ return base64.urlsafe_b64encode(path.encode()).decode()
+ def get_hf_file_url_template(file_path):
+ try: return hf_hub_url(repo_id=REPO_ID, filename=file_path, repo_type="dataset")
+ except: return f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{file_path}"
+
html = '''
-
-
-
-
-
- Папка {{ current_folder }} пользователя {{ username }} - Zeus Cloud
-
-
-
-
-
-
-
-
-'''
- return render_template_string(html, users=users)
-
-@app.route('/admhosto/user/Админ-панель Zeus Cloud
+Админ-панель
+ Назад в Дашборд + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %}
+ {% for category, message in messages %}
{% endif %}
+ {% endwith %}
{{ message }}
{% endfor %}
+ Список пользователей
- {% for username, user_data in users.items() %}
+ {% for username, user_info in users_with_counts.items() %}
- {% with messages = get_flashed_messages() %}
- {% if messages %}
-
- {{ username }}
-
- {% endfor %}
- {% if not users %}
+ {% else %}
Дата регистрации: {{ user_data.get('created_at', 'N/A') }}
-Количество файлов: {{ user_data.get('files', []) | length }}
-Количество папок: {{ user_data.get('folders', []) | length }}
- + +
+ Файлы
+
+
Пользователей пока нет.
- {% endif %} -
- {% for message in messages %}
-
- {% endif %}
- {% endwith %}
- {{ message }}
- {% endfor %}
-
-
- Пользователь: {{ username }}
- {% with messages = get_flashed_messages() %} - {% if messages %} - {% for message in messages %} -{{ message }}
- {% endfor %}
- {% endif %}
- {% endwith %}
- Папки
-
- {% for folder in user_folders %}
-
-
- {{ folder['name'] }}
-
{% endfor %}
- {% if not user_folders %}
- {{ folder['created_at'] }}
- -Папок пока нет.
- {% endif %}Файлы
-
- {% for file in user_files %}
-
- Назад к списку пользователей
- {% if file.get('type') == 'video' %}
-
- {% elif file.get('type') == 'image' %}
- ![{{ file['filename'] }}](https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}?download=true)
- {% elif file.get('type') == 'pdf' %}
-
- {% elif file.get('type') == 'txt' %}
- {% set content = get_text_file_content(file['path']) %}
-
- {% endfor %}
- {% if not user_files %}
- {{ content | b64decode | truncate(200) }}
- {% else %}
- {{ file.get('filename', 'N/A') }}
- {% endif %} -{{ file.get('upload_date', 'N/A') }}
-Папка: {{ file.get('folder', 'root') }}
- Скачать - -Файлов пока нет.
- {% endif %} -
-
-
-
'''
- return render_template_string(html, username=username, user_files=user_files, user_folders=user_folders, repo_id=REPO_ID, os=os)
+ return render_template_string(html, users_with_counts=users_with_counts)
-@app.route('/admhosto/user/
-
Папка: {{ current_folder }} (Пользователь: {{ username }})
- {% with messages = get_flashed_messages() %} - {% if messages %} - {% for message in messages %} -{{ message }}
- {% endfor %}
- {% endif %}
- {% endwith %}
- Назад
- Папки
-
- {% for folder in user_folders %}
- Файлы пользователя {{ username }} - Админ
+
+
+
+
+ '''
+ return render_template_string(html, username=username, path=path, sorted_files=sorted_files, sorted_folders=sorted_folders, admin_breadcrumbs=admin_breadcrumbs, REPO_ID=REPO_ID, encode_path=encode_path_for_url, get_hf_file_url=get_hf_file_url_template)
+
@app.route('/admhosto/delete_user/', methods=['POST'])
+@admin_required
def admin_delete_user(username):
+ admin_username = session['username'] # For logging
+ if username == admin_username: # Prevent admin from deleting themselves easily
+ flash('Администратор не может удалить сам себя через эту форму.', 'error')
+ return redirect(url_for('admin_panel'))
+
data = load_data()
- if username not in data['users']:
- flash('Пользователь не найден!')
+ if username not in data.get('users', {}):
+ flash(f'Пользователь "{username}" не найден!', 'error')
return redirect(url_for('admin_panel'))
- user_files_to_delete = data['users'][username].get('files', [])
- user_folders_to_delete = data['users'][username].get('folders', [])
+
+ api = _get_hf_api()
+ if not api:
+ flash('Ошибка конфигурации сервера: не удается получить доступ к хранилищу.', 'error')
+ return redirect(url_for('admin_panel'))
+
+ hf_user_folder_path = f"cloud_files/{username}"
+
+ try:
+ logging.warning(f"Admin '{admin_username}' initiating deletion of user '{username}' and folder '{hf_user_folder_path}'")
+ # Attempt to delete the entire user folder on Hugging Face
+ api.delete_folder(
+ folder_path=hf_user_folder_path,
+ repo_id=REPO_ID,
+ repo_type="dataset",
+ token=HF_TOKEN_WRITE,
+ commit_message=f"Admin {admin_username} deleted user {username} and all files"
+ # ignore_patterns=["*.keep"] # Example if needed
+ )
+ logging.info(f"Successfully deleted HF folder '{hf_user_folder_path}' for user '{username}'.")
+
+ except Exception as e:
+ # Check if folder not found (maybe already deleted or never existed)
+ if "404" in str(e) or "not found" in str(e).lower():
+ logging.warning(f"HF folder '{hf_user_folder_path}' not found during deletion for user '{username}'. Proceeding with DB removal.")
+ else:
+ # Log the error but proceed with DB deletion - admin action
+ logging.error(f"Error deleting HF folder '{hf_user_folder_path}' for user '{username}': {e}. Proceeding with DB removal anyway.", exc_info=True)
+ flash(f'Ошибка при удалении файлов пользователя {username} из хранилища, но пользователь будет удален из базы данных.', 'warning')
+
+ # Regardless of HF deletion result (unless it was a critical config error handled earlier), remove user from DB
try:
- api = HfApi()
- paths_to_delete = [file['path'] for file in user_files_to_delete]
- if paths_to_delete:
- try:
- api.delete_folder(
- folder_path=f"cloud_files/{username}",
- repo_id=REPO_ID,
- repo_type="dataset",
- token=HF_TOKEN_WRITE,
- commit_message=f"Deleted all files for user {username} by admin"
- )
- logging.info(f"Successfully deleted folder for user {username}")
- except Exception as folder_delete_error:
- logging.warning(f"Could not delete folder for {username}, attempting individual file deletion: {folder_delete_error}")
- for file_path in paths_to_delete:
- try:
- api.delete_file(
- path_in_repo=file_path,
- repo_id=REPO_ID,
- repo_type="dataset",
- token=HF_TOKEN_WRITE
- )
- except Exception as file_delete_error:
- logging.error(f"Error deleting file {file_path} for user {username}: {file_delete_error}")
del data['users'][username]
save_data(data)
- flash(f'Пользователь {username} и его файлы и папки успешно удалены!')
- logging.info(f"Admin deleted user {username} and their files and folders.")
+ flash(f'Пользователь "{username}" и его файлы (если были) успешно удалены.', 'success')
+ logging.info(f"Admin '{admin_username}' successfully deleted user '{username}' from database.")
except Exception as e:
- logging.error(f"Error deleting user {username}: {e}")
- flash(f'Ошибка при удалении пользователя {username}!')
+ flash(f'Ошибка при удалении пользователя "{username}" из базы данных.', 'error')
+ logging.error(f"Failed to save data after deleting user '{username}' from DB: {e}")
+
+
return redirect(url_for('admin_panel'))
-@app.route('/admhosto/delete_file//', methods=['POST'])
-def admin_delete_file(username, unique_filename):
+@app.route('/admhosto/delete_file/', methods=['POST'])
+@admin_required
+def admin_delete_file(username):
+ admin_username = session['username'] # For logging
+ import base64
+ file_path_encoded = request.form.get('file_path_encoded')
+ if not file_path_encoded:
+ flash('Не указан файл для удаления.', 'error')
+ return redirect(request.referrer or url_for('admin_user_files', username=username))
+
+ try:
+ file_path = base64.urlsafe_b64decode(file_path_encoded.encode()).decode()
+ except Exception:
+ flash('Неверная ссылка на файл.', 'error')
+ return redirect(request.referrer or url_for('admin_user_files', username=username))
+
+ # Validate the path structure belongs to the specified user
+ if not file_path.startswith(f"cloud_files/{username}/"):
+ flash('Путь к файлу не соответствует пользователю.', 'error')
+ logging.warning(f"Admin '{admin_username}' attempted delete with mismatched path/user: {file_path} for {username}")
+ return redirect(request.referrer or url_for('admin_user_files', username=username))
+
data = load_data()
- if username not in data['users']:
- flash('Пользователь не найден!')
- return redirect(url_for('admin_panel'))
- user_files = data['users'][username].get('files', [])
- file_to_delete = next((f for f in user_files if f['unique_filename'] == unique_filename), None)
- if not file_to_delete:
- flash('Файл не найден!')
- return redirect(url_for('admin_user_files', username=username))
+ if username not in data.get('users', {}):
+ flash(f'Пользователь "{username}" не найден!', 'error')
+ return redirect(url_for('admin_panel'))
+
+ user_data = data['users'][username]
+
+ # Find the file in the data structure
+ path_parts = file_path.split('/')[2:]
+ unique_filename = path_parts[-1]
+ folder_path_list = path_parts[:-1]
+ target_folder_obj = navigate_to_path(user_data.get('root', initialize_user_root()), folder_path_list)
+
+ file_info_index = -1
+ original_filename = unique_filename
+ if target_folder_obj and 'files' in target_folder_obj:
+ for i, file_info in enumerate(target_folder_obj['files']):
+ if file_info.get('path') == file_path:
+ file_info_index = i
+ original_filename = file_info.get('original_filename', unique_filename)
+ break
+
+ # --- Deletion Logic ---
+ api = _get_hf_api()
+ if not api:
+ flash('Ошибка конфигурации сервера: не удается получить доступ к хранилищу.', 'error')
+ return redirect(request.referrer or url_for('admin_user_files', username=username, path='/'.join(folder_path_list)))
+
try:
- api = HfApi()
+ logging.info(f"Admin '{admin_username}' attempting to delete HF file: {file_path} for user '{username}'")
api.delete_file(
- path_in_repo=file_to_delete['path'],
+ path_in_repo=file_path,
repo_id=REPO_ID,
repo_type="dataset",
token=HF_TOKEN_WRITE,
- commit_message=f"Admin deleted file {file_to_delete['path']} for user {username}"
+ commit_message=f"Admin {admin_username} deleted file {original_filename} for user {username}"
)
- data['users'][username]['files'] = [f for f in user_files if f['unique_filename'] != unique_filename]
- save_data(data)
- flash('Файл успешно удален!')
- logging.info(f"Admin deleted file {unique_filename} for user {username}")
- except Exception as e:
- logging.error(f"Error deleting file {unique_filename} by admin: {e}")
- flash('Ошибка удаления файла!')
- return redirect(url_for('admin_user_files', username=username))
+ logging.info(f"Admin '{admin_username}' successfully deleted HF file: {file_path}")
+
+ # Remove from DB if found
+ if file_info_index != -1:
+ del target_folder_obj['files'][file_info_index]
+ save_data(data)
+ flash(f'Файл "{original_filename}" пользователя "{username}" успешно удален.', 'success')
+ logging.info(f"Admin '{admin_username}' successfully deleted file record: {file_path}")
+ else:
+ flash(f'Файл "{original_filename}" удален из хранилища, но не найден в базе данных пользователя "{username}".', 'warning')
+ logging.warning(f"Admin '{admin_username}' deleted file {file_path} from HF, but record not found in DB.")
-@app.route('/admhosto/delete_folder//', methods=['POST'])
-def admin_delete_folder(username, folder_id):
- data = load_data()
- if username not in data['users']:
- flash('Пользователь не найден!')
- return redirect(url_for('admin_panel'))
- user_folders = data['users'][username].get('folders', [])
- folder_to_delete = next((folder for folder in user_folders if folder['id'] == folder_id), None)
- if not folder_to_delete:
- flash('Папка не найдена!')
- return redirect(url_for('admin_user_files', username=username))
- try:
- api = HfApi()
- files_to_delete = [f for f in data['users'][username]['files'] if f['folder'].startswith(folder_to_delete['path'])]
- for file in files_to_delete:
- api.delete_file(
- path_in_repo=file['path'],
- repo_id=REPO_ID,
- repo_type="dataset",
- token=HF_TOKEN_WRITE,
- commit_message=f"Deleted file {file['path']} for {username} during folder deletion"
- )
- data['users'][username]['files'] = [f for f in data['users'][username]['files'] if not f['folder'].startswith(folder_to_delete['path'])]
- data['users'][username]['folders'] = [f for f in user_folders if f['id'] != folder_id]
- save_data(data)
- flash('Папка и все её содержимое успешно удалены!')
- logging.info(f"Admin deleted folder {folder_to_delete['name']} for user {username}")
except Exception as e:
- logging.error(f"Error deleting folder {folder_id} by admin: {e}")
- flash('Ошибка удаления папки!')
- return redirect(url_for('admin_user_files', username=username))
+ logging.error(f"Admin '{admin_username}' error deleting file '{file_path}' for user '{username}': {e}", exc_info=True)
+ if "404" in str(e) or "not found" in str(e).lower():
+ logging.warning(f"File {file_path} already deleted on HF (Admin action). Removing from local DB if exists.")
+ if file_info_index != -1:
+ del target_folder_obj['files'][file_info_index]
+ try:
+ save_data(data)
+ flash(f'Файл "{original_filename}" удален (был удален из хранилища).', 'warning')
+ except Exception as save_e:
+ flash('Ошибка при обновлении списка файлов после удаления.', 'error')
+ logging.error(f"Failed to save data after admin attempted local delete of file {file_path}: {save_e}")
+ else:
+ flash(f'Файл "{original_filename}" не найден.', 'error')
+ else:
+ flash(f'Ошибка при удалении файла "{original_filename}" пользователя "{username}". {e}', 'error')
+
+ # Redirect back to the user's file view in admin panel
+ return redirect(url_for('admin_user_files', username=username, path='/'.join(folder_path_list)))
+
+
+# --- App Initialization ---
+from datetime import timedelta
if __name__ == '__main__':
+ app.permanent_session_lifetime = timedelta(days=30) # Set session timeout
+
+ # Initial check/creation of data file and uploads dir
+ if not os.path.exists(DATA_FILE):
+ logging.info(f"{DATA_FILE} not found, attempting initial download or creation.")
+ # Try downloading first, it will create empty if download fails/no token
+ download_db_from_hf()
+ if not os.path.exists(DATA_FILE): # Still doesn't exist
+ with open(DATA_FILE, 'w', encoding='utf-8') as f:
+ json.dump({'users': {}}, f)
+ logging.info(f"Created empty {DATA_FILE}.")
+
+ os.makedirs('uploads', exist_ok=True)
+
+ # Token checks
if not HF_TOKEN_WRITE:
- logging.warning("HF_TOKEN (write access) is not set. File uploads and deletions will fail.")
+ logging.warning("!!! HF_TOKEN (write access) is not set. File uploads, deletions, and backups WILL FAIL.")
if not HF_TOKEN_READ:
- logging.warning("HF_TOKEN_READ is not set. Falling back to HF_TOKEN. File downloads might fail for private repos if HF_TOKEN is not set.")
+ 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.")
+
+ # Start periodic backup thread only if write token exists
if HF_TOKEN_WRITE:
- threading.Thread(target=periodic_backup, daemon=True).start()
+ backup_thread = threading.Thread(target=periodic_backup, daemon=True)
+ backup_thread.start()
else:
- logging.warning("Periodic backup disabled because HF_TOKEN (write access) is not set.")
- app.run(debug=False, host='0.0.0.0', port=7860)
\ No newline at end of file
+ logging.warning("Periodic backup thread NOT started because HF_TOKEN (write access) is not set.")
+
+ # Run Flask app
+ # Use Waitress or Gunicorn in production instead of Flask's built-in server
+ logging.info("Starting Flask application server...")
+ app.run(debug=False, host='0.0.0.0', port=7860)
+
+# --- END OF FILE app.py ---
\ No newline at end of file
- {{ folder['name'] }}
-
- {% endfor %}
- {% if not user_folders %}
- {{ folder['created_at'] }}
- -Папок пока нет.
- {% endif %} + +Файлы пользователя: {{ username }}
+ + {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} {% for category, message in messages %}{{ message }}
{% endfor %} {% endif %} {% endwith %}
+
+
+ {% for folder_name in sorted_folders %}
+
+
- {{ folder_name }}
+
+
+ {% endfor %}
+
+ {% for file in sorted_files %}
+
+ {# Admin cannot easily delete user folders from here without complex logic #}
+ {# Recommend deleting user entirely or managing via user's own dashboard #}
+ (Управление папками через панель пользователя)
+
+
+ {% set hf_file_url = get_hf_file_url(file.path) %}
+ {# Simplified preview logic for admin #}
+ {% if file.type == 'image' %} 
+ {% elif file.type == 'video' %}
+ {% elif file.type == 'pdf' %}
+ {% elif file.type == 'text' %}
+ {% else %} {% set ext = file.original_filename.split('.')[-1].lower() %} {% if ext in ['zip', 'rar', '7z'] %} {% else %} {% endif %} {% endif %}
+ {{ file.original_filename }}
+
+
-
+ {# Admin download uses the same download route, which has checks #}
+ Скачать
+ {# Admin delete file needs a separate route/logic #}
+
+
Файлы
-
- {% for file in user_files %}
-
- Назад к списку пользователей
+ {% endfor %}
+ {% if not sorted_folders and not sorted_files %}
- {% if file.get('type') == 'video' %}
-
- {% elif file.get('type') == 'image' %}
-
- {% elif file.get('type') == 'pdf' %}
-
- {% elif file.get('type') == 'txt' %}
- {% set content = get_text_file_content(file['path']) %}
-
- {% endfor %}
- {% if not user_files %}
- {{ content | b64decode | truncate(200) }}
- {% else %}
- {{ file.get('filename', 'N/A') }}
- {% endif %} -{{ file.get('upload_date', 'N/A') }}
- Скачать - -Файлов пока нет.
- {% endif %} -Папка пуста.
{% endif %}
-
-
-
-
-
-'''
- return render_template_string(html, username=username, user_files=user_files, user_folders=user_folders, repo_id=REPO_ID, current_folder=current_folder, parent_folder=parent_folder, os=os)
+ Назад к списку пользователей
+