Update app.py

app.py

@@ -14,10 +14,11 @@ 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"
+MAX_STORAGE_GB = 500  # 500 ГБ для каждого пользователя
 
 cache = Cache(app, config={'CACHE_TYPE': 'simple'})
 logging.basicConfig(level=logging.INFO)
@@ -37,7 +38,6 @@ def load_data():
             # Обновляем структуру данных для существующих пользователей
             for token, user_data in data['users'].items():
                 if 'folders' not in user_data:
-                    # Если есть старые файлы, переносим их в root
                     files = user_data.get('files', [])
                     user_data['folders'] = {
                         'root': {
@@ -47,7 +47,10 @@ def load_data():
                         }
                     }
                     if 'files' in user_data:
-                        del user_data['files']  # Удаляем старый ключ files
+                        del user_data['files']
+                # Добавляем storage_used, если его нет
+                if 'storage_used' not in user_data:
+                    user_data['storage_used'] = 0  # В байтах
             logging.info("Данные успешно загружены")
             return data
     except Exception as e:
@@ -291,12 +294,14 @@ body.dark .folder-item {
     border-radius: 20px;
     box-shadow: var(--shadow);
 }
-.upload-progress {
+.upload-progress, .storage-indicator {
     width: 100%;
     margin: 20px 0;
+}
+.upload-progress {
     display: none;
 }
-.progress-bar-container {
+.progress-bar-container, .storage-bar-container {
     width: 100%;
     height: 20px;
     background: var(--glass-bg);
@@ -304,13 +309,13 @@ body.dark .folder-item {
     overflow: hidden;
     position: relative;
 }
-.progress-bar {
+.progress-bar, .storage-bar {
     height: 100%;
     width: 0%;
     background: linear-gradient(90deg, var(--primary), var(--accent));
     transition: width 0.3s ease;
 }
-.progress-text {
+.progress-text, .storage-text {
     position: absolute;
     width: 100%;
     text-align: center;
@@ -319,7 +324,7 @@ body.dark .folder-item {
     top: 50%;
     transform: translateY(-50%);
 }
-body.dark .progress-text {
+body.dark .progress-text, body.dark .storage-text {
     color: var(--text-dark);
 }
 @media (max-width: 768px) {
@@ -348,7 +353,8 @@ def register():
             data = load_data()
             data['users'][token] = {
                 'created_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-                'folders': {'root': {'name': 'root', 'files': [], 'subfolders': {}}}
+                'folders': {'root': {'name': 'root', 'files': [], 'subfolders': {}}},
+                'storage_used': 0  # В байтах
             }
             save_data(data)
             flash(f'Ваш токен: {token}. Сохраните его!')
@@ -381,12 +387,6 @@ 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>
 '''
@@ -431,14 +431,13 @@ def login():
         <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);
-            };
+        document.getElementById('login-form').onsubmit = (e) => {
+            const token = e.target.querySelector('input[name="token"]').value;
+            localStorage.setItem('token', token);
         };
+        // Автоматический переход, если токен есть
+        const token = localStorage.getItem('token');
+        if (token) window.location = '/dashboard';
     </script>
 </body>
 </html>
@@ -470,6 +469,11 @@ def dashboard(folder_path='root'):
         return redirect(url_for('login'))
     
     current_folder = get_folder(data, token, folder_path)
+    storage_used = data['users'][token]['storage_used']  # В байтах
+    max_storage_bytes = MAX_STORAGE_GB * 1024 * 1024 * 1024  # 500 ГБ в байтах
+    storage_percent = (storage_used / max_storage_bytes) * 100 if max_storage_bytes > 0 else 0
+    storage_used_gb = storage_used / (1024 * 1024 * 1024)
+    storage_remaining_gb = MAX_STORAGE_GB - storage_used_gb
 
     if request.method == 'POST':
         if 'create_folder' in request.form:
@@ -502,35 +506,42 @@ def dashboard(folder_path='root'):
         
         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)
+            total_size = sum(f.content_length for f in files if f)  # Размер в байтах
+            if storage_used + total_size > max_storage_bytes:
+                flash('Недостаточно места для загрузки файлов!')
+            else:
+                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)
+                        file_size = os.path.getsize(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'),
+                            'size': file_size  # Сохраняем размер файла
+                        }
+                        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)
         
         return redirect(url_for('dashboard', folder_path=folder_path))
 
@@ -549,6 +560,13 @@ def dashboard(folder_path='root'):
         <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">
+                <div class="storage-bar" style="width: {{ storage_percent }}%;"></div>
+                <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 %}
@@ -560,6 +578,13 @@ def dashboard(folder_path='root'):
         </form>
 
         <h2 style="margin-top: 20px;">Загрузить файлы</h2>
+        {% with messages = get_flashed_messages() %}
+            {% if messages %}
+                {% for message in messages %}
+                    <div class="flash">{{ message }}</div>
+                {% endfor %}
+            {% endif %}
+        {% endwith %}
         <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>
@@ -595,7 +620,7 @@ def dashboard(folder_path='root'):
                     {% else %}
                         <p><a href="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}" target="_blank">{{ file['filename'] }}</a></p>
                     {% endif %}
-                    <p>{{ file['upload_date'] }}</p>
+                    <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 }}">
@@ -667,16 +692,21 @@ def dashboard(folder_path='root'):
             };
             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, current_folder=current_folder, folder_path=folder_path, repo_id=REPO_ID)
+    return render_template_string(
+        html, 
+        token=token, 
+        current_folder=current_folder, 
+        folder_path=folder_path, 
+        repo_id=REPO_ID,
+        storage_used_gb=storage_used_gb,
+        storage_remaining_gb=storage_remaining_gb,
+        storage_percent=storage_percent,
+        MAX_STORAGE_GB=MAX_STORAGE_GB
+    )
 
 # Выход
 @app.route('/logout')