Update app.py

app.py

@@ -297,13 +297,19 @@ body.dark .file-item {
     justify-content: center;
     align-items: center;
 }
-.modal img, .modal video, .modal iframe, .modal pre {
+.modal img, .modal video {
     max-width: 95%;
     max-height: 95%;
     object-fit: contain;
     border-radius: 20px;
     box-shadow: var(--shadow);
 }
+.modal iframe {
+    border: none;
+    width: 95%;
+    max-width: 100%;
+    height: 95%;
+}
 #progress-container {
     width: 100%;
     background: var(--glass-bg);
@@ -496,7 +502,7 @@ def dashboard():
             for file in files:
                 if file and file.filename:
                     original_filename = secure_filename(file.filename)
-                    unique_filename = f"{uuid.uuid4()}{os.path.splitext(original_filename)[1]}"
+                    unique_filename = f"{uuid.uuid4().hex}_{original_filename}"
                     temp_path = os.path.join('uploads', unique_filename)
                     file.save(temp_path)
                     temp_files.append((temp_path, unique_filename, original_filename))
@@ -516,7 +522,7 @@ def dashboard():
                     'filename': original_filename,
                     'unique_filename': unique_filename,
                     'path': file_path,
-                    'type': get_file_type(unique_filename),
+                    'type': get_file_type(original_filename),
                     'upload_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
                 }
                 data['users'][username]['files'].append(file_info)
@@ -562,6 +568,7 @@ def dashboard():
         <div class="file-grid">
             {% for file in user_files %}
                 <div class="file-item">
+                    <p style="font-size: 1.1em; font-weight: bold;">{{ file['filename'] }}</p>
                     {% 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)">
                             <source src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}" type="video/mp4">
@@ -569,15 +576,14 @@ def dashboard():
                     {% elif file['type'] == 'image' %}
                         <img class="file-preview" src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}" alt="{{ file['filename'] }}" loading="lazy" onclick="openModal(this.src, false)">
                     {% elif file['type'] == 'pdf' %}
-                        <iframe class="file-preview" src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}#toolbar=0" loading="lazy" onclick="openModal('https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}', 'pdf')"></iframe>
+                        <iframe class="file-preview" src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}" loading="lazy"></iframe>
                     {% elif file['type'] == 'text' %}
-                        <p class="file-preview" style="overflow: auto; white-space: pre-wrap;" onclick="openModal('https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}', 'text')">Text file</p>
+                        <textarea class="file-preview" readonly style="font-family: monospace; padding: 10px; border: 1px solid #ddd; border-radius: 5px; overflow: auto; width: 100%; height: 200px;">Предпросмотр текстовых файлов пока не поддерживается. Скачайте файл для просмотра.</textarea>
                     {% else %}
-                        <p>{{ file['filename'] }}</p>
+                        <p>Тип файла не поддерживается для предпросмотра</p>
                     {% endif %}
-                    <p>{{ file['filename'] }}</p>
                     <p>{{ file['upload_date'] }}</p>
-                    <a href="{{ url_for('download_file', file_path=file['path'], filename=file['filename']) }}" class="btn download-btn">Скачать</a>
+                    <a href="{{ url_for('download_file', file_path=file['path'], filename=file['unique_filename'], original_filename=file['filename']) }}" class="btn download-btn">Скачать</a>
                     <a href="{{ url_for('delete_file', file_path=file['path']) }}" class="btn delete-btn" onclick="return confirm('Вы уверены, что хотите удалить этот файл?');">Удалить</a>
                 </div>
             {% endfor %}
@@ -611,21 +617,11 @@ def dashboard():
         <div id="modalContent"></div>
     </div>
     <script>
-        async function openModal(src, type) {
+        function openModal(src, isVideo) {
             const modal = document.getElementById('mediaModal');
             const modalContent = document.getElementById('modalContent');
-            if (type === true) {
+            if (isVideo) {
                 modalContent.innerHTML = `<video controls autoplay><source src="${src}" type="video/mp4"></video>`;
-            } else if (type === 'pdf') {
-                modalContent.innerHTML = `<iframe src="${src}#toolbar=0" style="width: 95%; height: 95vh;"></iframe>`;
-            } else if (type === 'text') {
-                try {
-                    const response = await fetch(src);
-                    const text = await response.text();
-                    modalContent.innerHTML = `<pre style="white-space: pre-wrap; overflow: auto;">${text}</pre>`;
-                } catch (e) {
-                    modalContent.innerHTML = `<p>Ошибка загрузки текстового файла</p>`;
-                }
             } else {
                 modalContent.innerHTML = `<img src="${src}">`;
             }
@@ -707,8 +703,8 @@ def dashboard():
 '''
     return render_template_string(html, username=username, user_files=user_files, repo_id=REPO_ID)
 
-@app.route('/download/<path:file_path>/<filename>')
-def download_file(file_path, filename):
+@app.route('/download/<path:file_path>/<filename>/<original_filename>')
+def download_file(file_path, filename, original_filename):
     if 'username' not in session:
         flash('Пожалуйста, войдите в систему!')
         return redirect(url_for('login'))
@@ -741,7 +737,7 @@ def download_file(file_path, filename):
         return send_file(
             file_content,
             as_attachment=True,
-            download_name=filename,
+            download_name=original_filename,
             mimetype='application/octet-stream'
         )
     except requests.exceptions.RequestException as e:
@@ -883,6 +879,7 @@ def admin_user_files(username):
         <div class="file-grid">
             {% for file in user_files %}
                 <div class="file-item">
+                    <p style="font-size: 1.1em; font-weight: bold;">{{ file.get('filename', 'N/A') }}</p>
                     {% if file.get('type') == 'video' %}
                         <video class="file-preview" preload="metadata" muted loading="lazy" onclick="openModal('https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}?download=true', true)">
                              <source src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}?download=true" type="video/mp4">
@@ -890,15 +887,14 @@ def admin_user_files(username):
                     {% elif file.get('type') == 'image' %}
                         <img class="file-preview" src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}?download=true" alt="{{ file['filename'] }}" loading="lazy" onclick="openModal(this.src, false)">
                     {% elif file.get('type') == 'pdf' %}
-                        <iframe class="file-preview" src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}?download=true#toolbar=0" loading="lazy" onclick="openModal('https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}?download=true', 'pdf')"></iframe>
+                        <iframe class="file-preview" src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}" loading="lazy"></iframe>
                     {% elif file.get('type') == 'text' %}
-                        <p class="file-preview" style="overflow: auto; white-space: pre-wrap;" onclick="openModal('https://huggingface.co/datasets/{{ repo_id }}/resolve/main/{{ file['path'] }}?download=true', 'text')">Text file</p>
+                        <textarea class="file-preview" readonly style="font-family: monospace; padding: 10px; border: 1px solid #ddd; border-radius: 5px; overflow: auto; width: 100%; height: 200px;">Предпросмотр текстовых файлов пока не поддерживается. Скачайте файл для просмотра.</textarea>
                     {% else %}
-                        <p>{{ file.get('filename', 'N/A') }}</p>
+                        <p>Тип файла не поддерживается для предпросмотра</p>
                     {% endif %}
-                    <p>{{ file.get('filename', 'N/A') }}</p>
                     <p>{{ file.get('upload_date', 'N/A') }}</p>
-                    <a href="{{ url_for('download_file', file_path=file['path'], filename=file['filename']) }}" class="btn download-btn">Скачать</a>
+                    <a href="{{ url_for('download_file', file_path=file['path'], filename=file['unique_filename'], original_filename=file['filename']) }}" class="btn download-btn">Скачать</a>
                      <form method="POST" action="{{ url_for('admin_delete_file', username=username, file_path=file['path']) }}" style="display: inline; margin-left: 5px;" onsubmit="return confirm('Вы уверены, что хотите удалить этот файл?');">
                           <button type="submit" class="btn delete-btn" style="padding: 5px 10px; font-size: 0.9em;">Удалить</button>
                      </form>
@@ -914,29 +910,18 @@ def admin_user_files(username):
         <div id="modalContent"></div>
     </div>
      <script>
-        async function openModal(src, type) {
+        function openModal(src, isVideo) {
             const modal = document.getElementById('mediaModal');
             const modalContent = document.getElementById('modalContent');
             const tokenParam = HF_TOKEN_READ ? `?token=${HF_TOKEN_READ}` : "";
-            let finalSrc = src;
-            if (!finalSrc.includes('?download=true')) {
-                finalSrc = finalSrc.includes('?') ? finalSrc.replace('?', '?download=true&') : finalSrc + '?download=true';
-            }
-            finalSrc += tokenParam;
-            if (type === true) {
-                modalContent.innerHTML = `<video controls autoplay style='max-width: 95%; max-height: 95vh;'><source src="${finalSrc}" type="video/mp4"></video>`;
-            } else if (type === 'pdf') {
-                modalContent.innerHTML = `<iframe src="${finalSrc}#toolbar=0" style="width: 95%; height: 95vh;"></iframe>`;
-            } else if (type === 'text') {
-                try {
-                    const response = await fetch(finalSrc);
-                    const text = await response.text();
-                    modalContent.innerHTML = `<pre style="white-space: pre-wrap; overflow: auto;">${text}</pre>`;
-                } catch (e) {
-                    modalContent.innerHTML = `<p>Ошибка загрузки текстового файла</p>`;
-                }
-            } else {
-                modalContent.innerHTML = `<img src="${finalSrc}" style='max-width: 95%; max-height: 95vh;'>`;
+            const finalSrc = src + tokenParam;
+
+             if (isVideo) {
+                 const videoSrc = finalSrc.includes('?download=true') ? finalSrc : finalSrc.replace('?', '?download=true&');
+                 modalContent.innerHTML = `<video controls autoplay style='max-width: 95%; max-height: 95vh;'><source src="${videoSrc}" type="video/mp4"></video>`;
+             } else {
+                 const img_src = finalSrc.includes('?download=true') ? finalSrc : finalSrc.replace('?', '?download=true&');
+                 modalContent.innerHTML = `<img src="${img_src}" style='max-width: 95%; max-height: 95vh;'>`;
             }
             modal.style.display = 'flex';
         }