Update app.py

app.py

@@ -10,6 +10,7 @@ import time
 from datetime import datetime, timedelta
 from huggingface_hub import HfApi, hf_hub_download, utils as hf_utils
 from werkzeug.utils import secure_filename
+from werkzeug.security import generate_password_hash, check_password_hash
 import requests
 from io import BytesIO
 import uuid
@@ -42,9 +43,9 @@ 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;
+    --note-color: #6a5acd; --share-color: #4caf50; --lock-color: #f48fb1;
 }
-@keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(3 ৩৬۰deg); } }
+@keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
 * { margin: 0; padding: 0; box-sizing: border-box; }
 html { scroll-behavior: smooth; }
 body { font-family: 'Inter', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; background: var(--background-dark); color: var(--text-dark); line-height: 1.6; -webkit-tap-highlight-color: transparent; }
@@ -78,7 +79,7 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .item-preview { position: absolute; top: 0; left: 0; width: 100%; height: 100%; object-fit: cover; }
 .item.folder .item-preview { object-fit: contain; font-size: 3.5em; color: var(--folder-color); }
 .item.note .item-preview { object-fit: contain; font-size: 3.5em; color: var(--note-color); }
-.item-name { font-size: 0.9em; font-weight: 500; word-break: break-all; margin: 5px 0; flex-grow: 1; }
+.item-name { font-size: 0.9em; font-weight: 500; word-break: break-all; margin: 5px 0; flex-grow: 1; display: flex; align-items: center; justify-content: center; gap: 5px; }
 .item-info { font-size: 0.75em; color: var(--text-muted); }
 .file-grid.list-view { display: flex; flex-direction: column; gap: 8px; }
 .file-grid.list-view .item { flex-direction: row; align-items: center; text-align: left; padding: 8px; }
@@ -86,6 +87,7 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .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 { font-size: 1.8em; }
 .file-grid.list-view .item-name-info { flex-grow: 1; }
+.file-grid.list-view .item-name { justify-content: flex-start; }
 .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; }
 .modal-main-content { flex-grow: 1; overflow-y: auto; }
@@ -96,10 +98,18 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .modal-close-btn { position: absolute; top: 15px; right: 25px; font-size: 30px; color: #aaa; cursor: pointer; background: rgba(0,0,0,0.5); border-radius: 50%; width: 30px; height: 30px; line-height: 30px; text-align: center; z-index: 2001;}
 #progress-container { width: 100%; background: #333; border-radius: 10px; margin: 15px 0; display: none; height: 10px; }
 #progress-bar { width: 0%; height: 100%; background: var(--primary); border-radius: 10px; transition: width 0.3s ease; }
-#selection-bar { position: fixed; bottom: -120px; left: 10px; right: 10px; background: var(--glass-bg); backdrop-filter: blur(10px); padding: 10px; border-radius: 15px; box-shadow: var(--shadow); z-index: 1000; display: flex; justify-content: space-around; align-items: center; transition: bottom 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); }
+#selection-bar { position: fixed; bottom: -120px; left: 10px; right: 10px; background: var(--glass-bg); backdrop-filter: blur(10px); padding: 8px; border-radius: 15px; box-shadow: var(--shadow); z-index: 1000; display: flex; justify-content: space-between; align-items: center; transition: bottom 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); }
 #selection-bar.visible { bottom: 10px; }
-#selection-bar .btn { margin: 0 5px; padding: 10px 15px; font-size: 0.9em; flex-grow: 1; }
-#move-modal .modal-content { padding: 20px; max-width: 400px; }
+#selection-bar .selection-info { font-weight: 500; font-size: 0.9em; margin-left: 10px; }
+#selection-bar .actions { display: flex; align-items: center; gap: 5px; }
+#selection-bar .btn-icon { background: none; border: none; color: var(--text-dark); font-size: 1.5em; cursor: pointer; padding: 8px; border-radius: 50%; width: 44px; height: 44px; display: flex; align-items: center; justify-content: center; transition: var(--transition); }
+#selection-bar .btn-icon:hover { background: rgba(255,255,255,0.1); }
+#selection-bar .btn-icon:disabled { color: #555; cursor: not-allowed; }
+#selection-more-menu { display: none; position: absolute; bottom: 65px; right: 0; background: var(--card-bg-dark); border-radius: 12px; box-shadow: var(--shadow); z-index: 1001; overflow: hidden; }
+#selection-more-menu button { display: block; width: 100%; padding: 12px 18px; background: none; border: none; color: var(--text-dark); text-align: left; font-size: 1em; cursor: pointer; }
+#selection-more-menu button:hover { background: #2a2a2a; }
+#selection-more-menu button i { margin-right: 10px; }
+#move-modal .modal-content, #rename-modal .modal-content, #lock-modal .modal-content, #unlock-modal .modal-content { padding: 20px; max-width: 400px; }
 .fab-container { position: fixed; bottom: 20px; right: 20px; z-index: 1050; }
 .fab { width: 56px; height: 56px; background: var(--accent); border-radius: 50%; border: none; box-shadow: var(--shadow); color: white; font-size: 24px; display: flex; justify-content: center; align-items: center; cursor: pointer; transition: transform 0.3s; }
 .fab:active { transform: scale(0.9); }
@@ -119,6 +129,7 @@ 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; }
+.lock-icon { font-size: 0.8em; color: var(--lock-color); }
 '''
 
 PUBLIC_SHARE_PAGE_HTML = '''
@@ -191,6 +202,17 @@ def find_node_by_id(filesystem, node_id):
                     queue.append((child, current_node))
     return None, None
 
+def get_node_path(filesystem, node_id):
+    path = []
+    curr_id = node_id
+    while curr_id:
+        node, parent = find_node_by_id(filesystem, curr_id)
+        if not node: return None
+        path.append(node)
+        if not parent or node.get('id') == 'root': break
+        curr_id = parent.get('id')
+    return path[::-1]
+
 def add_node(filesystem, parent_id, node_data):
     parent_node, _ = find_node_by_id(filesystem, parent_id)
     if parent_node and parent_node.get('type') == 'folder':
@@ -444,6 +466,7 @@ def auth_via_telegram():
              return jsonify({'status': 'error', 'message': 'Ошибка сохранения данных пользователя.'}), 500
 
         session['telegram_user_id'] = tma_user_id_str
+        session['unlocked_folders'] = []
         display_name = tg_user_data.get('first_name') or tg_user_data.get('username') or f"User {tma_user_id_str}"
         session['telegram_display_name'] = display_name
         return jsonify({'status': 'success', 'redirect_url': url_for('tma_dashboard')})
@@ -482,14 +505,7 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 <div id="progress-container"><div id="progress-bar"></div></div>
 <div class="file-grid" id="file-container">
     {% for item in items %}
-        <div class="item {{ item.type }}" data-id="{{ item.id }}" data-type="{{ item.type }}" 
-        {% if item.type == 'folder' %}
-            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 }}')"
-        {% else %}
-            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 {{ item.type }}" data-id="{{ item.id }}" data-type="{{ item.type }}" data-name="{{ item.name if item.type == 'folder' else item.original_filename if item.type == 'file' else item.title }}" data-is-locked="{{ 'true' if item.is_locked else 'false' }}">
             <div class="item-preview-wrapper">
             {% if item.type == 'folder' %}
                 <div class="item-preview"><i class="fa-solid fa-folder"></i></div>
@@ -505,7 +521,10 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             {% endif %}
             </div>
             <div class="item-name-info">
-                <p class="item-name">{{ (item.title if item.type == 'note' else item.name if item.type == 'folder' else item.original_filename) | truncate(30, True) }}</p>
+                <p class="item-name">
+                  {% if item.is_locked %}<i class="fa-solid fa-lock lock-icon"></i>{% endif %}
+                  <span>{{ (item.title if item.type == 'note' else item.name if item.type == 'folder' else item.original_filename) | truncate(30, True) }}</span>
+                </p>
                 {% if item.type == 'file' %}<p class="item-info">{{ item.upload_date }}</p>
                 {% elif item.type == 'note' %}<p class="item-info">{{ item.modified_date }}</p>{% endif %}
             </div>
@@ -527,12 +546,21 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 </div>
 
 <div id="selection-bar">
-    <span id="selection-count"></span>
-    <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-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>
-    <button class="btn" style="background: #555;" onclick="toggleSelectionMode(false)">Отмена</button>
+    <span id="selection-count" class="selection-info"></span>
+    <div class="actions">
+        <button id="selection-download-btn" class="btn-icon" title="Скачать"><i class="fa-solid fa-download"></i></button>
+        <button id="selection-share-btn" class="btn-icon" title="Поделиться"><i class="fa-solid fa-share-alt"></i></button>
+        <button id="selection-move-btn" class="btn-icon" title="Переместить"><i class="fa-solid fa-arrow-right-to-bracket"></i></button>
+        <button id="selection-delete-btn" class="btn-icon" title="Удалить"><i class="fa-solid fa-trash-can" style="color: var(--delete-color);"></i></button>
+        <div style="position: relative;">
+            <button id="selection-more-btn" class="btn-icon" title="Еще"><i class="fa-solid fa-ellipsis-vertical"></i></button>
+            <div id="selection-more-menu">
+                <button id="selection-rename-btn"><i class="fa-solid fa-i-cursor"></i> Переименовать</button>
+                <button id="selection-lock-btn"><i class="fa-solid fa-lock"></i> Заблокировать</button>
+            </div>
+        </div>
+        <button id="selection-cancel-btn" class="btn-icon" title="Отмена"><i class="fa-solid fa-xmark"></i></button>
+    </div>
 </div>
 
 <div class="modal" id="move-modal"><div class="modal-content">
@@ -544,6 +572,35 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     <button class="btn" style="background: #555; width: 100%;" onclick="closeMoveModal()">Отмена</button>
 </div></div>
 
+<div class="modal" id="rename-modal"><div class="modal-content">
+    <h4>Переименовать</h4>
+    <input type="hidden" id="rename-id-input">
+    <input type="text" id="rename-name-input" placeholder="Новое имя">
+    <button class="btn" style="background: var(--accent); width: 100%; margin-top: 10px;" onclick="submitRename()">Сохранить</button>
+    <button class="btn" style="background: #555; width: 100%;" onclick="document.getElementById('rename-modal').style.display = 'none'">Отмена</button>
+</div></div>
+
+<div class="modal" id="lock-modal"><div class="modal-content">
+    <h4>Заблокировать папку</h4>
+    <p>Эта папка и все ее подпапки станут недоступны без пароля.</p>
+    <input type="hidden" id="lock-id-input">
+    <input type="password" id="lock-password-input" placeholder="Новый пароль" autocomplete="new-password">
+    <input type="password" id="lock-password-confirm" placeholder="Подтвердите пароль">
+    <button class="btn" style="background: var(--lock-color); width: 100%; margin-top: 10px;" onclick="submitLock()">Заблокировать</button>
+    <button class="btn" style="background: #555; width: 100%;" onclick="document.getElementById('lock-modal').style.display = 'none'">Отмена</button>
+</div></div>
+
+<div class="modal" id="unlock-modal"><div class="modal-content">
+    <h4><i class="fa-solid fa-lock"></i> Папка заблокирована</h4>
+    <p>Введите пароль для доступа.</p>
+    <input type="hidden" id="unlock-id-input">
+    <input type="password" id="unlock-password-input" placeholder="Пароль">
+    <button class="btn" style="width: 100%; margin-top: 10px;" onclick="submitUnlock()">Разблокировать</button>
+    <button class="btn" style="background: #555; width: 100%;" onclick="document.getElementById('unlock-modal').style.display = 'none'">Отмена</button>
+</div></div>
+
+<div class="fab-container"><button id="fab" class="fab"><i class="fa-solid fa-plus"></i></button></div>
+
 <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">
@@ -607,12 +664,43 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     </div>
 </div></div>
 
-<div class="fab-container"><button id="fab" class="fab"><i class="fa-solid fa-plus"></i></button></div>
-
 <script>
     window.Telegram.WebApp.ready();
     window.Telegram.WebApp.expand();
     const haptic = window.Telegram.WebApp.HapticFeedback;
+
+    function handleItemClick(event, itemId, itemType, isLocked) {
+        if (selectionMode) {
+             toggleItemSelection(event, itemId);
+             return;
+        }
+        haptic.impactOccurred('light');
+        if (itemType === 'folder') {
+            if (isLocked) {
+                event.preventDefault();
+                event.stopPropagation();
+                openUnlockModal(itemId);
+            } else {
+                window.location.href = `{{ url_for('tma_dashboard', folder_id='__ID__') }}`.replace('__ID__', itemId);
+            }
+        } else if (itemType === 'note') {
+            openNoteModal(itemId);
+        } else {
+            const itemElement = document.querySelector(`.item[data-id='${itemId}']`);
+            const fileType = itemElement.dataset.type;
+            const hfPath = `{{ hf_file_url_jinja('__PATH__') }}`.replace('__PATH__', itemElement.dataset.path);
+            let url;
+            if (fileType === 'text') {
+                url = `{{ url_for('get_text_content_tma', file_id='__ID__') }}`.replace('__ID__', itemId);
+            } else if (fileType === 'pdf') {
+                url = `{{ hf_file_url_jinja('__PATH__', True) }}`.replace('__PATH__', itemElement.dataset.path);
+            } else {
+                 url = hfPath;
+            }
+            openModal(url, fileType, itemId);
+        }
+    }
+
     async function openModal(srcOrUrl, type, itemId) {
         if (!srcOrUrl) return;
         haptic.impactOccurred('light');
@@ -680,12 +768,11 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         xhr.addEventListener('error', () => { haptic.notificationOccurred('error'); Telegram.WebApp.showAlert('Ошибка загрузки.'); });
         xhr.open('POST', this.action, true); xhr.send(formData);
     });
+
     let selectionMode = false; const selectedItems = new Set(); let longPressTimer;
     const mainContainer = document.getElementById('main-container');
     const selectionBar = document.getElementById('selection-bar');
     const selectionCount = document.getElementById('selection-count');
-    const selectionDownloadBtn = document.getElementById('selection-download-btn');
-    const selectionShareBtn = document.getElementById('selection-share-btn');
     const allItems = document.querySelectorAll('.item');
     function toggleSelectionMode(enable) {
         selectionMode = enable;
@@ -695,33 +782,70 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     }
     function updateSelectionUI() {
         selectionCount.textContent = `Выбрано: ${selectedItems.size}`;
-        const firstSelectedId = selectedItems.values().next().value;
-        const itemElement = document.querySelector(`.item[data-id='${firstSelectedId}']`);
-        selectionDownloadBtn.style.display = (selectedItems.size === 1 && itemElement?.dataset.type === 'file') ? 'inline-block' : 'none';
-        selectionShareBtn.style.display = (selectedItems.size === 1 && itemElement?.dataset.type === 'folder') ? 'inline-block' : 'none';
+        const isSingleSelection = selectedItems.size === 1;
+        const firstId = isSingleSelection ? selectedItems.values().next().value : null;
+        const firstElement = isSingleSelection ? document.querySelector(`.item[data-id='${firstId}']`) : null;
+        const firstType = firstElement ? firstElement.dataset.type : null;
+
+        document.getElementById('selection-download-btn').style.display = (isSingleSelection && firstType === 'file') ? 'flex' : 'none';
+        document.getElementById('selection-share-btn').style.display = (isSingleSelection && firstType === 'folder') ? 'flex' : 'none';
+        document.getElementById('selection-move-btn').style.display = selectedItems.size > 0 ? 'flex' : 'none';
+        document.getElementById('selection-delete-btn').style.display = selectedItems.size > 0 ? 'flex' : 'none';
+
+        const moreBtn = document.getElementById('selection-more-btn');
+        const renameBtn = document.getElementById('selection-rename-btn');
+        const lockBtn = document.getElementById('selection-lock-btn');
+        
+        renameBtn.style.display = isSingleSelection ? 'block' : 'none';
+        lockBtn.style.display = (isSingleSelection && firstType === 'folder') ? 'block' : 'none';
+        
+        moreBtn.style.display = (renameBtn.style.display === 'block' || lockBtn.style.display === 'block') ? 'flex' : 'none';
     }
+    
     allItems.forEach(item => {
+        let touchstartX = 0; let touchstartY = 0; let touchendX = 0; let touchendY = 0;
         item.addEventListener('pointerdown', e => {
             if (e.pointerType === 'mouse' && e.button !== 0) return;
+            touchstartX = e.clientX; touchstartY = e.clientY;
             longPressTimer = setTimeout(() => {
                 if (!selectionMode) toggleSelectionMode(true);
-                item.classList.toggle('selected');
-                if (selectedItems.has(item.dataset.id)) selectedItems.delete(item.dataset.id); else selectedItems.add(item.dataset.id);
-                updateSelectionUI();
+                toggleItemSelection(e, item.dataset.id, true);
             }, 500);
         });
-        item.addEventListener('pointerup', () => clearTimeout(longPressTimer));
-        item.addEventListener('pointerleave', () => clearTimeout(longPressTimer));
-        item.addEventListener('click', e => {
-            if (selectionMode) {
-                haptic.impactOccurred('light'); e.preventDefault(); e.stopPropagation();
-                item.classList.toggle('selected');
-                if (selectedItems.has(item.dataset.id)) selectedItems.delete(item.dataset.id); else selectedItems.add(item.dataset.id);
-                updateSelectionUI();
-                if (selectedItems.size === 0) toggleSelectionMode(false);
+        item.addEventListener('pointerup', e => { 
+            clearTimeout(longPressTimer);
+            touchendX = e.clientX; touchendY = e.clientY;
+            const deltaX = Math.abs(touchendX - touchstartX);
+            const deltaY = Math.abs(touchendY - touchstartY);
+            if (deltaX < 10 && deltaY < 10) { // It's a click, not a swipe
+                 if (selectionMode) {
+                    toggleItemSelection(e, item.dataset.id, false);
+                 } else {
+                    handleItemClick(e, item.dataset.id, item.dataset.type, item.dataset.isLocked === 'true');
+                 }
             }
-        }, true);
+        });
+        item.addEventListener('pointerleave', () => clearTimeout(longPressTimer));
+        item.addEventListener('contextmenu', e => e.preventDefault());
     });
+    
+    function toggleItemSelection(event, itemId, fromLongPress = false) {
+        event.preventDefault();
+        event.stopPropagation();
+        haptic.impactOccurred('light');
+        const item = document.querySelector(`.item[data-id='${itemId}']`);
+        item.classList.toggle('selected');
+        if (selectedItems.has(itemId)) {
+            selectedItems.delete(itemId);
+        } else {
+            selectedItems.add(itemId);
+        }
+        updateSelectionUI();
+        if (selectedItems.size === 0) {
+            toggleSelectionMode(false);
+        }
+    }
+
     async function performBatchAction(url, body) {
         try {
             const response = await fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
@@ -731,26 +855,82 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         } catch (error) { haptic.notificationOccurred('error'); Telegram.WebApp.showAlert('Сетевая ошибка.'); }
         finally { toggleSelectionMode(false); }
     }
-    function downloadSingleSelected() {
-        if (selectedItems.size !== 1) return;
-        const fileId = selectedItems.values().next().value;
-        initiateDownload(fileId);
-        toggleSelectionMode(false);
-    }
-    function showMoveModal() { if (selectedItems.size > 0) { haptic.impactOccurred('light'); document.getElementById('move-modal').style.display = 'flex'; }}
+    document.getElementById('selection-download-btn').addEventListener('click', () => { if (selectedItems.size === 1) { initiateDownload(selectedItems.values().next().value); toggleSelectionMode(false); }});
+    document.getElementById('selection-share-btn').addEventListener('click', () => { if (selectedItems.size === 1) openShareModal(); });
+    document.getElementById('selection-move-btn').addEventListener('click', () => { if (selectedItems.size > 0) { haptic.impactOccurred('light'); document.getElementById('move-modal').style.display = 'flex'; }});
+    document.getElementById('selection-delete-btn').addEventListener('click', () => { if (selectedItems.size > 0) { haptic.impactOccurred('medium'); Telegram.WebApp.showConfirm(`Удалить ${selectedItems.size} элемент(ов)?`, ok => { if (ok) { haptic.impactOccurred('heavy'); performBatchAction('{{ url_for("batch_delete_tma") }}', { item_ids: Array.from(selectedItems) }); } }); } });
+    document.getElementById('selection-cancel-btn').addEventListener('click', () => toggleSelectionMode(false));
+    document.getElementById('selection-rename-btn').addEventListener('click', () => openRenameModal());
+    document.getElementById('selection-lock-btn').addEventListener('click', () => openLockModal());
+
+    const moreMenu = document.getElementById('selection-more-menu');
+    document.getElementById('selection-more-btn').addEventListener('click', (e) => {
+        e.stopPropagation(); moreMenu.style.display = moreMenu.style.display === 'block' ? 'none' : 'block';
+    });
+    document.addEventListener('click', (e) => { if (moreMenu.style.display === 'block') moreMenu.style.display = 'none'; });
+
     function closeMoveModal() { document.getElementById('move-modal').style.display = 'none'; }
     function moveSelected() {
         const destinationId = document.getElementById('folder-destination-select').value;
         performBatchAction('{{ url_for("batch_move_tma") }}', { item_ids: Array.from(selectedItems), destination_id: destinationId });
         closeMoveModal();
     }
-    function deleteSelected() {
-        if (selectedItems.size === 0) return;
-        haptic.impactOccurred('medium');
-        Telegram.WebApp.showConfirm(`Удалить ${selectedItems.size} элемент(ов)?`, ok => {
-            if (ok) { haptic.impactOccurred('heavy'); performBatchAction('{{ url_for("batch_delete_tma") }}', { item_ids: Array.from(selectedItems) }); }
-        });
+    
+    function openRenameModal() {
+        if (selectedItems.size !== 1) return;
+        const itemId = selectedItems.values().next().value;
+        const itemEl = document.querySelector(`.item[data-id='${itemId}']`);
+        document.getElementById('rename-id-input').value = itemId;
+        document.getElementById('rename-name-input').value = itemEl.dataset.name;
+        document.getElementById('rename-modal').style.display = 'flex';
+        moreMenu.style.display = 'none';
+    }
+    async function submitRename() {
+        const itemId = document.getElementById('rename-id-input').value;
+        const newName = document.getElementById('rename-name-input').value;
+        await performBatchAction('{{ url_for("rename_item_tma") }}', { item_id: itemId, new_name: newName });
+    }
+
+    function openLockModal() {
+        if (selectedItems.size !== 1) return;
+        const itemId = selectedItems.values().next().value;
+        document.getElementById('lock-id-input').value = itemId;
+        document.getElementById('lock-modal').style.display = 'flex';
+        moreMenu.style.display = 'none';
+    }
+    async function submitLock() {
+        const folderId = document.getElementById('lock-id-input').value;
+        const password = document.getElementById('lock-password-input').value;
+        const confirm = document.getElementById('lock-password-confirm').value;
+        if (password.length < 4) { Telegram.WebApp.showAlert('Пароль должен быть не менее 4 символов.'); return; }
+        if (password !== confirm) { Telegram.WebApp.showAlert('Пароли не совпадают.'); return; }
+        await performBatchAction('{{ url_for("set_folder_lock_tma") }}', { folder_id: folderId, password: password });
+    }
+
+    function openUnlockModal(folderId) {
+        document.getElementById('unlock-id-input').value = folderId;
+        document.getElementById('unlock-modal').style.display = 'flex';
+    }
+    async function submitUnlock() {
+        const folderId = document.getElementById('unlock-id-input').value;
+        const password = document.getElementById('unlock-password-input').value;
+        const modal = document.getElementById('unlock-modal');
+        try {
+            const response = await fetch('{{ url_for("unlock_folder_tma") }}', {
+                method: 'POST', headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({ folder_id: folderId, password: password })
+            });
+            const result = await response.json();
+            if (result.status === 'success') {
+                haptic.notificationOccurred('success');
+                window.location.href = `{{ url_for('tma_dashboard') }}?folder_id=${folderId}`;
+            } else {
+                haptic.notificationOccurred('error');
+                Telegram.WebApp.showAlert(result.message || 'Неверный пароль.');
+            }
+        } catch(e) { Telegram.WebApp.showAlert('Сетевая ошибка.'); }
     }
+
     async function openNoteModal(noteId = null) {
         haptic.impactOccurred('light');
         closeFabModal();
@@ -877,6 +1057,7 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         } else {
             listEl.innerHTML = '<p>Публичных ссылок для этой папки нет.</p>';
         }
+        moreMenu.style.display = 'none';
     }
     async function createShareLink() {
         const folderId = selectedItems.values().next().value;
@@ -947,6 +1128,9 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         setView(localStorage.getItem('viewMode') || 'grid');
         const currentFolderId = '{{ current_folder_id }}';
         const parentFolderId = '{{ parent_folder_id }}';
+        if ('{{ folder_is_locked }}' === 'True') {
+            openUnlockModal(currentFolderId);
+        }
         if (currentFolderId !== 'root') {
             let backButton = window.Telegram.WebApp.BackButton;
             backButton.show();
@@ -977,9 +1161,30 @@ def tma_dashboard():
         current_folder_id = 'root'
         current_folder, parent_folder = find_node_by_id(user_data['filesystem'], 'root')
 
+    folder_is_locked = False
+    unlocked_folders = session.get('unlocked_folders', [])
+    if current_folder_id != 'root':
+        path_to_folder = get_node_path(user_data['filesystem'], current_folder_id)
+        if path_to_folder:
+            for node in path_to_folder:
+                if 'lock_hash' in node and node.get('id') not in unlocked_folders:
+                    folder_is_locked = True
+                    break
+    
+    if folder_is_locked and request.method == 'POST':
+        return redirect(url_for('tma_dashboard', folder_id=current_folder_id))
+
+
     parent_folder_id = parent_folder.get('id', 'root') if parent_folder else 'root'
+    
+    items_in_folder = []
+    if not folder_is_locked:
+        items = 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()))
+        for item in items:
+            item['is_locked'] = 'lock_hash' in item and item.get('type') == 'folder'
+            items_in_folder.append(item)
+
 
-    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()))
     if request.method == 'POST':
         if not HF_TOKEN_WRITE:
              flash('Загрузка невозможна: токен для записи не настроен.', 'error')
@@ -1031,7 +1236,7 @@ def tma_dashboard():
 
     all_folders_for_move = get_all_folders(user_data['filesystem'])
 
-    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)
+    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, folder_is_locked=folder_is_locked)
 
 @app.route('/create_folder_tma', methods=['POST'])
 def create_folder_tma():
@@ -1239,6 +1444,92 @@ 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('/rename_item_tma', methods=['POST'])
+def rename_item_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_id = request.json.get('item_id')
+    new_name = request.json.get('new_name', '').strip()
+
+    if not new_name: return jsonify({'status': 'error', 'message': 'Имя не может быть пустым.'}), 400
+    
+    node, _ = find_node_by_id(user_data['filesystem'], item_id)
+    if not node: return jsonify({'status': 'error', 'message': 'Элемент не найден.'}), 404
+
+    if node['type'] == 'folder':
+        node['name'] = new_name
+    elif node['type'] == 'file':
+        node['original_filename'] = new_name
+    elif node['type'] == 'note':
+        node['title'] = new_name
+    else:
+        return jsonify({'status': 'error', 'message': 'Неподдерживаемый тип элемента.'}), 400
+
+    try:
+        save_data(data)
+        return jsonify({'status': 'success', 'message': 'Переименовано.'})
+    except Exception as e:
+        return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
+
+@app.route('/set_folder_lock_tma', methods=['POST'])
+def set_folder_lock_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
+    
+    folder_id = request.json.get('folder_id')
+    password = request.json.get('password')
+
+    if not password or len(password) < 4:
+        return jsonify({'status': 'error', 'message': 'Пароль слишком короткий.'}), 400
+    
+    folder_node, _ = find_node_by_id(user_data['filesystem'], folder_id)
+    if not folder_node or folder_node.get('type') != 'folder':
+        return jsonify({'status': 'error', 'message': 'Папка не найдена.'}), 404
+
+    folder_node['lock_hash'] = generate_password_hash(password)
+    
+    if folder_id in session.get('unlocked_folders', []):
+        session['unlocked_folders'].remove(folder_id)
+        session.modified = True
+
+    try:
+        save_data(data)
+        return jsonify({'status': 'success', 'message': 'Папка заблокирована.'})
+    except Exception as e:
+        return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
+
+@app.route('/unlock_folder_tma', methods=['POST'])
+def unlock_folder_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
+
+    folder_id = request.json.get('folder_id')
+    password = request.json.get('password')
+    
+    folder_node, _ = find_node_by_id(user_data['filesystem'], folder_id)
+    if not folder_node or not folder_node.get('lock_hash'):
+        return jsonify({'status': 'error', 'message': 'Папка не заблокирована.'}), 404
+    
+    if check_password_hash(folder_node['lock_hash'], password):
+        if 'unlocked_folders' not in session:
+            session['unlocked_folders'] = []
+        if folder_id not in session['unlocked_folders']:
+            session['unlocked_folders'].append(folder_id)
+            session.modified = True
+        return jsonify({'status': 'success'})
+    else:
+        return jsonify({'status': 'error', 'message': 'Неверный пароль.'}), 403
+
 @app.route('/get_text_content_tma/<file_id>')
 def get_text_content_tma(file_id):
     file_node = get_item_node_for_user(file_id)
@@ -1649,7 +1940,10 @@ ADMIN_USER_FILES_HTML = '''
             {% endif %}
             </div>
             <div class="item-name-info">
-                <p class="item-name">{{ (item.title if item.type == 'note' else item.name if item.type == 'folder' else item.original_filename) | truncate(30, True) }}</p>
+                 <p class="item-name">
+                  {% if item.is_locked %}<i class="fa-solid fa-lock lock-icon"></i>{% endif %}
+                  <span>{{ (item.title if item.type == 'note' else item.name if item.type == 'folder' else item.original_filename) | truncate(30, True) }}</span>
+                </p>
                 {% if item.type == 'file' %}<p class="item-info">{{ item.upload_date }}</p>
                 {% elif item.type == 'note' %}<p class="item-info">{{ item.modified_date }}</p>{% endif %}
             </div>
@@ -1858,8 +2152,13 @@ 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 = []
+    items = 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()))
+    for item in items:
+        item['is_locked'] = 'lock_hash' in item and item.get('type') == 'folder'
+        items_in_folder.append(item)
 
-    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()))
 
     breadcrumbs = []
     temp_id = current_folder_id