Update app.py
Browse files
app.py
CHANGED
|
@@ -159,6 +159,17 @@ def get_all_folders(filesystem, exclude_ids=None):
|
|
| 159 |
traverse(filesystem, "")
|
| 160 |
return sorted(folders, key=lambda x: x['name'].lower())
|
| 161 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 162 |
def initialize_user_filesystem_tma(user_data, tma_user_id_str):
|
| 163 |
if 'filesystem' not in user_data:
|
| 164 |
user_data['filesystem'] = {"type": "folder", "id": "root", "name": "root", "children": []}
|
|
@@ -293,18 +304,28 @@ def auth_via_telegram():
|
|
| 293 |
return jsonify({'status': 'error', 'message': 'Отсутствуют данные пользователя Telegram.'}), 400
|
| 294 |
tma_user_id_str = str(tg_user_data['id'])
|
| 295 |
data = load_data()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 296 |
if tma_user_id_str not in data['users']:
|
| 297 |
-
|
| 298 |
-
|
| 299 |
-
|
| 300 |
-
'created_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
|
| 301 |
-
'filesystem': {"type": "folder", "id": "root", "name": "root", "children": []}
|
| 302 |
-
}
|
| 303 |
initialize_user_filesystem_tma(data['users'][tma_user_id_str], tma_user_id_str)
|
| 304 |
-
|
| 305 |
-
|
| 306 |
-
|
| 307 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 308 |
session['telegram_user_id'] = tma_user_id_str
|
| 309 |
display_name = tg_user_data.get('first_name') or tg_user_data.get('username') or f"User {tma_user_id_str}"
|
| 310 |
session['telegram_display_name'] = display_name
|
|
@@ -976,22 +997,38 @@ ADMIN_PANEL_HTML = '''
|
|
| 976 |
.user-list { list-style: none; padding: 0; }
|
| 977 |
.user-item { background: var(--card-bg-dark); border-radius: 12px; margin-bottom: 10px; padding: 15px; display: flex; justify-content: space-between; align-items: center; transition: var(--transition); }
|
| 978 |
.user-item:hover { background: #2a2a2a; }
|
|
|
|
|
|
|
| 979 |
.user-info span { display: block; }
|
| 980 |
.user-info .id { font-size: 0.8em; color: var(--text-muted); }
|
| 981 |
-
.header-actions { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; }
|
|
|
|
|
|
|
|
|
|
| 982 |
</style></head><body>
|
| 983 |
<div class="container">
|
| 984 |
<div class="header-actions">
|
| 985 |
-
<h2>Admin Panel
|
| 986 |
<a href="{{ url_for('admin_logout') }}" class="btn delete-btn">Logout</a>
|
| 987 |
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 988 |
<ul class="user-list">
|
| 989 |
-
{% for user_id, user in users
|
| 990 |
<li class="user-item">
|
| 991 |
-
<div class="user-
|
| 992 |
-
|
| 993 |
-
<
|
| 994 |
-
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 995 |
</div>
|
| 996 |
<a href="{{ url_for('admin_user_files', tma_user_id_str=user_id) }}" class="btn">View Files</a>
|
| 997 |
</li>
|
|
@@ -1162,8 +1199,35 @@ def admin_logout():
|
|
| 1162 |
@admin_browser_login_required
|
| 1163 |
def admin_panel():
|
| 1164 |
data = load_data()
|
| 1165 |
-
|
| 1166 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1167 |
|
| 1168 |
@app.route('/admhosto/user/<tma_user_id_str>')
|
| 1169 |
@admin_browser_login_required
|
|
|
|
| 159 |
traverse(filesystem, "")
|
| 160 |
return sorted(folders, key=lambda x: x['name'].lower())
|
| 161 |
|
| 162 |
+
def count_files_recursive(node):
|
| 163 |
+
if not node or not isinstance(node, dict):
|
| 164 |
+
return 0
|
| 165 |
+
count = 0
|
| 166 |
+
if node.get('type') == 'file':
|
| 167 |
+
count += 1
|
| 168 |
+
if node.get('type') == 'folder' and 'children' in node:
|
| 169 |
+
for child in node.get('children', []):
|
| 170 |
+
count += count_files_recursive(child)
|
| 171 |
+
return count
|
| 172 |
+
|
| 173 |
def initialize_user_filesystem_tma(user_data, tma_user_id_str):
|
| 174 |
if 'filesystem' not in user_data:
|
| 175 |
user_data['filesystem'] = {"type": "folder", "id": "root", "name": "root", "children": []}
|
|
|
|
| 304 |
return jsonify({'status': 'error', 'message': 'Отсутствуют данные пользователя Telegram.'}), 400
|
| 305 |
tma_user_id_str = str(tg_user_data['id'])
|
| 306 |
data = load_data()
|
| 307 |
+
|
| 308 |
+
user_info = {
|
| 309 |
+
'telegram_id': tg_user_data['id'],
|
| 310 |
+
'telegram_username': tg_user_data.get('username'),
|
| 311 |
+
'first_name': tg_user_data.get('first_name'),
|
| 312 |
+
'last_name': tg_user_data.get('last_name'),
|
| 313 |
+
'photo_url': tg_user_data.get('photo_url')
|
| 314 |
+
}
|
| 315 |
+
|
| 316 |
if tma_user_id_str not in data['users']:
|
| 317 |
+
user_info['created_at'] = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
|
| 318 |
+
user_info['filesystem'] = {"type": "folder", "id": "root", "name": "root", "children": []}
|
| 319 |
+
data['users'][tma_user_id_str] = user_info
|
|
|
|
|
|
|
|
|
|
| 320 |
initialize_user_filesystem_tma(data['users'][tma_user_id_str], tma_user_id_str)
|
| 321 |
+
else:
|
| 322 |
+
data['users'][tma_user_id_str].update(user_info)
|
| 323 |
+
|
| 324 |
+
try: save_data(data)
|
| 325 |
+
except Exception as e:
|
| 326 |
+
logging.error(f"Save data error for TMA user {tma_user_id_str}: {e}")
|
| 327 |
+
return jsonify({'status': 'error', 'message': 'Ошибка сохранения данных пользователя.'}), 500
|
| 328 |
+
|
| 329 |
session['telegram_user_id'] = tma_user_id_str
|
| 330 |
display_name = tg_user_data.get('first_name') or tg_user_data.get('username') or f"User {tma_user_id_str}"
|
| 331 |
session['telegram_display_name'] = display_name
|
|
|
|
| 997 |
.user-list { list-style: none; padding: 0; }
|
| 998 |
.user-item { background: var(--card-bg-dark); border-radius: 12px; margin-bottom: 10px; padding: 15px; display: flex; justify-content: space-between; align-items: center; transition: var(--transition); }
|
| 999 |
.user-item:hover { background: #2a2a2a; }
|
| 1000 |
+
.user-details { display: flex; align-items: center; gap: 15px; }
|
| 1001 |
+
.user-avatar { width: 50px; height: 50px; border-radius: 50%; object-fit: cover; background-color: #333; }
|
| 1002 |
.user-info span { display: block; }
|
| 1003 |
.user-info .id { font-size: 0.8em; color: var(--text-muted); }
|
| 1004 |
+
.header-actions { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; flex-wrap: wrap; gap: 10px;}
|
| 1005 |
+
.search-form { display: flex; gap: 10px; flex-grow: 1; max-width: 400px;}
|
| 1006 |
+
.search-form input { margin: 0; }
|
| 1007 |
+
.search-form .btn { padding: 14px 20px; }
|
| 1008 |
</style></head><body>
|
| 1009 |
<div class="container">
|
| 1010 |
<div class="header-actions">
|
| 1011 |
+
<h2>Admin Panel ({{ users|length }})</h2>
|
| 1012 |
<a href="{{ url_for('admin_logout') }}" class="btn delete-btn">Logout</a>
|
| 1013 |
</div>
|
| 1014 |
+
<div class="header-actions">
|
| 1015 |
+
<form method="get" action="{{ url_for('admin_panel') }}" class="search-form">
|
| 1016 |
+
<input type="search" name="q" placeholder="Search by name or username..." value="{{ search_query or '' }}">
|
| 1017 |
+
<button type="submit" class="btn">Search</button>
|
| 1018 |
+
</form>
|
| 1019 |
+
</div>
|
| 1020 |
<ul class="user-list">
|
| 1021 |
+
{% for user_id, user in users %}
|
| 1022 |
<li class="user-item">
|
| 1023 |
+
<div class="user-details">
|
| 1024 |
+
{% if user.photo_url %}<img src="{{ user.photo_url }}" alt="Avatar" class="user-avatar">
|
| 1025 |
+
{% else %}<div class="user-avatar" style="display: flex; align-items: center; justify-content: center; font-weight: bold; font-size: 1.5em; color: var(--primary);">{{ user.get('first_name', 'U')[0] }}</div>{% endif %}
|
| 1026 |
+
<div class="user-info">
|
| 1027 |
+
<strong>{{ user.get('first_name', 'N/A') }} {{ user.get('last_name', '') }}</strong> (@{{ user.get('telegram_username', 'N/A') }})
|
| 1028 |
+
<span class="id">ID: {{ user_id }}</span>
|
| 1029 |
+
<span class="id">Created: {{ user.get('created_at', 'N/A') }}</span>
|
| 1030 |
+
<span class="id">Files: <strong>{{ user.get('file_count', 0) }}</strong></span>
|
| 1031 |
+
</div>
|
| 1032 |
</div>
|
| 1033 |
<a href="{{ url_for('admin_user_files', tma_user_id_str=user_id) }}" class="btn">View Files</a>
|
| 1034 |
</li>
|
|
|
|
| 1199 |
@admin_browser_login_required
|
| 1200 |
def admin_panel():
|
| 1201 |
data = load_data()
|
| 1202 |
+
all_users = data.get('users', {})
|
| 1203 |
+
search_query = request.args.get('q', '').lower()
|
| 1204 |
+
|
| 1205 |
+
# Calculate file counts and prepare user data
|
| 1206 |
+
processed_users = {}
|
| 1207 |
+
for user_id, user_data in all_users.items():
|
| 1208 |
+
user_data['file_count'] = count_files_recursive(user_data.get('filesystem'))
|
| 1209 |
+
processed_users[user_id] = user_data
|
| 1210 |
+
|
| 1211 |
+
# Filter users if a search query is provided
|
| 1212 |
+
if search_query:
|
| 1213 |
+
filtered_users = {}
|
| 1214 |
+
for user_id, user_data in processed_users.items():
|
| 1215 |
+
full_name = f"{user_data.get('first_name', '')} {user_data.get('last_name', '')}".lower()
|
| 1216 |
+
username = user_data.get('telegram_username', '').lower()
|
| 1217 |
+
if search_query in full_name or search_query in username:
|
| 1218 |
+
filtered_users[user_id] = user_data
|
| 1219 |
+
users_to_display = filtered_users
|
| 1220 |
+
else:
|
| 1221 |
+
users_to_display = processed_users
|
| 1222 |
+
|
| 1223 |
+
# Sort users by creation date (newest first)
|
| 1224 |
+
sorted_users = sorted(
|
| 1225 |
+
users_to_display.items(),
|
| 1226 |
+
key=lambda item: item[1].get('created_at', '0000-00-00 00:00:00'),
|
| 1227 |
+
reverse=True
|
| 1228 |
+
)
|
| 1229 |
+
|
| 1230 |
+
return render_template_string(ADMIN_PANEL_HTML, users=sorted_users, search_query=request.args.get('q', ''))
|
| 1231 |
|
| 1232 |
@app.route('/admhosto/user/<tma_user_id_str>')
|
| 1233 |
@admin_browser_login_required
|