Update app.py

app.py

@@ -450,8 +450,7 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         modal.style.display = 'flex';
 
         if (type !== 'folder' && itemId) {
-            const downloadUrl = `{{ url_for('download_tma', file_id='__FILE_ID__') }}`.replace('__FILE_ID__', itemId);
-            downloadBtn.onclick = () => { tmaDownloadFile(downloadUrl); };
+            downloadBtn.onclick = () => { initiateDownload(itemId); };
             downloadBtn.style.display = 'inline-block';
         } else {
             downloadBtn.style.display = 'none';
@@ -465,7 +464,7 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
                 const response = await fetch(srcOrUrl); if (!response.ok) throw new Error(`Ошибка: ${response.statusText}`);
                 const text = await response.text();
                 modalContent.innerHTML = `<pre>${text.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}</pre>`;
-            } else tmaDownloadFile(srcOrUrl);
+            } else initiateDownload(itemId);
         } catch (error) { modalContent.innerHTML = `<p>Ошибка предпросмотра: ${error.message}</p>`; }
     }
 
@@ -478,8 +477,23 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         document.getElementById('modal-download-btn').style.display = 'none';
     }
 
-    function tmaDownloadFile(downloadUrl) {
+    async function initiateDownload(fileId) {
         haptic.impactOccurred('medium');
+        try {
+            const response = await fetch(`{{ url_for('download_tma', file_id='__FILE_ID__') }}`.replace('__FILE_ID__', fileId));
+            const data = await response.json();
+            if (data.status === 'success' && data.url) {
+                tmaDownloadFile(data.url);
+                closeModalManual();
+            } else {
+                Telegram.WebApp.showAlert(data.message || 'Не удалось создать ссылку для скачивания.');
+            }
+        } catch (error) {
+            Telegram.WebApp.showAlert('Сетевая ошибка при создании ссылки для скачивания.');
+        }
+    }
+
+    function tmaDownloadFile(downloadUrl) {
         if (window.Telegram && window.Telegram.WebApp && Telegram.WebApp.openLink) { Telegram.WebApp.openLink(downloadUrl, {try_instant_view: false}); }
         else { window.open(downloadUrl, '_blank'); }
     }
@@ -569,8 +583,7 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     function downloadSingleSelected() {
         if (selectedItems.size !== 1) return;
         const fileId = selectedItems.values().next().value;
-        const url = `{{ url_for("download_tma", file_id='__FILE_ID__') }}`.replace('__FILE_ID__', fileId);
-        tmaDownloadFile(url);
+        initiateDownload(fileId);
         toggleSelectionMode(false);
     }
 
@@ -755,47 +768,45 @@ def get_file_node_for_admin(tma_user_id_str, file_id):
 def download_tma(file_id):
     file_node = get_file_node_for_user(file_id)
     if not file_node:
-        return Response("Файл не найден или доступ запрещен!", status=404)
+        return jsonify({'status': 'error', 'message': 'Файл не найден или доступ запрещен'}), 404
+
+    token = uuid.uuid4().hex
+    cache.set(f"download_token_{token}", file_node, timeout=60)
+    public_url = url_for('public_download', token=token, _external=True)
+    return jsonify({'status': 'success', 'url': public_url})
+
+@app.route('/public_download/<token>')
+def public_download(token):
+    file_node = cache.get(f"download_token_{token}")
+    cache.delete(f"download_token_{token}")
+    if not file_node:
+        return Response("Ссылка для скачивания недействительна или истекла.", status=404)
 
     hf_path = file_node.get('path')
     original_filename = file_node.get('original_filename', 'downloaded_file')
     if not hf_path:
         return Response("Ошибка: Путь к файлу не найден.", status=500)
 
-    file_url = f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(hf_path)}?download=true"
-    
     try:
-        req_headers = {}
-        if HF_TOKEN_READ:
-            req_headers["Authorization"] = f"Bearer {HF_TOKEN_READ}"
-        
-        r = requests.get(file_url, headers=req_headers, stream=True)
-        r.raise_for_status()
-
-        def generate():
-            for chunk in r.iter_content(chunk_size=8192):
-                yield chunk
-
-        response_headers = {
-            'Content-Disposition': f'attachment; filename="{quote(original_filename)}"',
-            'Content-Type': r.headers.get('content-type', 'application/octet-stream')
-        }
-        if 'content-length' in r.headers:
-            response_headers['Content-Length'] = r.headers['content-length']
-
-        return Response(generate(), headers=response_headers)
-    
-    except requests.exceptions.HTTPError as e:
-        logging.error(f"File not found on Hugging Face (HTTPError): {hf_path} - {e}")
-        if e.response.status_code == 404:
-            return Response("Файл не найден на удаленн��м хранилище.", status=404)
-        else:
-            return Response(f"Ошибка при доступе к файлу: {e}", status=e.response.status_code)
+        local_file_path = hf_hub_download(
+            repo_id=REPO_ID,
+            filename=hf_path,
+            repo_type="dataset",
+            token=HF_TOKEN_READ,
+            cache_dir=os.path.join(UPLOAD_FOLDER, 'hf_download_cache')
+        )
+        return send_file(
+            local_file_path,
+            as_attachment=True,
+            download_name=original_filename
+        )
+    except hf_utils.EntryNotFoundError:
+        logging.error(f"File not found on Hugging Face: {hf_path}")
+        return Response("Файл не найден на удаленном хранилище.", status=404)
     except Exception as e:
-        logging.error(f"Error streaming download for {file_id}: {e}")
+        logging.error(f"Error downloading with token {token} from HF: {e}")
         return Response(f'Ошибка скачивания файла: {e}', status=502)
 
-
 @app.route('/batch_download_tma')
 def batch_download_tma():
     if 'telegram_user_id' not in session: return Response("Unauthorized", 401)
@@ -1127,13 +1138,33 @@ ADMIN_USER_FILES_HTML = '''
         <span onclick="closeModalManual()" class="modal-close-btn">&times;</span>
         <div class="modal-main-content" id="modalContent"></div>
         <div class="modal-actions">
-            <a id="modal-download-btn" class="btn download-btn" style="display: none; width: 80%;">
+            <a id="modal-download-btn" class="btn download-btn" href="javascript:void(0);" style="display: none; width: 80%;">
                 <i class="fa-solid fa-download"></i> Download
             </a>
         </div>
     </div>
 </div>
 <script>
+    async function initiateDownload(fileId) {
+        const downloadBtn = document.getElementById('modal-download-btn');
+        const originalHTML = downloadBtn.innerHTML;
+        downloadBtn.innerHTML = '<div class="loading-spinner" style="width:20px; height:20px; border-width:2px;"></div>';
+        try {
+            const response = await fetch(`{{ url_for('admin_download_file', tma_user_id_str=user_id, file_id='__FILE_ID__') }}`.replace('__FILE_ID__', fileId));
+            const data = await response.json();
+            if (data.status === 'success' && data.url) {
+                window.open(data.url, '_blank');
+            } else {
+                alert(data.message || 'Failed to create download link.');
+            }
+        } catch (error) {
+            alert('Network error while creating download link.');
+        } finally {
+            downloadBtn.innerHTML = originalHTML;
+            closeModalManual();
+        }
+    }
+
     async function openModal(srcOrUrl, type, itemId) {
         if (!srcOrUrl) return;
         const modal = document.getElementById('mediaModal');
@@ -1143,8 +1174,7 @@ ADMIN_USER_FILES_HTML = '''
         modal.style.display = 'flex';
 
         if (type !== 'folder' && itemId) {
-            const downloadUrl = `{{ url_for('admin_download_file', tma_user_id_str=user_id, file_id='__FILE_ID__') }}`.replace('__FILE_ID__', itemId);
-            downloadBtn.href = downloadUrl;
+            downloadBtn.onclick = () => initiateDownload(itemId);
             downloadBtn.style.display = 'inline-block';
         } else {
             downloadBtn.style.display = 'none';
@@ -1158,7 +1188,7 @@ ADMIN_USER_FILES_HTML = '''
                 const response = await fetch(srcOrUrl); if (!response.ok) throw new Error(`Error: ${response.statusText}`);
                 const text = await response.text();
                 modalContent.innerHTML = `<pre>${text.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}</pre>`;
-            } else window.open(srcOrUrl, '_blank');
+            } else initiateDownload(itemId);
         } catch (error) { modalContent.innerHTML = `<p>Preview Error: ${error.message}</p>`; }
     }
     function closeModal(event) { if (event.target.id === 'mediaModal') closeModalManual(); }
@@ -1285,46 +1315,12 @@ def admin_user_files(tma_user_id_str):
 def admin_download_file(tma_user_id_str, file_id):
     file_node = get_file_node_for_admin(tma_user_id_str, file_id)
     if not file_node:
-        return Response("File not found or access denied!", status=404)
-
-    hf_path = file_node.get('path')
-    original_filename = file_node.get('original_filename', 'downloaded_file')
-    if not hf_path:
-        return Response("Error: File path not found.", status=500)
-
-    file_url = f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(hf_path)}?download=true"
-    
-    try:
-        req_headers = {}
-        if HF_TOKEN_READ:
-            req_headers["Authorization"] = f"Bearer {HF_TOKEN_READ}"
-        
-        r = requests.get(file_url, headers=req_headers, stream=True)
-        r.raise_for_status()
-
-        def generate():
-            for chunk in r.iter_content(chunk_size=8192):
-                yield chunk
-
-        response_headers = {
-            'Content-Disposition': f'attachment; filename="{quote(original_filename)}"',
-            'Content-Type': r.headers.get('content-type', 'application/octet-stream')
-        }
-        if 'content-length' in r.headers:
-            response_headers['Content-Length'] = r.headers['content-length']
-
-        return Response(generate(), headers=response_headers)
-
-    except requests.exceptions.HTTPError as e:
-        logging.error(f"Admin: File not found on Hugging Face (HTTPError): {hf_path} - {e}")
-        if e.response.status_code == 404:
-            return Response("File not found in remote storage.", status=404)
-        else:
-            return Response(f"Error accessing file: {e}", status=e.response.status_code)
-    except Exception as e:
-        logging.error(f"Admin: Error streaming download for {file_id}: {e}")
-        return Response(f'Error downloading file: {e}', status=502)
+        return jsonify({'status': 'error', 'message': 'File not found or access denied!'}), 404
 
+    token = uuid.uuid4().hex
+    cache.set(f"download_token_{token}", file_node, timeout=60)
+    public_url = url_for('public_download', token=token, _external=True)
+    return jsonify({'status': 'success', 'url': public_url})
 
 @app.route('/admhosto/text/<tma_user_id_str>/<file_id>')
 @admin_browser_login_required