Skip to content

, #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2024
Merged

, #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e61b48
testing
krinkin Nov 3, 2024
d56fd0f
Merge pull request #75 from smart-linux-shell/integration
krinkin Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 111 additions & 26 deletions app/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from flask import Flask, send_from_directory, render_template_string, abort
from flask import Flask, send_from_directory, render_template_string, abort, url_for
import os
from logger import log
from datetime import datetime
from urllib.parse import quote

# read version from file if exists
version = "unknown"
Expand All @@ -15,7 +16,7 @@
GUNICORN_VERSION=f"{os.getenv('GUNICORN_VERSION', 'Unknown')}"
log.info('Service started, version: [%s]', GUNICORN_VERSION)

# HTML template for directory listing
# HTML template for directory listing with breadcrumb navigation
DIRECTORY_LISTING_TEMPLATE = """
<!DOCTYPE html>
<html>
Expand All @@ -24,27 +25,94 @@
<style>
body { font-family: Arial, sans-serif; margin: 20px; }
.header { margin-bottom: 20px; }
.item { padding: 8px; border-bottom: 1px solid #eee; }
.breadcrumb {
background-color: #f8f9fa;
padding: 10px;
border-radius: 4px;
margin-bottom: 20px;
}
.breadcrumb a {
color: #007bff;
text-decoration: none;
margin: 0 5px;
}
.breadcrumb span { color: #666; margin: 0 5px; }
.item {
padding: 8px;
border-bottom: 1px solid #eee;
display: flex;
justify-content: space-between;
align-items: center;
}
.item:hover { background-color: #f5f5f5; }
.item a { text-decoration: none; color: #333; }
.item a:hover { color: #007bff; }
.item-name { flex: 2; }
.item-name a { text-decoration: none; color: #333; }
.item-name a:hover { color: #007bff; }
.directory { font-weight: bold; }
.file-info { color: #666; float: right; }
.file-info {
flex: 1;
text-align: right;
color: #666;
font-size: 0.9em;
}
.size-column {
flex: 0.5;
text-align: right;
padding-right: 20px;
}
.date-column { flex: 1; text-align: right; }
.header-row {
font-weight: bold;
padding: 8px;
border-bottom: 2px solid #ddd;
margin-bottom: 10px;
display: flex;
justify-content: space-between;
align-items: center;
}
</style>
</head>
<body>
<div class="header">
<h2>Directory: {{ current_path }}</h2>
{% if parent_path %}
<a href="{{ parent_path }}">&larr; Back to Parent Directory</a>
{% endif %}
<h2>Repository Browser</h2>
<div class="breadcrumb">
<a href="/deb/">Root</a>
{% for crumb in breadcrumbs %}
<span>/</span>
{% if not loop.last %}
<a href="{{ crumb.path }}">{{ crumb.name }}</a>
{% else %}
<span>{{ crumb.name }}</span>
{% endif %}
{% endfor %}
</div>
</div>

<div class="header-row">
<div class="item-name">Name</div>
<div class="size-column">Size</div>
<div class="date-column">Last Modified</div>
</div>

{% if parent_path %}
<div class="item">
<div class="item-name">
<a href="{{ parent_path }}">📁 ..</a>
</div>
<div class="size-column">-</div>
<div class="date-column">-</div>
</div>
{% endif %}

{% for item in items %}
<div class="item">
<span class="file-info">{{ item.size }} - {{ item.modified }}</span>
<a href="{{ item.path }}" class="{{ 'directory' if item.is_dir else '' }}">
{{ '📁 ' if item.is_dir else '📄 ' }}{{ item.name }}
</a>
<div class="item-name">
<a href="{{ item.path }}" class="{{ 'directory' if item.is_dir else '' }}">
{{ '📁 ' if item.is_dir else '📄 ' }}{{ item.name }}
</a>
</div>
<div class="size-column">{{ item.size }}</div>
<div class="date-column">{{ item.modified }}</div>
</div>
{% endfor %}
</body>
Expand All @@ -59,26 +127,40 @@ def get_human_readable_size(size_in_bytes):
size_in_bytes /= 1024
return f"{size_in_bytes:.1f} TB"

def get_breadcrumbs(path):
"""Generate breadcrumb navigation items"""
if not path:
return []

crumbs = []
current = ""
parts = path.split('/')

for part in parts:
if part:
current = os.path.join(current, part)
crumbs.append({
'name': part,
'path': f'/deb/{current}'
})

return crumbs

def get_directory_listing(base_path, current_path):
"""Generate directory listing information"""
full_path = os.path.join(base_path, current_path)
items = []

try:
for item in os.listdir(full_path):
item_path = os.path.join(full_path, item)
stats = os.stat(item_path)
is_dir = os.path.isdir(item_path)
for item in os.scandir(full_path):
stats = item.stat()
relative_path = os.path.relpath(item.path, base_path)

relative_path = os.path.join(current_path, item)
if not relative_path.startswith('/'):
relative_path = '/' + relative_path

items.append({
'name': item,
'path': f"/deb{relative_path}",
'is_dir': is_dir,
'size': get_human_readable_size(stats.st_size) if not is_dir else '-',
'name': item.name,
'path': f"/deb/{quote(relative_path)}",
'is_dir': item.is_dir(),
'size': get_human_readable_size(stats.st_size) if not item.is_dir() else '-',
'modified': datetime.fromtimestamp(stats.st_mtime).strftime('%Y-%m-%d %H:%M:%S')
})

Expand Down Expand Up @@ -115,10 +197,13 @@ def serve_deb_repo(path):
log.info(f"Serving directory listing for {full_path}")
items = get_directory_listing(base_path, path)
parent_path = '/deb/' + os.path.dirname(path) if path else None
breadcrumbs = get_breadcrumbs(path)

return render_template_string(
DIRECTORY_LISTING_TEMPLATE,
current_path=f"/deb/{path}",
parent_path=parent_path,
breadcrumbs=breadcrumbs,
items=items
)
else:
Expand Down
Loading