Update app.py

app.py

@@ -34,6 +34,7 @@ UPLOAD_FOLDER = 'uploads_tma'
 os.makedirs(UPLOAD_FOLDER, exist_ok=True)
 cache = Cache(app, config={'CACHE_TYPE': 'simple'})
 logging.basicConfig(level=logging.INFO)
+save_data_lock = threading.Lock()
 
 BASE_STYLE = '''
 :root {
@@ -42,7 +43,8 @@ BASE_STYLE = '''
     --text-dark: #e0e0e0; --text-muted: #888; --shadow: 0 10px 30px rgba(0, 0, 0, 0.2);
     --glass-bg: rgba(30, 30, 30, 0.7); --transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
     --delete-color: #ff4444; --folder-color: #ffc107; --selection-color: rgba(139, 92, 246, 0.3);
-    --note-color: #6a5acd; --share-color: #4caf50; --todolist-color: #20c997; --shoppinglist-color: #fd7e14;
+    --note-color: #6a5acd; --share-color: #4caf50; --archive-color: #78909c;
+    --todolist-color: #29b6f6; --shoppinglist-color: #ffa726;
 }
 @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
 * { margin: 0; padding: 0; box-sizing: border-box; }
@@ -67,6 +69,7 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .delete-btn { background: var(--delete-color); }
 .folder-btn { background: var(--folder-color); }
 .share-btn { background: var(--share-color); }
+.archive-btn { background: var(--archive-color); }
 .flash { text-align: center; margin-bottom: 15px; padding: 12px; border-radius: 10px; background: rgba(0, 221, 235, 0.1); color: var(--secondary); }
 .flash.error { background: rgba(255, 68, 68, 0.1); color: var(--delete-color); }
 .file-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 15px; }
@@ -86,7 +89,8 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .file-grid.list-view .item { flex-direction: row; align-items: center; text-align: left; padding: 8px; }
 .file-grid.list-view .item:hover { transform: translateY(0); }
 .file-grid.list-view .item-preview-wrapper { width: 45px; height: 45px; padding-top: 0; margin-bottom: 0; margin-right: 15px; flex-shrink: 0; }
-.file-grid.list-view .item.folder .item-preview, .file-grid.list-view .item.note .item-preview, .file-grid.list-view .item.todolist .item-preview, .file-grid.list-view .item.shoppinglist .item-preview { font-size: 1.8em; }
+.file-grid.list-view .item.folder .item-preview, .file-grid.list-view .item.note .item-preview,
+.file-grid.list-view .item.todolist .item-preview, .file-grid.list-view .item.shoppinglist .item-preview { font-size: 1.8em; }
 .file-grid.list-view .item-name-info { flex-grow: 1; }
 .modal { display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0, 0, 0, 0.85); z-index: 2000; justify-content: center; align-items: center; }
 .modal-content { display: flex; flex-direction: column; max-width: 95%; max-height: 95%; background: var(--card-bg-dark); padding: 10px; border-radius: 15px; overflow: hidden; position: relative; }
@@ -123,9 +127,23 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .shared-link-info strong { word-break: break-all; }
 .shared-link-info small { color: var(--text-muted); display: block; }
 .shared-link-actions button { background: none; border: none; color: var(--text-muted); font-size: 1.1em; cursor: pointer; padding: 5px; }
+.list-editor-item { display: flex; align-items: center; gap: 10px; padding: 8px; border-radius: 8px; }
+.list-editor-item:hover { background-color: #2a2a2a; }
+.list-editor-item input[type=checkbox] { width: 20px; height: 20px; flex-shrink: 0; }
+.list-editor-item input[type=text] { margin: 0; flex-grow: 1; }
+.list-editor-item .quantity-controls { display: flex; align-items: center; gap: 5px; }
+.list-editor-item .quantity-controls input { width: 50px; text-align: center; padding: 8px; margin: 0; }
+.list-editor-item .quantity-controls button { background: #333; border: none; color: white; border-radius: 50%; width: 28px; height: 28px; font-weight: bold; cursor: pointer; }
+.list-editor-item .delete-item-btn { background: none; border: none; color: var(--text-muted); cursor: pointer; font-size: 1.2em; }
+.list-editor-item.completed span { text-decoration: line-through; color: var(--text-muted); }
+.public-list-item { display: flex; align-items: center; gap: 15px; padding: 12px; border-bottom: 1px solid #333; }
+.public-list-item input[type=checkbox] { width: 22px; height: 22px; cursor: pointer; }
+.public-list-item label { flex-grow: 1; cursor: pointer; }
+.public-list-item.purchased label { text-decoration: line-through; color: var(--text-muted); }
+.public-list-item .quantity { font-weight: bold; color: var(--secondary); background: #2a2a2a; padding: 2px 8px; border-radius: 6px; }
 '''
 
-PUBLIC_FOLDER_PAGE_HTML = '''
+PUBLIC_SHARE_PAGE_HTML = '''
 <!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>Общая папка: {{ folder.name }}</title>
 <link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@@ -180,7 +198,7 @@ body { padding-bottom: 30px; }
 </div></body></html>
 '''
 
-PUBLIC_SHOPPING_LIST_PAGE_HTML = '''
+PUBLIC_SHOPPING_LIST_HTML = '''
 <!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>Список покупок: {{ list_data.title }}</title>
 <link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@@ -189,96 +207,85 @@ PUBLIC_SHOPPING_LIST_PAGE_HTML = '''
 <style>''' + BASE_STYLE + '''
 body { padding-bottom: 30px; }
 .public-header { padding: 15px; text-align: center; border-bottom: 1px solid #333; margin-bottom: 20px; }
-.shopping-list { list-style: none; padding: 0; }
-.shopping-item { display: flex; align-items: center; gap: 15px; background: var(--card-bg-dark); padding: 15px; border-radius: 12px; margin-bottom: 10px; transition: all 0.3s; }
-.shopping-item.purchased { opacity: 0.6; }
-.shopping-item.purchased .item-name { text-decoration: line-through; }
-.shopping-item input[type="checkbox"] { width: 22px; height: 22px; flex-shrink: 0; accent-color: var(--accent); }
-.item-details { flex-grow: 1; }
-.item-name { font-weight: 500; }
-.item-quantity { color: var(--text-muted); font-size: 0.9em; }
+.list-container { max-width: 700px; margin: 0 auto; background: var(--card-bg-dark); border-radius: 16px; padding: 10px; }
 </style></head><body>
 <div class="public-header">
     <h1>Список покупок</h1>
-    <h2>{{ list_data.title }}</h2>
+    <h2 id="list-title">{{ list_data.title }}</h2>
     <p style="color: var(--text-muted);">Автор: {{ user.first_name or user.telegram_username }}</p>
 </div>
 <div class="container" style="padding-top: 15px;">
-    <ul class="shopping-list" id="shopping-list">
+    <div class="list-container" id="shopping-list-container">
         <div class="loading-spinner"></div>
-    </ul>
+    </div>
 </div>
 <script>
-    const listId = '{{ link.id }}';
-    const listContainer = document.getElementById('shopping-list');
-    
+    const linkId = '{{ link.id }}';
+    const listContainer = document.getElementById('shopping-list-container');
+
     function renderList(items) {
         listContainer.innerHTML = '';
         if (!items || items.length === 0) {
-            listContainer.innerHTML = '<p>Список пуст.</p>';
+            listContainer.innerHTML = '<p style="text-align: center; padding: 20px;">Список пуст.</p>';
             return;
         }
         
         items.sort((a, b) => a.purchased - b.purchased);
 
         items.forEach(item => {
-            const li = document.createElement('li');
-            li.className = 'shopping-item';
+            const itemEl = document.createElement('div');
+            itemEl.className = 'public-list-item';
             if (item.purchased) {
-                li.classList.add('purchased');
+                itemEl.classList.add('purchased');
             }
-            li.innerHTML = `
-                <input type="checkbox" id="item-${item.id}" data-id="${item.id}" ${item.purchased ? 'checked' : ''}>
-                <div class="item-details">
-                    <label for="item-${item.id}" class="item-name">${item.name}</label>
-                    <div class="item-quantity">Количество: ${item.quantity}</div>
-                </div>
+            itemEl.innerHTML = `
+                <input type="checkbox" id="item-${item.id}" ${item.purchased ? 'checked' : ''} onchange="toggleItem('${item.id}')">
+                <label for="item-${item.id}">${item.name}</label>
+                <span class="quantity">${item.quantity}</span>
             `;
-            listContainer.appendChild(li);
+            listContainer.appendChild(itemEl);
         });
     }
 
     async function fetchList() {
         try {
-            const response = await fetch(`{{ url_for('get_shared_list_data', link_id=link.id) }}`);
-            if (!response.ok) throw new Error('Network response was not ok');
+            const response = await fetch(`{{ url_for('public_list_data', link_id=link.id) }}`);
+            if (!response.ok) {
+                listContainer.innerHTML = '<p>Ошибка загрузки списка.</p>';
+                return;
+            }
             const data = await response.json();
             if (data.status === 'success') {
-                renderList(data.items);
+                document.getElementById('list-title').textContent = data.list.title;
+                renderList(data.list.items);
             } else {
-                listContainer.innerHTML = `<p>Ошибка загрузки списка: ${data.message}</p>`;
+                 listContainer.innerHTML = `<p>${data.message || 'Ошибка.'}</p>`;
             }
-        } catch (error) {
-            console.error('Fetch error:', error);
-            listContainer.innerHTML = '<p>Не удалось обновить список. Проверьте соединение.</p>';
+        } catch (e) {
+            listContainer.innerHTML = '<p>Сетевая ошибка.</p>';
         }
     }
-    
-    async function updateItemStatus(itemId, isPurchased) {
+
+    async function toggleItem(itemId) {
         try {
-             await fetch(`{{ url_for('update_shared_item_status', link_id=link.id) }}`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ item_id: itemId, purchased: isPurchased })
+            const checkbox = document.getElementById(`item-${itemId}`);
+            if(checkbox) checkbox.disabled = true;
+            
+            await fetch(`{{ url_for('public_toggle_item', link_id=link.id, item_id='ITEM_ID') }}`.replace('ITEM_ID', itemId), {
+                method: 'POST'
             });
-            fetchList();
-        } catch (error) {
-            console.error('Update error:', error);
-            alert('Ошибка обновления статуса товара.');
+            await fetchList();
+        } catch (e) {
+            alert('Не удалось обновить элемент. Пожалуйста, обновите страницу.');
+        } finally {
+            const checkbox = document.getElementById(`item-${itemId}`);
+            if(checkbox) checkbox.disabled = false;
         }
     }
 
-    listContainer.addEventListener('change', (event) => {
-        if (event.target.type === 'checkbox') {
-            const itemId = event.target.dataset.id;
-            const isPurchased = event.target.checked;
-            updateItemStatus(itemId, isPurchased);
-        }
-    });
-
     document.addEventListener('DOMContentLoaded', () => {
         fetchList();
-        setInterval(fetchList, 5000);
+        setInterval(fetchList, 5000); 
     });
 </script>
 </body></html>
@@ -291,11 +298,11 @@ def find_node_by_id(filesystem, node_id):
     queue = [(filesystem, None)]
     while queue:
         current_node, parent = queue.pop(0)
-        if current_node.get('type') == 'folder' and 'children' in current_node:
+        if 'children' in current_node and isinstance(current_node['children'], list):
             for i, child in enumerate(current_node['children']):
-                if child.get('id') == node_id:
+                if isinstance(child, dict) and child.get('id') == node_id:
                     return child, current_node
-                if child.get('type') == 'folder':
+                if isinstance(child, dict) and child.get('type') == 'folder':
                     queue.append((child, current_node))
     return None, None
 
@@ -311,7 +318,7 @@ def add_node(filesystem, parent_id, node_data):
 def remove_node(filesystem, node_id):
     node_to_remove, parent_node = find_node_by_id(filesystem, node_id)
     if node_to_remove and parent_node and 'children' in parent_node:
-        parent_node['children'] = [child for child in parent_node['children'] if child.get('id') != node_id]
+        parent_node['children'] = [child for child in parent_node['children'] if not (isinstance(child, dict) and child.get('id') == node_id)]
         return True, node_to_remove
     return False, None
 
@@ -342,6 +349,18 @@ def get_all_folders(filesystem, exclude_ids=None):
     traverse(filesystem, "")
     return sorted(folders, key=lambda x: x['name'].lower())
 
+def get_all_archived_items(filesystem):
+    archived_items = []
+    def traverse(node):
+        if isinstance(node, dict):
+            if node.get('is_archived'):
+                archived_items.append(node)
+            if 'children' in node:
+                for child in node.get('children', []):
+                    traverse(child)
+    traverse(filesystem)
+    return archived_items
+
 def count_items_recursive(node):
     if not node or not isinstance(node, dict):
         return 0
@@ -354,7 +373,7 @@ def count_items_recursive(node):
     return count
 
 def initialize_user_filesystem_tma(user_data, tma_user_id_str):
-    if 'filesystem' not in user_data:
+    if 'filesystem' not in user_data or not isinstance(user_data['filesystem'], dict):
         user_data['filesystem'] = {"type": "folder", "id": "root", "name": "root", "children": []}
     if 'files' in user_data and isinstance(user_data['files'], list):
         for old_file in user_data['files']:
@@ -390,14 +409,15 @@ def load_data():
         return {'users': {}, 'shared_links': {}}
 
 def save_data(data):
-    try:
-        with open(DATA_FILE, 'w', encoding='utf-8') as file:
-            json.dump(data, file, ensure_ascii=False, indent=4)
-        upload_db_to_hf()
-        cache.clear()
-    except Exception as e:
-        logging.error(f"Error saving data: {e}")
-        raise
+    with save_data_lock:
+        try:
+            with open(DATA_FILE, 'w', encoding='utf-8') as file:
+                json.dump(data, file, ensure_ascii=False, indent=4)
+            upload_db_to_hf()
+            cache.clear()
+        except Exception as e:
+            logging.error(f"Error saving data: {e}")
+            raise
 
 def upload_db_to_hf():
     if not HF_TOKEN_WRITE: return
@@ -566,20 +586,11 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;800&display=swap" rel="stylesheet">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
 <script src="https://telegram.org/js/telegram-web-app.js"></script>
-<style>''' + BASE_STYLE + '''
-.list-editor-items { max-height: 40vh; overflow-y: auto; margin-bottom: 10px; }
-.list-editor-item { display: flex; align-items: center; gap: 10px; padding: 5px; border-radius: 8px; }
-.list-editor-item:hover { background: #333; }
-.list-editor-item input[type="text"] { margin: 0; flex-grow: 1; }
-.list-editor-item input[type="number"] { margin: 0; width: 60px; text-align: center; }
-.list-editor-item .quantity-controls button { padding: 5px 10px; font-size: 1em; background: #444; }
-.list-editor-item .delete-item-btn { color: var(--delete-color); background: none; border: none; font-size: 1.2em; cursor: pointer; }
-.list-editor-add-item-form { display: flex; gap: 10px; margin-top: 10px; }
-</style></head><body>
+<style>''' + BASE_STYLE + '''</style></head><body>
 <div class="app-header">
     <div class="user-info">{{ display_name }}</div>
     <div class="view-toggle">
-        <a href="{{ url_for('tma_archive') }}" style="text-decoration: none;"><button title="Архив"><i class="fa-solid fa-archive"></i></button></a>
+        <button id="archive-btn" title="Архив"><i class="fa-solid fa-box-archive"></i></button>
         <button id="reminders-btn" title="Напоминания"><i class="fa-solid fa-bell"></i></button>
         <button id="grid-view-btn" title="Сетка"><i class="fa fa-th-large"></i></button>
         <button id="list-view-btn" title="Список"><i class="fa fa-bars"></i></button>
@@ -605,11 +616,9 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             onclick="window.Telegram.WebApp.HapticFeedback.impactOccurred('light'); window.location.href='{{ url_for('tma_dashboard', folder_id=item.id) }}'"
         {% elif item.type == 'note' %}
             onclick="openNoteModal('{{ item.id }}')"
-        {% elif item.type == 'todolist' %}
-            onclick="openListModal('todolist', '{{ item.id }}')"
-        {% elif item.type == 'shoppinglist' %}
-            onclick="openListModal('shoppinglist', '{{ item.id }}')"
-        {% else %}
+        {% elif item.type in ['todolist', 'shoppinglist'] %}
+             onclick="openListEditorModal('{{ item.id }}', '{{ item.type }}')"
+        {% elif item.type == 'file' %}
             onclick="openModal('{{ hf_file_url_jinja(item.path) if item.file_type not in ['text', 'pdf'] else (url_for('get_text_content_tma', file_id=item.id) if item.file_type == 'text' else hf_file_url_jinja(item.path, True)) }}', '{{ item.file_type }}', '{{ item.id }}')"
         {% endif %}>
             <div class="item-preview-wrapper">
@@ -650,8 +659,8 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 
 <div id="selection-bar">
     <span id="selection-count"></span>
-    <button id="selection-archive-btn" class="btn" style="background: var(--todolist-color); display:none;" onclick="archiveSelected()"><i class="fa-solid fa-archive"></i></button>
     <button id="selection-share-btn" class="btn share-btn" onclick="openShareModal()" style="display:none;"><i class="fa-solid fa-share-alt"></i></button>
+    <button id="selection-archive-btn" class="btn archive-btn" onclick="archiveSelected()" style="display:none;"><i class="fa-solid fa-box-archive"></i></button>
     <button id="selection-download-btn" class="btn download-btn" onclick="downloadSingleSelected()" style="display:none;"><i class="fa-solid fa-download"></i></button>
     <button class="btn" style="background: var(--accent);" onclick="showMoveModal()"><i class="fa-solid fa-arrow-right-to-bracket"></i></button>
     <button class="btn delete-btn" onclick="deleteSelected()"><i class="fa-solid fa-trash-can"></i></button>
@@ -670,21 +679,11 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 <div class="modal" id="fab-modal"><div class="modal-content">
     <h4>Добавить в "{{ current_folder.name if current_folder_id != 'root' else 'Главная' }}"</h4>
     <div class="fab-options">
-        <label for="file-input" class="fab-option" id="fab-option-upload">
-            <i class="fa-solid fa-upload"></i><span>Файлы</span>
-        </label>
-        <div class="fab-option" id="fab-option-note" onclick="openNoteModal()">
-            <i class="fa-solid fa-note-sticky"></i><span>Заметку</span>
-        </div>
-        <div class="fab-option" id="fab-option-folder">
-            <i class="fa-solid fa-folder-plus"></i><span>Папку</span>
-        </div>
-        <div class="fab-option" id="fab-option-todolist" onclick="openListModal('todolist')">
-            <i class="fa-solid fa-list-check"></i><span>Список дел</span>
-        </div>
-        <div class="fab-option" id="fab-option-shoppinglist" onclick="openListModal('shoppinglist')">
-            <i class="fa-solid fa-cart-shopping"></i><span>Покупки</span>
-        </div>
+        <label for="file-input" class="fab-option" id="fab-option-upload"><i class="fa-solid fa-upload"></i><span>Файлы</span></label>
+        <div class="fab-option" id="fab-option-note" onclick="openNoteModal()"><i class="fa-solid fa-note-sticky"></i><span>Заметку</span></div>
+        <div class="fab-option" id="fab-option-folder"><i class="fa-solid fa-folder-plus"></i><span>Папку</span></div>
+        <div class="fab-option" id="fab-option-todolist" onclick="openListEditorModal(null, 'todolist')"><i class="fa-solid fa-list-check"></i><span>Список дел</span></div>
+        <div class="fab-option" id="fab-option-shoppinglist" onclick="openListEditorModal(null, 'shoppinglist')"><i class="fa-solid fa-cart-shopping"></i><span>Покупки</span></div>
     </div>
     <form id="upload-form" method="POST" enctype="multipart/form-data" action="{{ url_for('tma_dashboard') }}" style="display:none;">
         <input type="hidden" name="current_folder_id" value="{{ current_folder_id }}">
@@ -710,16 +709,19 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     </div>
 </div></div>
 
-<div class="modal" id="list-modal"><div class="modal-content" style="padding: 20px; max-width: 500px; width: 90%;">
-    <h4 id="list-modal-title">Новый список</h4>
-    <input type="hidden" id="list-id-input">
-    <input type="hidden" id="list-type-input">
-    <input type="text" id="list-title-input" placeholder="Название списка" style="font-size: 1.1em; margin-bottom: 10px;">
-    <div id="list-items-container" class="list-editor-items"></div>
-    <div id="list-add-item-form-container"></div>
-    <div style="display: flex; gap: 10px; margin-top: 15px;">
+<div class="modal" id="list-editor-modal"><div class="modal-content" style="padding: 20px; max-width: 500px; width: 90%;">
+    <h4 id="list-editor-title">Новый список</h4>
+    <input type="hidden" id="list-editor-id">
+    <input type="hidden" id="list-editor-type">
+    <input type="text" id="list-editor-title-input" placeholder="Название списка" style="font-size: 1.1em; margin-bottom: 10px;">
+    <div id="list-editor-items-container" style="max-height: 45vh; overflow-y: auto; margin-bottom: 10px;"></div>
+    <div style="display: flex; gap: 10px; margin-bottom: 15px;">
+        <input type="text" id="list-editor-new-item-text" placeholder="Новый элемент..." style="margin: 0;">
+        <button class="btn" onclick="addListItemToEditor()" style="padding: 14px 20px;">+</button>
+    </div>
+    <div style="display: flex; gap: 10px;">
         <button class="btn" style="background: var(--accent); flex-grow: 1;" onclick="saveList()">Сохранить</button>
-        <button class="btn" style="background: #555; flex-grow: 1;" onclick="closeListModal()">Отмена</button>
+        <button class="btn" style="background: #555; flex-grow: 1;" onclick="closeListEditorModal()">Отмена</button>
     </div>
 </div></div>
 
@@ -838,20 +840,17 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     }
     function updateSelectionUI() {
         selectionCount.textContent = `Выбрано: ${selectedItems.size}`;
-        if (selectedItems.size !== 1) {
-            selectionDownloadBtn.style.display = 'none';
-            selectionShareBtn.style.display = 'none';
-            selectionArchiveBtn.style.display = 'none';
-            return;
-        }
         const firstSelectedId = selectedItems.values().next().value;
         const itemElement = document.querySelector(`.item[data-id='${firstSelectedId}']`);
-        if (!itemElement) return;
-        const itemType = itemElement.dataset.type;
-        
-        selectionDownloadBtn.style.display = (itemType === 'file') ? 'inline-block' : 'none';
-        selectionShareBtn.style.display = (itemType === 'folder' || itemType === 'shoppinglist') ? 'inline-block' : 'none';
-        selectionArchiveBtn.style.display = (itemType === 'todolist' || itemType === 'shoppinglist') ? 'inline-block' : 'none';
+        const itemType = itemElement?.dataset.type;
+        const isSingleSelection = selectedItems.size === 1;
+
+        selectionDownloadBtn.style.display = (isSingleSelection && itemType === 'file') ? 'inline-block' : 'none';
+        selectionShareBtn.style.display = (isSingleSelection && (itemType === 'folder' || itemType === 'shoppinglist')) ? 'inline-block' : 'none';
+        selectionArchiveBtn.style.display = (selectedItems.size > 0 && Array.from(selectedItems).every(id => {
+            const el = document.querySelector(`.item[data-id='${id}']`);
+            return el && (el.dataset.type === 'todolist' || el.dataset.type === 'shoppinglist');
+        })) ? 'inline-block' : 'none';
     }
     allItems.forEach(item => {
         item.addEventListener('pointerdown', e => {
@@ -904,11 +903,15 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             if (ok) { haptic.impactOccurred('heavy'); performBatchAction('{{ url_for("batch_delete_tma") }}', { item_ids: Array.from(selectedItems) }); }
         });
     }
-    function archiveSelected() {
-        if (selectedItems.size !== 1) return;
-        const listId = selectedItems.values().next().value;
+     function archiveSelected() {
+        if (selectedItems.size === 0) return;
         haptic.impactOccurred('medium');
-        performBatchAction(`{{ url_for("archive_list_tma", list_id='__ID__') }}`.replace('__ID__', listId), {});
+        Telegram.WebApp.showConfirm(`Архивировать ${selectedItems.size} списк(ов)?`, ok => {
+            if(ok) {
+                haptic.impactOccurred('heavy');
+                performBatchAction('{{ url_for("batch_archive_tma") }}', { item_ids: Array.from(selectedItems) });
+            }
+        });
     }
     async function openNoteModal(noteId = null) {
         haptic.impactOccurred('light');
@@ -1013,8 +1016,9 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         const itemId = selectedItems.values().next().value;
         const itemElement = document.querySelector(`.item[data-id='${itemId}']`);
         const itemType = itemElement.dataset.type;
+        const title = itemType === 'folder' ? 'Поделиться папкой' : 'Поделиться списком покупок';
+        document.getElementById('share-modal-title').textContent = title;
         const listEl = document.getElementById('existing-links-list');
-        document.getElementById('share-modal-title').textContent = itemType === 'folder' ? 'Поделиться папкой' : 'Поделиться списком';
         listEl.innerHTML = '<div class="loading-spinner"></div>';
         document.getElementById('share-modal').style.display = 'flex';
         const response = await fetch(`{{ url_for('get_public_links', item_id='ITEM_ID') }}`.replace('ITEM_ID', itemId));
@@ -1042,7 +1046,8 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     }
     async function createShareLink() {
         const itemId = selectedItems.values().next().value;
-        const itemType = document.querySelector(`.item[data-id='${itemId}']`).dataset.type;
+        const itemElement = document.querySelector(`.item[data-id='${itemId}']`);
+        const itemType = itemElement.dataset.type;
         const name = document.getElementById('share-link-name').value;
         const duration_hours = document.getElementById('share-link-duration').value;
         const response = await fetch('{{ url_for("create_public_link") }}', {
@@ -1082,121 +1087,8 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             haptic.notificationOccurred('error');
         });
     }
-    function setupListModal(type, itemsContainer, addFormContainer) {
-        itemsContainer.innerHTML = '';
-        if (type === 'todolist') {
-            addFormContainer.innerHTML = `
-                <form onsubmit="addTodoItem(event)" class="list-editor-add-item-form">
-                    <input type="text" id="add-task-input" placeholder="Новая задача" required>
-                    <button type="submit" class="btn" style="padding: 10px 15px;">+</button>
-                </form>`;
-        } else if (type === 'shoppinglist') {
-            addFormContainer.innerHTML = `
-                <form onsubmit="addShoppingItem(event)" class="list-editor-add-item-form">
-                    <input type="text" id="add-shopping-name-input" placeholder="Название товара" required style="flex-grow:1;">
-                    <input type="number" id="add-shopping-qty-input" value="1" min="1" style="width: 70px;">
-                    <button type="submit" class="btn" style="padding: 10px 15px;">+</button>
-                </form>`;
-        }
-    }
-    function renderTodoItem(item) {
-        return `<div class="list-editor-item" data-id="${item.id}">
-                    <input type="checkbox" ${item.completed ? 'checked' : ''}>
-                    <input type="text" value="${item.text.replace(/"/g, '&quot;')}">
-                    <button class="delete-item-btn" onclick="this.parentElement.remove()">&times;</button>
-                </div>`;
-    }
-    function renderShoppingItem(item) {
-        return `<div class="list-editor-item" data-id="${item.id}">
-                    <input type="text" value="${item.name.replace(/"/g, '&quot;')}" class="shopping-item-name">
-                    <div class="quantity-controls" style="display:flex; align-items:center;">
-                        <button type="button" onclick="this.nextElementSibling.stepDown()">-</button>
-                        <input type="number" value="${item.quantity}" min="1" class="shopping-item-qty">
-                        <button type="button" onclick="this.previousElementSibling.stepUp()">+</button>
-                    </div>
-                    <button class="delete-item-btn" onclick="this.parentElement.remove()">&times;</button>
-                </div>`;
-    }
-    function addTodoItem(event) {
-        event.preventDefault();
-        const input = document.getElementById('add-task-input');
-        if (!input.value.trim()) return;
-        const newItem = { id: 'new_' + Date.now(), text: input.value.trim(), completed: false };
-        document.getElementById('list-items-container').insertAdjacentHTML('beforeend', renderTodoItem(newItem));
-        input.value = '';
-    }
-    function addShoppingItem(event) {
-        event.preventDefault();
-        const nameInput = document.getElementById('add-shopping-name-input');
-        const qtyInput = document.getElementById('add-shopping-qty-input');
-        if (!nameInput.value.trim()) return;
-        const newItem = { id: 'new_' + Date.now(), name: nameInput.value.trim(), quantity: parseInt(qtyInput.value) || 1, purchased: false };
-        document.getElementById('list-items-container').insertAdjacentHTML('beforeend', renderShoppingItem(newItem));
-        nameInput.value = '';
-        qtyInput.value = '1';
-    }
-    async function openListModal(type, listId = null) {
-        haptic.impactOccurred('light');
-        closeFabModal();
-        const modal = document.getElementById('list-modal');
-        const titleEl = document.getElementById('list-modal-title');
-        const idInput = document.getElementById('list-id-input');
-        const typeInput = document.getElementById('list-type-input');
-        const titleInput = document.getElementById('list-title-input');
-        const itemsContainer = document.getElementById('list-items-container');
-        const addFormContainer = document.getElementById('list-add-item-form-container');
-        
-        typeInput.value = type;
-        setupListModal(type, itemsContainer, addFormContainer);
-
-        if (listId) {
-            titleEl.textContent = type === 'todolist' ? 'Редактировать список дел' : 'Редактировать список покупок';
-            const response = await fetch(`{{ url_for('get_list_tma', list_id='__ID__') }}`.replace('__ID__', listId));
-            const data = await response.json();
-            if (data.status === 'success') {
-                idInput.value = data.list.id;
-                titleInput.value = data.list.title;
-                itemsContainer.innerHTML = '';
-                if (type === 'todolist') data.list.tasks.forEach(item => itemsContainer.insertAdjacentHTML('beforeend', renderTodoItem(item)));
-                if (type === 'shoppinglist') data.list.items.forEach(item => itemsContainer.insertAdjacentHTML('beforeend', renderShoppingItem(item)));
-            } else { Telegram.WebApp.showAlert('Ошибка загрузки списка.'); return; }
-        } else {
-            titleEl.textContent = type === 'todolist' ? 'Новый список дел' : 'Новый список покупок';
-            idInput.value = ''; titleInput.value = ''; itemsContainer.innerHTML = '';
-        }
-        modal.style.display = 'flex';
-    }
-    function closeListModal() { document.getElementById('list-modal').style.display = 'none'; }
-    async function saveList() {
-        const id = document.getElementById('list-id-input').value;
-        const type = document.getElementById('list-type-input').value;
-        const title = document.getElementById('list-title-input').value;
-        if (!title.trim()) { Telegram.WebApp.showAlert('Название не может быть пустым.'); return; }
-        
-        let payload = { list_id: id, type: type, title: title, parent_folder_id: '{{ current_folder_id }}' };
-        
-        if (type === 'todolist') {
-            payload.tasks = Array.from(document.querySelectorAll('#list-items-container .list-editor-item')).map(el => ({
-                id: el.dataset.id.startsWith('new_') ? null : el.dataset.id,
-                text: el.querySelector('input[type="text"]').value,
-                completed: el.querySelector('input[type="checkbox"]').checked
-            }));
-        } else if (type === 'shoppinglist') {
-            payload.items = Array.from(document.querySelectorAll('#list-items-container .list-editor-item')).map(el => ({
-                id: el.dataset.id.startsWith('new_') ? null : el.dataset.id,
-                name: el.querySelector('.shopping-item-name').value,
-                quantity: parseInt(el.querySelector('.shopping-item-qty').value) || 1
-            }));
-        }
-
-        const response = await fetch('{{ url_for("create_or_update_list_tma") }}', {
-            method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(payload)
-        });
-        const result = await response.json();
-        if (result.status === 'success') { haptic.notificationOccurred('success'); window.location.reload(); }
-        else { haptic.notificationOccurred('error'); Telegram.WebApp.showAlert(result.message || 'Ошибка сохранения.'); }
-    }
     document.getElementById('reminders-btn').addEventListener('click', openRemindersModal);
+    document.getElementById('archive-btn').addEventListener('click', () => { window.location.href = '{{ url_for("tma_archive_view") }}'; });
     const gridViewBtn = document.getElementById('grid-view-btn');
     const listViewBtn = document.getElementById('list-view-btn');
     const fileContainer = document.getElementById('file-container');
@@ -1230,12 +1122,111 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             backButton.onClick(() => { haptic.impactOccurred('light'); window.location.href = `{{ url_for('tma_dashboard') }}?folder_id=${parentFolderId}`; });
         } else { window.Telegram.WebApp.BackButton.hide(); }
     });
+    function closeListEditorModal() { document.getElementById('list-editor-modal').style.display = 'none'; }
+    async function openListEditorModal(listId = null, listType) {
+        haptic.impactOccurred('light');
+        closeFabModal();
+        const modal = document.getElementById('list-editor-modal');
+        const titleEl = document.getElementById('list-editor-title');
+        const idInput = document.getElementById('list-editor-id');
+        const typeInput = document.getElementById('list-editor-type');
+        const titleInput = document.getElementById('list-editor-title-input');
+        const itemsContainer = document.getElementById('list-editor-items-container');
+
+        typeInput.value = listType;
+        titleEl.textContent = listType === 'todolist' ? 'Список дел' : 'Список покупок';
+        titleInput.value = '';
+        itemsContainer.innerHTML = '';
+        idInput.value = '';
+
+        if (listId) {
+            idInput.value = listId;
+            const response = await fetch(`{{ url_for('get_list_tma', list_id='__ID__') }}`.replace('__ID__', listId));
+            const data = await response.json();
+            if (data.status === 'success') {
+                titleInput.value = data.list.title;
+                (data.list.items || []).forEach(item => addListItemToEditor(item));
+            } else {
+                Telegram.WebApp.showAlert('Ошибка загрузки списка');
+                return;
+            }
+        }
+        modal.style.display = 'flex';
+    }
+    function addListItemToEditor(item = null) {
+        const textInput = document.getElementById('list-editor-new-item-text');
+        const listType = document.getElementById('list-editor-type').value;
+        const text = item ? (item.name || item.text) : textInput.value.trim();
+        if (!text) return;
+        const itemId = item ? item.id : 'new_' + new Date().getTime();
+        const checked = item ? (item.completed || item.purchased) : false;
+        const quantity = item ? item.quantity : 1;
+        const itemsContainer = document.getElementById('list-editor-items-container');
+        const itemEl = document.createElement('div');
+        itemEl.className = 'list-editor-item';
+        itemEl.dataset.id = itemId;
+        let itemHTML = `
+            <input type="checkbox" ${checked ? 'checked' : ''}>
+            <input type="text" value="${text.replace(/"/g, '&quot;')}">
+        `;
+        if (listType === 'shoppinglist') {
+            itemHTML += `
+            <div class="quantity-controls">
+                <button type="button" onclick="changeQuantity(this, -1)">-</button>
+                <input type="number" value="${quantity || 1}" min="1" onchange="this.value = Math.max(1, parseInt(this.value) || 1)">
+                <button type="button" onclick="changeQuantity(this, 1)">+</button>
+            </div>
+            `;
+        }
+        itemHTML += `<button type="button" class="delete-item-btn" onclick="this.parentElement.remove()"><i class="fa-solid fa-times"></i></button>`;
+        itemEl.innerHTML = itemHTML;
+        itemsContainer.appendChild(itemEl);
+        if (!item) textInput.value = '';
+    }
+    function changeQuantity(btn, delta) {
+        const input = btn.parentElement.querySelector('input[type=number]');
+        let value = parseInt(input.value) || 1;
+        value += delta;
+        if (value < 1) value = 1;
+        input.value = value;
+    }
+    async function saveList() {
+        const id = document.getElementById('list-editor-id').value;
+        const type = document.getElementById('list-editor-type').value;
+        const title = document.getElementById('list-editor-title-input').value.trim();
+        if (!title) { Telegram.WebApp.showAlert('Название не может быть пустым.'); return; }
+        const items = [];
+        document.querySelectorAll('#list-editor-items-container .list-editor-item').forEach(el => {
+            const itemText = el.querySelector('input[type=text]').value.trim();
+            if (!itemText) return;
+            const item = {
+                id: el.dataset.id.startsWith('new_') ? null : el.dataset.id,
+                text: itemText,
+                name: itemText,
+                completed: el.querySelector('input[type=checkbox]').checked,
+                purchased: el.querySelector('input[type=checkbox]').checked
+            };
+            if (type === 'shoppinglist') {
+                item.quantity = parseInt(el.querySelector('input[type=number]').value) || 1;
+            }
+            items.push(item);
+        });
+        const payload = {
+            list_id: id, type: type, title: title, items: items, parent_folder_id: '{{ current_folder_id }}'
+        };
+        const response = await fetch('{{ url_for("create_or_update_list_tma") }}', {
+            method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(payload)
+        });
+        const result = await response.json();
+        if (result.status === 'success') { haptic.notificationOccurred('success'); window.location.reload(); }
+        else { haptic.notificationOccurred('error'); Telegram.WebApp.showAlert(result.message || 'Ошибка сохранения.'); }
+    }
 </script></body></html>
 '''
 
-TMA_ARCHIVE_PAGE_HTML = '''
+ARCHIVED_LISTS_HTML = '''
 <!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
-<title>Архив - Zeus Cloud</title>
+<title>Архив</title>
 <link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;800&display=swap" rel="stylesheet">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
@@ -1244,12 +1235,12 @@ TMA_ARCHIVE_PAGE_HTML = '''
 <div class="app-header">
     <div class="user-info">{{ display_name }}</div>
     <div class="view-toggle">
-        <a href="{{ url_for('tma_dashboard') }}" style="text-decoration: none;"><button title="Домой"><i class="fa-solid fa-home"></i></button></a>
+        <a href="{{ url_for('tma_dashboard') }}" style="color: var(--text-muted); font-size: 1.2em; padding: 5px;"><i class="fa-solid fa-arrow-left"></i></a>
     </div>
 </div>
-<div class="container" id="main-container">
+<div class="container">
 <h2>Архив</h2>
-<div class="file-grid list-view" id="file-container">
+<div class="file-grid list-view">
     {% for item in items %}
         <div class="item {{ item.type }}" data-id="{{ item.id }}" data-type="{{ item.type }}">
             <div class="item-preview-wrapper">
@@ -1257,13 +1248,12 @@ TMA_ARCHIVE_PAGE_HTML = '''
                 {% elif item.type == 'shoppinglist' %}<div class="item-preview"><i class="fa-solid fa-cart-shopping"></i></div>
                 {% endif %}
             </div>
-            <div class="item-name-info" style="flex-grow: 1;">
+            <div class="item-name-info">
                 <p class="item-name">{{ item.title }}</p>
-                <p class="item-info">Заархивировано: {{ item.modified_date }}</p>
-                <p class="item-info">Путь: {{ item.path_string }}</p>
+                <p class="item-info">Заархивировано</p>
             </div>
-            <button class="btn" onclick="unarchiveItem('{{ item.id }}')" title="Разархивировать" style="background:var(--secondary); padding: 8px 12px; margin-right: 5px;"><i class="fa-solid fa-box-open"></i></button>
-            <button class="btn delete-btn" onclick="deleteItem('{{ item.id }}')" title="Удалить" style="padding: 8px 12px;"><i class="fa-solid fa-trash"></i></button>
+            <button class="btn archive-btn" onclick="unarchiveItem('{{ item.id }}')" style="margin-left:auto; padding: 8px 12px; font-size: 0.8em;">Восстановить</button>
+            <button class="btn delete-btn" onclick="deleteItem('{{ item.id }}')" style="padding: 8px 12px; font-size: 0.8em;"><i class="fa-solid fa-trash"></i></button>
         </div>
     {% endfor %}
     {% if not items %}<p>Архив пуст.</p>{% endif %}
@@ -1271,71 +1261,31 @@ TMA_ARCHIVE_PAGE_HTML = '''
 </div>
 <script>
     window.Telegram.WebApp.ready();
-    window.Telegram.WebApp.expand();
     const haptic = window.Telegram.WebApp.HapticFeedback;
 
-    async function performAction(url, confirmMessage) {
-        Telegram.WebApp.showConfirm(confirmMessage, async (ok) => {
-            if (ok) {
-                haptic.impactOccurred('heavy');
-                try {
-                    const response = await fetch(url, { method: 'POST' });
-                    const result = await response.json();
-                    if (result.status === 'success') {
-                        haptic.notificationOccurred('success');
-                        window.location.reload();
-                    } else {
-                        haptic.notificationOccurred('error');
-                        Telegram.WebApp.showAlert(result.message || 'Произошла ошибка.');
-                    }
-                } catch (error) {
-                    haptic.notificationOccurred('error');
-                    Telegram.WebApp.showAlert('Сетевая ошибка.');
-                }
-            }
-        });
+    async function performAction(url, body) {
+         try {
+            const response = await fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
+            const result = await response.json();
+            if (result.status === 'success') { haptic.notificationOccurred('success'); window.location.reload(); }
+            else { haptic.notificationOccurred('error'); Telegram.WebApp.showAlert(result.message || 'Произошла ошибка.'); }
+        } catch (error) { haptic.notificationOccurred('error'); Telegram.WebApp.showAlert('Сетевая ошибка.'); }
     }
-
+    
     function unarchiveItem(itemId) {
-        const url = `{{ url_for("archive_list_tma", list_id='__ID__') }}`.replace('__ID__', itemId) + '?unarchive=true';
-        performAction(url, 'Разархивировать этот список?');
+        haptic.impactOccurred('medium');
+        performAction('{{ url_for("batch_unarchive_tma") }}', { item_ids: [itemId] });
     }
 
     function deleteItem(itemId) {
-        const url = `{{ url_for("batch_delete_tma") }}`;
-        Telegram.WebApp.showConfirm('Вы уверены, что хотите удалить этот список навсегда?', async (ok) => {
+        haptic.impactOccurred('medium');
+        Telegram.WebApp.showConfirm('Удалить этот список навсегда?', ok => {
             if (ok) {
                 haptic.impactOccurred('heavy');
-                 try {
-                    const response = await fetch(url, { 
-                        method: 'POST', 
-                        headers: { 'Content-Type': 'application/json' },
-                        body: JSON.stringify({ item_ids: [itemId] })
-                    });
-                    const result = await response.json();
-                    if (result.status === 'success') {
-                        haptic.notificationOccurred('success');
-                        window.location.reload();
-                    } else {
-                        haptic.notificationOccurred('error');
-                        Telegram.WebApp.showAlert(result.message || 'Произошла ошибка.');
-                    }
-                } catch (error) {
-                    haptic.notificationOccurred('error');
-                    Telegram.WebApp.showAlert('Сетевая ошибка.');
-                }
+                performAction('{{ url_for("batch_delete_tma") }}', { item_ids: [itemId] });
             }
         });
     }
-
-    document.addEventListener('DOMContentLoaded', () => {
-        let backButton = window.Telegram.WebApp.BackButton;
-        backButton.show();
-        backButton.onClick(() => {
-            haptic.impactOccurred('light');
-            window.location.href = `{{ url_for('tma_dashboard') }}`;
-        });
-    });
 </script>
 </body></html>
 '''
@@ -1362,10 +1312,10 @@ def tma_dashboard():
         current_folder, parent_folder = find_node_by_id(user_data['filesystem'], 'root')
 
     parent_folder_id = parent_folder.get('id', 'root') if parent_folder else 'root'
-    
-    items_in_folder = [item for item in current_folder.get('children', []) if not item.get('archived')]
-    items_in_folder = sorted(items_in_folder, key=lambda x: (x['type'] not in ['folder', 'note'], x.get('name', x.get('original_filename', x.get('title', ''))).lower()))
 
+    items_in_folder = [item for item in current_folder.get('children', []) if not item.get('is_archived')]
+    items_in_folder = sorted(items_in_folder, key=lambda x: (x['type'] not in ['folder', 'note', 'todolist', 'shoppinglist'], x.get('name', x.get('original_filename', x.get('title', ''))).lower()))
+    
     if request.method == 'POST':
         if not HF_TOKEN_WRITE:
              flash('Загрузка невозможна: токен для записи не настроен.', 'error')
@@ -1420,27 +1370,18 @@ def tma_dashboard():
     return render_template_string(TMA_DASHBOARD_HTML_TEMPLATE, display_name=display_name, items=items_in_folder, current_folder_id=current_folder_id, current_folder=current_folder, parent_folder_id=parent_folder_id, breadcrumbs=breadcrumbs, hf_file_url_jinja=lambda path, download=False: f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(path)}{'?download=true' if download else ''}", is_tma_user_admin_flag=is_admin_tma(), all_folders_for_move=all_folders_for_move)
 
 @app.route('/tma_archive')
-def tma_archive():
+def tma_archive_view():
     if 'telegram_user_id' not in session: return redirect(url_for('tma_entry_page'))
     tma_user_id = session['telegram_user_id']
     display_name = session.get('telegram_display_name', 'Пользователь')
     data = load_data()
     user_data = data['users'].get(tma_user_id)
     if not user_data: return redirect(url_for('tma_entry_page'))
-
-    archived_items = []
-    def find_archived(node):
-        if node.get('type') == 'folder':
-            for child in node.get('children', []):
-                if child.get('archived'):
-                    child['path_string'] = get_node_path_string(user_data['filesystem'], node.get('id'))
-                    archived_items.append(child)
-                if child.get('type') == 'folder':
-                    find_archived(child)
-    find_archived(user_data.get('filesystem'))
     
+    archived_items = get_all_archived_items(user_data.get('filesystem'))
     sorted_items = sorted(archived_items, key=lambda x: x.get('modified_date', ''), reverse=True)
-    return render_template_string(TMA_ARCHIVE_PAGE_HTML, display_name=display_name, items=sorted_items)
+
+    return render_template_string(ARCHIVED_LISTS_HTML, display_name=display_name, items=sorted_items)
 
 @app.route('/create_folder_tma', methods=['POST'])
 def create_folder_tma():
@@ -1589,23 +1530,22 @@ def batch_delete_tma():
         if not node:
             errors.append(f"Элемент {item_id} не найден.")
             continue
-        item_type = node.get('type')
-        item_name = node.get('name') or node.get('title') or node.get('original_filename')
+        node_type = node.get('type')
+        node_name = node.get('name') or node.get('title') or node.get('original_filename', 'элемент')
+
+        if node_type == 'folder':
+            if node.get('children'): errors.append(f'Папка "{node_name}" не пуста.'); continue
         
-        if item_type == 'folder':
-            if node.get('children'): errors.append(f'Папка "{item_name}" не пуста.'); continue
-            if remove_node(user_data['filesystem'], item_id)[0]: success_count += 1
-            else: errors.append(f'Ошибка удаления папки "{item_name}".')
-        elif item_type in ['note', 'todolist', 'shoppinglist']:
-            if remove_node(user_data['filesystem'], item_id)[0]: success_count += 1
-            else: errors.append(f'Ошибка удаления "{item_name}".')
-        elif item_type == 'file':
-            try:
-                if node.get('path') and HF_TOKEN_WRITE: api.delete_file(path_in_repo=node['path'], repo_id=REPO_ID, repo_type="dataset", token=HF_TOKEN_WRITE)
-            except hf_utils.EntryNotFoundError: pass
-            except Exception as e: errors.append(f'Ошибка удаления "{item_name}" с сервера: {e}'); continue
+        # For all types that can be deleted
+        if node_type in ['folder', 'note', 'todolist', 'shoppinglist', 'file']:
+            if node_type == 'file':
+                try:
+                    if node.get('path') and HF_TOKEN_WRITE: api.delete_file(path_in_repo=node['path'], repo_id=REPO_ID, repo_type="dataset", token=HF_TOKEN_WRITE)
+                except hf_utils.EntryNotFoundError: pass
+                except Exception as e: errors.append(f'Ошибка удаления "{node_name}" с сервера: {e}'); continue
+            
             if remove_node(user_data['filesystem'], item_id)[0]: success_count += 1
-            else: errors.append(f'Ошибка удаления "{item_name}" из базы.')
+            else: errors.append(f'Ошибка удаления "{node_name}" из базы.')
 
     if success_count > 0:
         try: save_data(data)
@@ -1642,6 +1582,7 @@ def batch_move_tma():
         if item_id == destination_id: continue
         removed, node_to_move = remove_node(user_data['filesystem'], item_id)
         if removed and node_to_move:
+            node_to_move['is_archived'] = False
             if add_node(user_data['filesystem'], destination_id, node_to_move): moved_count += 1
             else: errors.append(f'Ошибка добавления {item_id} в новую папку.')
         else: errors.append(f'Не удалось извлечь {item_id}.')
@@ -1652,6 +1593,56 @@ def batch_move_tma():
     if errors: return jsonify({'status': 'error', 'message': f'Перемещено {moved_count}. Ошибки: ' + "; ".join(errors)})
     return jsonify({'status': 'success', 'message': f'Перемещено {moved_count} элемент(ов).'})
 
+@app.route('/batch_archive_tma', methods=['POST'])
+def batch_archive_tma():
+    if 'telegram_user_id' not in session: return jsonify({'status': 'error', 'message': 'Не авторизован.'}), 401
+    tma_user_id = session['telegram_user_id']
+    data = load_data()
+    user_data = data['users'].get(tma_user_id)
+    if not user_data: return jsonify({'status': 'error', 'message': 'Пользователь не найден.'}), 404
+    item_ids = request.json.get('item_ids', [])
+    if not item_ids: return jsonify({'status': 'error', 'message': 'Не выбраны элементы.'}), 400
+
+    archived_count = 0
+    for item_id in item_ids:
+        node, _ = find_node_by_id(user_data['filesystem'], item_id)
+        if node and node.get('type') in ['todolist', 'shoppinglist']:
+            node['is_archived'] = True
+            archived_count += 1
+    
+    if archived_count > 0:
+        try:
+            save_data(data)
+            return jsonify({'status': 'success', 'message': f'Архивировано {archived_count} списк(ов).'})
+        except Exception as e:
+            return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
+    return jsonify({'status': 'error', 'message': 'Не найдено списков для архивации.'})
+
+@app.route('/batch_unarchive_tma', methods=['POST'])
+def batch_unarchive_tma():
+    if 'telegram_user_id' not in session: return jsonify({'status': 'error', 'message': 'Не авторизован.'}), 401
+    tma_user_id = session['telegram_user_id']
+    data = load_data()
+    user_data = data['users'].get(tma_user_id)
+    if not user_data: return jsonify({'status': 'error', 'message': 'Пользователь не найден.'}), 404
+    item_ids = request.json.get('item_ids', [])
+    if not item_ids: return jsonify({'status': 'error', 'message': 'Не выбраны элементы.'}), 400
+
+    unarchived_count = 0
+    for item_id in item_ids:
+        node, _ = find_node_by_id(user_data['filesystem'], item_id)
+        if node and node.get('is_archived'):
+            node['is_archived'] = False
+            unarchived_count += 1
+    
+    if unarchived_count > 0:
+        try:
+            save_data(data)
+            return jsonify({'status': 'success', 'message': f'Восстановлено {unarchived_count} списк(ов).'})
+        except Exception as e:
+            return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
+    return jsonify({'status': 'error', 'message': 'Не найдено списков для восстановления.'})
+
 @app.route('/get_text_content_tma/<file_id>')
 def get_text_content_tma(file_id):
     file_node = get_item_node_for_user(file_id)
@@ -1732,76 +1723,41 @@ def create_or_update_list_tma():
     data = load_data()
     user_data = data['users'].get(tma_user_id)
     if not user_data: return jsonify({'status': 'error', 'message': 'User not found'}), 404
-    
+
     payload = request.json
     list_id = payload.get('list_id')
     list_type = payload.get('type')
     title = payload.get('title', '').strip()
+    items = payload.get('items', [])
     parent_folder_id = payload.get('parent_folder_id', 'root')
     now_str = datetime.now().strftime('%Y-%m-%d %H:%M')
 
-    if not title or list_type not in ['todolist', 'shoppinglist']:
-        return jsonify({'status': 'error', 'message': 'Invalid data provided.'}), 400
+    if not title: return jsonify({'status': 'error', 'message': 'Title cannot be empty.'}), 400
+    if list_type not in ['todolist', 'shoppinglist']: return jsonify({'status': 'error', 'message': 'Invalid list type.'}), 400
+
+    for item in items:
+        if not item.get('id'): item['id'] = uuid.uuid4().hex
 
     if list_id:
         node, _ = find_node_by_id(user_data['filesystem'], list_id)
-        if not node or node.get('type') != list_type:
-            return jsonify({'status': 'error', 'message': 'List not found'}), 404
+        if not node or node.get('type') != list_type: return jsonify({'status': 'error', 'message': 'List not found'}), 404
         node['title'] = title
+        node['items'] = items
         node['modified_date'] = now_str
-        if list_type == 'todolist':
-            node['tasks'] = payload.get('tasks', [])
-            for task in node['tasks']:
-                if not task.get('id'): task['id'] = uuid.uuid4().hex
-        elif list_type == 'shoppinglist':
-            existing_items = {item['id']: item for item in node.get('items', [])}
-            new_items_data = payload.get('items', [])
-            updated_items = []
-            for item_data in new_items_data:
-                item_id = item_data.get('id')
-                if item_id and item_id in existing_items:
-                    existing_items[item_id].update(item_data)
-                    updated_items.append(existing_items[item_id])
-                else:
-                    item_data['id'] = uuid.uuid4().hex
-                    item_data['purchased'] = False
-                    updated_items.append(item_data)
-            node['items'] = updated_items
-
     else:
         new_list_id = uuid.uuid4().hex
         list_data = {
-            'type': list_type, 'id': new_list_id, 'title': title, 'archived': False,
-            'created_date': now_str, 'modified_date': now_str
+            'type': list_type, 'id': new_list_id, 'title': title, 'items': items,
+            'created_date': now_str, 'modified_date': now_str, 'is_archived': False
         }
-        if list_type == 'todolist':
-            list_data['tasks'] = payload.get('tasks', [])
-            for task in list_data['tasks']: task['id'] = uuid.uuid4().hex
-        elif list_type == 'shoppinglist':
-            list_data['items'] = payload.get('items', [])
-            for item in list_data['items']: 
-                item['id'] = uuid.uuid4().hex
-                item['purchased'] = False
-        
         if not add_node(user_data['filesystem'], parent_folder_id, list_data):
             return jsonify({'status': 'error', 'message': 'Parent folder not found'}), 404
     
-    try: save_data(data); return jsonify({'status': 'success', 'message': 'List saved.'})
-    except Exception as e: return jsonify({'status': 'error', 'message': f'Failed to save data: {e}'}), 500
-
-@app.route('/archive_list_tma/<list_id>', methods=['POST'])
-def archive_list_tma(list_id):
-    if 'telegram_user_id' not in session: return jsonify({'status': 'error', 'message': 'Unauthorized'}), 401
-    list_node = get_item_node_for_user(list_id)
-    if not list_node or list_node.get('type') not in ['todolist', 'shoppinglist']:
-        return jsonify({'status': 'error', 'message': 'List not found'}), 404
-    
-    unarchive = request.args.get('unarchive', 'false').lower() == 'true'
-    list_node['archived'] = not unarchive
-    list_node['modified_date'] = datetime.now().strftime('%Y-%m-%d %H:%M')
-
-    try: save_data(load_data()); return jsonify({'status': 'success'})
-    except Exception as e: return jsonify({'status': 'error', 'message': f'Failed to save: {e}'}), 500
+    try:
+        save_data(data)
+        return jsonify({'status': 'success', 'message': 'List saved.'})
+    except Exception as e:
+        return jsonify({'status': 'error', 'message': f'Failed to save data: {e}'}), 500
 
 @app.route('/get_reminders_tma')
 def get_reminders_tma():
@@ -1891,10 +1847,12 @@ def create_public_link():
         return jsonify({'status': 'error', 'message': 'Элемент не найден или не может быть опубликован.'}), 404
         
     now = datetime.now(pytz.utc)
-    expires_at_iso = None
+    expires_at = None
     if duration_hours > 0:
         expires_at = now + timedelta(hours=duration_hours)
         expires_at_iso = expires_at.isoformat()
+    else:
+        expires_at_iso = None
 
     link_id = uuid.uuid4().hex
     link_data = {
@@ -1906,10 +1864,7 @@ def create_public_link():
     
     try:
         save_data(data)
-        if item_type == 'folder':
-            public_url = url_for('shared_folder_view', link_id=link_id, _external=True)
-        else: # shoppinglist
-            public_url = url_for('shared_list_view', link_id=link_id, _external=True)
+        public_url = url_for('shared_item_view', link_id=link_id, _external=True)
         return jsonify({'status': 'success', 'url': public_url})
     except Exception as e:
         return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
@@ -1957,21 +1912,46 @@ def get_public_links(item_id):
     for link_id in link_ids:
         link_data = data['shared_links'].get(link_id)
         if link_data:
-            if link_data.get('item_type') == 'folder':
-                link_data['url'] = url_for('shared_folder_view', link_id=link_id, _external=True)
-            else:
-                link_data['url'] = url_for('shared_list_view', link_id=link_id, _external=True)
+            link_data['url'] = url_for('shared_item_view', link_id=link_id, _external=True)
             links_details.append(link_data)
             
     return jsonify({'status': 'success', 'links': links_details})
 
 @app.route('/shared/<link_id>')
-@app.route('/shared/<link_id>/<subfolder_id>')
+def shared_item_view(link_id):
+    data = load_data()
+    link_data = data.get('shared_links', {}).get(link_id)
+    if not link_data: return "Ссылка недействительна.", 404
+    
+    if link_data.get('expires_at'):
+        expires_at = datetime.fromisoformat(link_data['expires_at'])
+        if datetime.now(pytz.utc) > expires_at:
+            return "Срок действия ссылки истек.", 410
+
+    user_id = link_data['user_id']
+    user_data = data['users'].get(user_id)
+    if not user_data: return "Владелец не найден.", 404
+
+    item_id = link_data['item_id']
+    item_node, _ = find_node_by_id(user_data['filesystem'], item_id)
+    
+    if not item_node: return "Элемент не найден.", 404
+
+    if link_data['item_type'] == 'folder':
+        return redirect(url_for('shared_folder_view', link_id=link_id))
+    elif link_data['item_type'] == 'shoppinglist':
+        return render_template_string(PUBLIC_SHOPPING_LIST_HTML, list_data=item_node, user=user_data, link=link_data)
+    else:
+        return "Неподдерживаемый тип элемента для обмена.", 400
+
+
+@app.route('/shared/<link_id>/folder')
+@app.route('/shared/<link_id>/folder/<subfolder_id>')
 def shared_folder_view(link_id, subfolder_id=None):
     data = load_data()
     link_data = data['shared_links'].get(link_id)
 
-    if not link_data or link_data.get('item_type') != 'folder': return "Ссылка недействительна.", 404
+    if not link_data or link_data['item_type'] != 'folder': return "Ссылка недействительна.", 404
     
     if link_data.get('expires_at'):
         expires_at = datetime.fromisoformat(link_data['expires_at'])
@@ -1990,93 +1970,79 @@ def shared_folder_view(link_id, subfolder_id=None):
         
     items_in_folder = sorted(folder_node.get('children', []), key=lambda x: (x['type'] != 'folder', x.get('name', x.get('original_filename', x.get('title', ''))).lower()))
 
-    return render_template_string(PUBLIC_FOLDER_PAGE_HTML, folder=folder_node, items=items_in_folder, user=user_data, link=link_data, hf_file_url_jinja=lambda path, download=False: f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(path)}{'?download=true' if download else ''}")
+    return render_template_string(PUBLIC_SHARE_PAGE_HTML, folder=folder_node, items=items_in_folder, user=user_data, link=link_data, hf_file_url_jinja=lambda path, download=False: f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(path)}{'?download=true' if download else ''}")
 
-@app.route('/shared_list/<link_id>')
-def shared_list_view(link_id):
+@app.route('/public_download/<link_id>/<item_id>')
+def public_download_via_link(link_id, item_id):
     data = load_data()
     link_data = data['shared_links'].get(link_id)
-    if not link_data or link_data.get('item_type') != 'shoppinglist': return "Ссылка недействительна.", 404
+    if not link_data: return Response("Ссылка недействительна.", status=404)
+
     if link_data.get('expires_at'):
         expires_at = datetime.fromisoformat(link_data['expires_at'])
-        if datetime.now(pytz.utc) > expires_at: return "Срок действия ссылки истек.", 410
-    
+        if datetime.now(pytz.utc) > expires_at:
+            return Response("Срок действия ссылки истек.", status=410)
+
     user_id = link_data['user_id']
     user_data = data['users'].get(user_id)
-    if not user_data: return "Владелец не найден.", 404
-    
-    list_node, _ = find_node_by_id(user_data['filesystem'], link_data['item_id'])
-    if not list_node or list_node.get('type') != 'shoppinglist': return "Список не найден.", 404
+    if not user_data: return Response("Владелец не найден.", status=404)
+        
+    item_node, _ = find_node_by_id(user_data['filesystem'], item_id)
+    if not item_node: return Response("Элемент не найден.", status=404)
 
-    return render_template_string(PUBLIC_SHOPPING_LIST_PAGE_HTML, list_data=list_node, user=user_data, link=link_data)
+    token = uuid.uuid4().hex
+    cache.set(f"download_token_{token}", item_node, timeout=300)
+    return redirect(url_for('public_download', token=token))
 
-@app.route('/get_shared_list_data/<link_id>')
-def get_shared_list_data(link_id):
+@app.route('/api/public_list_data/<link_id>')
+def public_list_data(link_id):
     data = load_data()
-    link_data = data['shared_links'].get(link_id)
-    if not link_data or link_data.get('item_type') != 'shoppinglist': return jsonify({'status':'error', 'message':'Ссылка недействительна'}), 404
+    link_data = data.get('shared_links', {}).get(link_id)
+    if not link_data: return jsonify({'status': 'error', 'message': 'Ссылка не найдена.'}), 404
+    if link_data.get('expires_at') and datetime.now(pytz.utc) > datetime.fromisoformat(link_data['expires_at']):
+        return jsonify({'status': 'error', 'message': 'Срок действия ссылки истек.'}), 410
+    
     user_id = link_data['user_id']
     user_data = data['users'].get(user_id)
-    if not user_data: return jsonify({'status':'error', 'message':'Владелец не найден'}), 404
+    if not user_data: return jsonify({'status': 'error', 'message': 'Владелец не найден.'}), 404
+        
     list_node, _ = find_node_by_id(user_data['filesystem'], link_data['item_id'])
-    if not list_node: return jsonify({'status':'error', 'message':'Список не найден'}), 404
-    
-    return jsonify({'status': 'success', 'items': list_node.get('items', [])})
+    if not list_node: return jsonify({'status': 'error', 'message': 'Список не найден.'}), 404
+        
+    return jsonify({'status': 'success', 'list': list_node})
 
-@app.route('/update_shared_item_status/<link_id>', methods=['POST'])
-def update_shared_item_status(link_id):
+@app.route('/api/public_toggle_item/<link_id>/<item_id>', methods=['POST'])
+def public_toggle_item(link_id, item_id):
     data = load_data()
-    link_data = data['shared_links'].get(link_id)
-    if not link_data or link_data.get('item_type') != 'shoppinglist': return jsonify({'status': 'error', 'message': 'Ссылка недействительна'}), 404
-    
+    link_data = data.get('shared_links', {}).get(link_id)
+    if not link_data: return jsonify({'status': 'error', 'message': 'Ссылка не найдена.'}), 404
+    if link_data.get('expires_at') and datetime.now(pytz.utc) > datetime.fromisoformat(link_data['expires_at']):
+        return jsonify({'status': 'error', 'message': 'Срок действия ссылки истек.'}), 410
+
     user_id = link_data['user_id']
     user_data = data['users'].get(user_id)
-    if not user_data: return jsonify({'status': 'error', 'message': 'Владелец не найден'}), 404
-    
-    list_node, _ = find_node_by_id(user_data['filesystem'], link_data['item_id'])
-    if not list_node: return jsonify({'status': 'error', 'message': 'Список не найден'}), 404
+    if not user_data: return jsonify({'status': 'error', 'message': 'Владелец не найден.'}), 404
 
-    payload = request.json
-    item_id_to_update = payload.get('item_id')
-    purchased_status = payload.get('purchased')
+    list_node, _ = find_node_by_id(user_data['filesystem'], link_data['item_id'])
+    if not list_node: return jsonify({'status': 'error', 'message': 'Список не найден.'}), 404
     
     item_found = False
     for item in list_node.get('items', []):
-        if item.get('id') == item_id_to_update:
-            item['purchased'] = purchased_status
+        if item.get('id') == item_id:
+            item['purchased'] = not item.get('purchased', False)
             item_found = True
             break
-            
+    
     if item_found:
+        list_node['modified_date'] = datetime.now().strftime('%Y-%m-%d %H:%M')
         try:
             save_data(data)
             return jsonify({'status': 'success'})
         except Exception as e:
             return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
     else:
-        return jsonify({'status': 'error', 'message': 'Элемент не найден в списке'}), 404
+        return jsonify({'status': 'error', 'message': 'Элемент в списке не найден.'}), 404
 
-@app.route('/public_download/<link_id>/<item_id>')
-def public_download_via_link(link_id, item_id):
-    data = load_data()
-    link_data = data['shared_links'].get(link_id)
-    if not link_data: return Response("Ссылка недействительна.", status=404)
-
-    if link_data.get('expires_at'):
-        expires_at = datetime.fromisoformat(link_data['expires_at'])
-        if datetime.now(pytz.utc) > expires_at:
-            return Response("Срок действия ссылки истек.", status=410)
-
-    user_id = link_data['user_id']
-    user_data = data['users'].get(user_id)
-    if not user_data: return Response("Владелец не найден.", status=404)
-        
-    item_node, _ = find_node_by_id(user_data['filesystem'], item_id)
-    if not item_node: return Response("Элемент не найден.", status=404)
-
-    token = uuid.uuid4().hex
-    cache.set(f"download_token_{token}", item_node, timeout=300)
-    return redirect(url_for('public_download', token=token))
 
 ADMIN_LOGIN_HTML = '''
 <!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>Admin Login</title>
@@ -2196,8 +2162,9 @@ ADMIN_USER_FILES_HTML = '''
         <div class="item {{ item.type }}" data-id="{{ item.id }}" data-type="{{ item.type }}">
             <div class="item-preview-wrapper" 
                 {% if item.type == 'folder' %} onclick="window.location.href='{{ url_for('admin_user_files', tma_user_id_str=user_id, folder_id=item.id) }}'"
-                {% elif item.type in ['note', 'todolist', 'shoppinglist'] %} onclick="openModal(null, '{{item.type}}', '{{ item.id }}')"
+                {% elif item.type in ['note', 'todolist', 'shoppinglist'] %} onclick="openModal(null, '{{ item.type }}', '{{ item.id }}')"
                 {% else %} onclick="openModal('{{ hf_file_url_jinja(item.path) if item.file_type not in ['text', 'pdf'] else (url_for('admin_get_text_content', tma_user_id_str=user_id, file_id=item.id) if item.file_type == 'text' else hf_file_url_jinja(item.path, True)) }}', '{{ item.file_type }}', '{{ item.id }}')" {% endif %}>
+            
             {% if item.type == 'folder' %}<div class="item-preview"><i class="fa-solid fa-folder"></i></div>
             {% elif item.type == 'note' %}<div class="item-preview"><i class="fa-solid fa-note-sticky"></i></div>
             {% elif item.type == 'todolist' %}<div class="item-preview"><i class="fa-solid fa-list-check"></i></div>
@@ -2265,12 +2232,19 @@ ADMIN_USER_FILES_HTML = '''
                 const response = await fetch(`{{ url_for('admin_get_item', tma_user_id_str=user_id, item_id='__ID__') }}`.replace('__ID__', itemId));
                 const data = await response.json();
                 if(data.status === 'success') {
-                    let contentHTML = `<div style="padding:15px; text-align:left;"><h3>${data.item.title.replace(/</g,"&lt;")}</h3><hr style="border-color:#333; margin:10px 0;">`;
-                    if (type === 'note') contentHTML += `<pre>${data.item.content.replace(/</g,"&lt;")}</pre>`;
-                    if (type === 'todolist') contentHTML += `<ul>${data.item.tasks.map(t => `<li><input type='checkbox' ${t.completed ? 'checked' : ''} disabled> ${t.text}</li>`).join('')}</ul>`;
-                    if (type === 'shoppinglist') contentHTML += `<ul>${data.item.items.map(i => `<li><input type='checkbox' ${i.purchased ? 'checked' : ''} disabled> ${i.name} (x${i.quantity})</li>`).join('')}</ul>`;
-                    contentHTML += `</div>`;
-                    modalContent.innerHTML = contentHTML;
+                    let contentHTML = `<h3>${data.item.title.replace(/</g,"&lt;")}</h3><hr style="border-color:#333; margin:10px 0;">`;
+                    if (type === 'note') {
+                        contentHTML += `<pre>${data.item.content.replace(/</g,"&lt;")}</pre>`;
+                    } else {
+                        contentHTML += '<ul>';
+                        data.item.items.forEach(subItem => {
+                           let text = subItem.text || subItem.name;
+                           let checked = subItem.completed || subItem.purchased;
+                           contentHTML += `<li style="${checked ? 'text-decoration:line-through; color:var(--text-muted);' : ''}">${text} ${type === 'shoppinglist' ? `(${subItem.quantity})` : ''}</li>`;
+                        });
+                        contentHTML += '</ul>';
+                    }
+                    modalContent.innerHTML = `<div style="padding:15px; text-align:left;">${contentHTML}</div>`;
                 } else { throw new Error(data.message); }
             } else if (type === 'image') {
                 modalContent.innerHTML = `<img src="${srcOrUrl}">`;
@@ -2426,8 +2400,9 @@ def admin_user_files(tma_user_id_str):
         flash('Folder not found!', 'error')
         current_folder_id = 'root'
         current_folder, _ = find_node_by_id(user_data['filesystem'], 'root')
-
-    items_in_folder = sorted(current_folder.get('children', []), key=lambda x: (x['type'] not in ['folder', 'note'], x.get('name', x.get('original_filename', x.get('title', ''))).lower()))
+    
+    items_in_folder = [item for item in current_folder.get('children', []) if not item.get('is_archived')]
+    items_in_folder = sorted(items_in_folder, key=lambda x: (x['type'] not in ['folder', 'note', 'todolist', 'shoppinglist'], x.get('name', x.get('original_filename', x.get('title', ''))).lower()))
 
     breadcrumbs = []
     temp_id = current_folder_id
@@ -2505,7 +2480,8 @@ def admin_get_item(tma_user_id_str, item_id):
     user_data = data['users'].get(tma_user_id_str)
     if not user_data: return jsonify({'status': 'error', 'message': 'User not found'}), 404
     node, _ = find_node_by_id(user_data['filesystem'], item_id)
-    if not node: return jsonify({'status': 'error', 'message': 'Item not found'}), 404
+    if not node:
+        return jsonify({'status': 'error', 'message': 'Item not found'}), 404
     return jsonify({'status': 'success', 'item': node})
 
 @app.route('/admhosto/delete_item/<tma_user_id_str>/<item_id>', methods=['POST'])
@@ -2520,31 +2496,34 @@ def admin_delete_item(tma_user_id_str, item_id):
     node, _ = find_node_by_id(user_data['filesystem'], item_id)
     if not node:
         flash('Item not found.', 'error')
-    elif node.get('type') == 'file':
-        hf_path = node.get('path')
-        if not HF_TOKEN_WRITE: flash('Deletion not possible: write token not configured.', 'error')
-        else:
-            try:
-                api = HfApi()
-                if hf_path: api.delete_file(path_in_repo=hf_path, repo_id=REPO_ID, repo_type="dataset", token=HF_TOKEN_WRITE)
-                if remove_node(user_data['filesystem'], item_id)[0]:
-                    try: save_data(data); flash('File deleted.')
-                    except Exception: flash('File deleted from server, but DB update failed.', 'error')
-            except hf_utils.EntryNotFoundError:
-                if remove_node(user_data['filesystem'], item_id)[0]:
-                    try: save_data(data); flash('File not found on server, removed from DB.')
-                    except Exception: flash('DB save error (file not on server).', 'error')
-            except Exception as e: flash(f'Deletion error: {e}', 'error')
-    elif node.get('type') in ['note', 'todolist', 'shoppinglist']:
+    else:
+        node_type = node.get('type')
+        if node_type == 'file':
+            hf_path = node.get('path')
+            if not HF_TOKEN_WRITE: flash('Deletion not possible: write token not configured.', 'error')
+            else:
+                try:
+                    api = HfApi()
+                    if hf_path: api.delete_file(path_in_repo=hf_path, repo_id=REPO_ID, repo_type="dataset", token=HF_TOKEN_WRITE)
+                except hf_utils.EntryNotFoundError:
+                    pass # Already deleted from remote, just remove from DB
+                except Exception as e:
+                    flash(f'Deletion error from remote storage: {e}', 'error')
+                    return redirect(url_for('admin_user_files', tma_user_id_str=tma_user_id_str, folder_id=current_folder_id))
+        elif node_type == 'folder' and node.get('children'):
+            flash('Folder is not empty.', 'error')
+            return redirect(url_for('admin_user_files', tma_user_id_str=tma_user_id_str, folder_id=current_folder_id))
+        
+        # If we are here, we can delete the node from filesystem
         if remove_node(user_data['filesystem'], item_id)[0]:
-            try: save_data(data); flash(f'{node.get("type").capitalize()} deleted.')
-            except Exception: flash('DB update failed after item deletion.', 'error')
-    elif node.get('type') == 'folder':
-        if node.get('children'): flash('Folder is not empty.', 'error')
+            try:
+                save_data(data)
+                flash(f'{node_type.capitalize()} deleted.')
+            except Exception as e:
+                flash(f'DB update failed after deletion: {e}', 'error')
         else:
-            if remove_node(user_data['filesystem'], item_id)[0]:
-                try: save_data(data); flash('Folder deleted.')
-                except Exception: flash('DB update failed after folder deletion.', 'error')
+            flash('Failed to remove item from filesystem.', 'error')
+
     return redirect(url_for('admin_user_files', tma_user_id_str=tma_user_id_str, folder_id=current_folder_id))
 
 @app.route('/admhosto/user/<tma_user_id_str>/delete_reminder/<reminder_id>', methods=['POST'])
@@ -2587,3 +2566,4 @@ if __name__ == '__main__':
     threading.Thread(target=check_reminders, daemon=True).start()
     
     app.run(debug=False, host='0.0.0.0', port=7860)
+