Add daily traffic limits, auto-sort packages, Debrid-Link multi-key improvements
Daily traffic limits: - Per-provider daily download limit (configurable in GB per provider) - Per Debrid-Link API key daily limit (individual limits per key) - Usage tracking with automatic daily reset at midnight - Provider is skipped when daily limit reached, falls back to next provider - Reset button per provider and per Debrid-Link key in account settings - Hoster routing skips daily-limited providers gracefully Debrid-Link multi-key improvements: - Keys now display with labels (#1, #2...) and masked tokens in account list - Option to show detailed per-key view with individual usage stats - Keys that hit their daily limit are automatically skipped - providerAccountId/providerAccountLabel stored per download item Auto-sort packages by progress: - Active packages automatically sorted to top during downloads - Sorted by completion ratio, then downloaded bytes - Toggle in settings (autoSortPackagesByProgress) UI polish: - Package column headers: flatter, more transparent design - LinkSnappy mode label: "Login" renamed to "Web" - Account list: new toggle for detailed Debrid-Link key display - Account usage stats section with warning styling Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.6
parent
71b3612e82
commit
e212ccc86f
+31
-1
@@ -120,6 +120,7 @@ interface ConfiguredAccountEntry {
|
||||
modeLabel: string;
|
||||
statusLabel: string;
|
||||
summary: string;
|
||||
summaryLines: string[];
|
||||
note: string;
|
||||
disabled: boolean;
|
||||
dailyUsedBytes: number;
|
||||
@@ -474,6 +475,16 @@ function summarizeAccount(kind: AccountKind, settings: AppSettings): string {
|
||||
}
|
||||
}
|
||||
|
||||
function summarizeAccountLines(kind: AccountKind, settings: AppSettings): string[] {
|
||||
if (kind === "debridlink-api" && settings.accountListShowDetailedDebridLinkKeys) {
|
||||
const keys = parseDebridLinkApiKeys(settings.debridLinkApiKeys || "");
|
||||
if (keys.length > 1) {
|
||||
return keys.map((entry) => `${entry.label}: ${entry.masked}`);
|
||||
}
|
||||
}
|
||||
return [summarizeAccount(kind, settings)];
|
||||
}
|
||||
|
||||
function createAccountDialogState(mode: "create" | "edit", kind: AccountKind | null, settings: AppSettings): AccountDialogState {
|
||||
if (!kind) {
|
||||
return {
|
||||
@@ -691,6 +702,7 @@ const emptySnapshot = (): UiSnapshot => ({
|
||||
maxParallel: 4, maxParallelExtract: 2, extractCpuPriority: "high", retryLimit: 0, speedLimitEnabled: false, speedLimitKbps: 0, speedLimitMode: "global",
|
||||
updateRepo: "", autoUpdateCheck: true, clipboardWatch: false, minimizeToTray: false,
|
||||
theme: "dark", collapseNewPackages: true, autoSortPackagesByProgress: true, autoSkipExtracted: false, confirmDeleteSelection: true,
|
||||
accountListShowDetailedDebridLinkKeys: false,
|
||||
bandwidthSchedules: [], totalDownloadedAllTime: 0,
|
||||
columnOrder: ["name", "size", "progress", "hoster", "account", "prio", "status", "speed"],
|
||||
autoExtractWhenStopped: true,
|
||||
@@ -1817,6 +1829,7 @@ export function App(): ReactElement {
|
||||
modeLabel: option.modeLabel,
|
||||
statusLabel: isDisabled ? "Deaktiviert" : statusLabel,
|
||||
summary: summarizeAccount(kind, settingsDraft),
|
||||
summaryLines: summarizeAccountLines(kind, settingsDraft),
|
||||
note,
|
||||
disabled: isDisabled,
|
||||
dailyUsedBytes,
|
||||
@@ -3922,6 +3935,15 @@ export function App(): ReactElement {
|
||||
<span className="account-inline-stat">{availableAccountOptions.length} weitere Typen verfügbar</span>
|
||||
</div>
|
||||
|
||||
<label className="toggle-line account-display-toggle">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={settingsDraft.accountListShowDetailedDebridLinkKeys}
|
||||
onChange={(e) => setBool("accountListShowDetailedDebridLinkKeys", e.target.checked)}
|
||||
/>
|
||||
Debrid-Link-Keys im Feld "Zugang" einzeln untereinander anzeigen
|
||||
</label>
|
||||
|
||||
{configuredAccounts.length === 0 && (
|
||||
<div className="account-empty-state">
|
||||
<strong>Noch keine Accounts hinterlegt</strong>
|
||||
@@ -4038,7 +4060,15 @@ export function App(): ReactElement {
|
||||
)}
|
||||
</div>
|
||||
<div className="account-cell">
|
||||
<span className="account-secret">{entry.summary}</span>
|
||||
{entry.summaryLines.length > 1 ? (
|
||||
<div className="account-secret account-secret-multiline">
|
||||
{entry.summaryLines.map((line) => (
|
||||
<span key={line}>{line}</span>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<span className="account-secret">{entry.summary}</span>
|
||||
)}
|
||||
</div>
|
||||
<div className="account-cell account-row-actions">
|
||||
{showStatusButton && (
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import type { PackageEntry } from "../shared/types";
|
||||
import type { DownloadItem, DownloadStatus, PackageEntry } from "../shared/types";
|
||||
|
||||
const ACTIVE_PACKAGE_STATUSES = new Set<DownloadStatus>(["downloading", "validating", "integrity_check", "extracting"]);
|
||||
|
||||
export function reorderPackageOrderByDrop(order: string[], draggedPackageId: string, targetPackageId: string): string[] {
|
||||
const fromIndex = order.indexOf(draggedPackageId);
|
||||
@@ -23,3 +25,49 @@ export function sortPackageOrderByName(order: string[], packages: Record<string,
|
||||
});
|
||||
return sorted;
|
||||
}
|
||||
|
||||
export function sortPackagesForDisplay(
|
||||
packages: PackageEntry[],
|
||||
itemsById: Record<string, DownloadItem>,
|
||||
running: boolean,
|
||||
autoSortPackagesByProgress: boolean
|
||||
): PackageEntry[] {
|
||||
if (!running || !autoSortPackagesByProgress || packages.length <= 1) {
|
||||
return packages;
|
||||
}
|
||||
|
||||
const active: Array<{ pkg: PackageEntry; index: number; completedRatio: number; downloadedBytes: number }> = [];
|
||||
const rest: PackageEntry[] = [];
|
||||
|
||||
packages.forEach((pkg, index) => {
|
||||
const items = pkg.itemIds
|
||||
.map((id) => itemsById[id])
|
||||
.filter((item): item is DownloadItem => Boolean(item));
|
||||
const hasActive = items.some((item) => ACTIVE_PACKAGE_STATUSES.has(item.status));
|
||||
if (!hasActive) {
|
||||
rest.push(pkg);
|
||||
return;
|
||||
}
|
||||
const completedRatio = items.length > 0
|
||||
? items.filter((item) => item.status === "completed").length / items.length
|
||||
: 0;
|
||||
const downloadedBytes = items.reduce((sum, item) => sum + (item.downloadedBytes || 0), 0);
|
||||
active.push({ pkg, index, completedRatio, downloadedBytes });
|
||||
});
|
||||
|
||||
if (active.length === 0 || active.length === packages.length) {
|
||||
return packages;
|
||||
}
|
||||
|
||||
active.sort((a, b) => {
|
||||
if (a.completedRatio !== b.completedRatio) {
|
||||
return b.completedRatio - a.completedRatio;
|
||||
}
|
||||
if (a.downloadedBytes !== b.downloadedBytes) {
|
||||
return b.downloadedBytes - a.downloadedBytes;
|
||||
}
|
||||
return a.index - b.index;
|
||||
});
|
||||
|
||||
return [...active.map((entry) => entry.pkg), ...rest];
|
||||
}
|
||||
|
||||
+214
-17
@@ -624,7 +624,7 @@ body,
|
||||
overflow: auto;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.downloads-toolbar {
|
||||
@@ -632,6 +632,7 @@ body,
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.downloads-toolbar-actions {
|
||||
@@ -649,14 +650,16 @@ body,
|
||||
display: grid;
|
||||
/* grid-template-columns set via inline style from columnOrder */
|
||||
gap: 8px;
|
||||
padding: 5px 12px;
|
||||
background: var(--card);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
padding: 4px 10px;
|
||||
background: color-mix(in srgb, var(--card) 58%, transparent);
|
||||
border: 0;
|
||||
border-bottom: 1px solid color-mix(in srgb, var(--border) 62%, transparent);
|
||||
border-radius: 0;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
color: var(--muted);
|
||||
user-select: none;
|
||||
margin-bottom: 1px;
|
||||
}
|
||||
|
||||
.pkg-column-header .pkg-col-progress,
|
||||
@@ -1150,6 +1153,10 @@ body,
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.account-display-toggle {
|
||||
width: fit-content;
|
||||
}
|
||||
|
||||
.account-inline-stat {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
@@ -1290,6 +1297,19 @@ body,
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.account-usage-stats {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px 10px;
|
||||
color: var(--muted);
|
||||
font-size: 12px;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.account-usage-stats.warning {
|
||||
color: color-mix(in srgb, #f59e0b 78%, white 8%);
|
||||
}
|
||||
|
||||
.account-mode-pill,
|
||||
.account-status-pill {
|
||||
display: inline-flex;
|
||||
@@ -1366,6 +1386,74 @@ body,
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.account-subkey-list {
|
||||
display: grid;
|
||||
gap: 8px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.account-subkey-row {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr) auto;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
padding: 7px 10px;
|
||||
border-radius: 10px;
|
||||
border: 1px solid color-mix(in srgb, var(--border) 72%, transparent);
|
||||
background: color-mix(in srgb, var(--field) 72%, transparent);
|
||||
}
|
||||
|
||||
.account-subkey-row.warning {
|
||||
border-color: color-mix(in srgb, #f59e0b 42%, transparent);
|
||||
}
|
||||
|
||||
.account-subkey-main {
|
||||
display: grid;
|
||||
gap: 4px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.account-subkey-head {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: 8px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.account-subkey-head strong {
|
||||
font-size: 12px;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.account-subkey-head span {
|
||||
color: var(--muted);
|
||||
font-size: 11px;
|
||||
font-family: "JetBrains Mono", "Consolas", monospace;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.account-subkey-stats {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 4px 10px;
|
||||
color: var(--muted);
|
||||
font-size: 11px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.account-subkey-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.account-subkey-actions .btn {
|
||||
padding: 4px 8px;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.hoster-routing-table {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -1681,6 +1769,54 @@ body,
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.account-dl-key-limit-list {
|
||||
display: grid;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.account-dl-key-limit-row {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(160px, 220px) minmax(0, 1fr);
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
padding: 10px 12px;
|
||||
border-radius: 12px;
|
||||
border: 1px solid color-mix(in srgb, var(--border) 82%, transparent);
|
||||
background: color-mix(in srgb, var(--field) 84%, transparent);
|
||||
}
|
||||
|
||||
.account-dl-key-meta {
|
||||
display: grid;
|
||||
gap: 2px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.account-dl-key-meta strong {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.account-dl-key-meta span {
|
||||
color: var(--muted);
|
||||
font-size: 12px;
|
||||
font-family: "JetBrains Mono", "Consolas", monospace;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.account-secret.account-secret-multiline {
|
||||
display: grid;
|
||||
align-items: start;
|
||||
gap: 4px;
|
||||
padding: 10px 12px;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.account-secret.account-secret-multiline span {
|
||||
display: block;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.account-status-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
|
||||
@@ -1730,9 +1866,22 @@ body,
|
||||
|
||||
.package-card {
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 14px;
|
||||
border-radius: 11px;
|
||||
background: linear-gradient(180deg, color-mix(in srgb, var(--card) 96%, transparent), color-mix(in srgb, var(--surface) 96%, transparent));
|
||||
padding: 8px 12px;
|
||||
padding: 6px 10px;
|
||||
}
|
||||
|
||||
.queue-package-card {
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
padding: 0;
|
||||
box-shadow: none;
|
||||
border-bottom: 1px solid color-mix(in srgb, var(--border) 54%, transparent);
|
||||
}
|
||||
|
||||
.queue-package-card:hover {
|
||||
background: color-mix(in srgb, var(--accent) 3%, transparent);
|
||||
}
|
||||
|
||||
.package-card[draggable="true"] {
|
||||
@@ -1752,6 +1901,12 @@ body,
|
||||
box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 30%, transparent);
|
||||
}
|
||||
|
||||
.queue-package-card.pkg-selected {
|
||||
border-color: transparent;
|
||||
box-shadow: inset 2px 0 0 0 var(--accent);
|
||||
background: color-mix(in srgb, var(--accent) 8%, transparent);
|
||||
}
|
||||
|
||||
.item-selected {
|
||||
background: color-mix(in srgb, var(--accent) 12%, transparent);
|
||||
}
|
||||
@@ -1759,18 +1914,23 @@ body,
|
||||
.package-card header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.queue-package-card header {
|
||||
min-height: 28px;
|
||||
padding: 3px 10px;
|
||||
}
|
||||
|
||||
.package-card h4 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.package-card header span {
|
||||
color: var(--muted);
|
||||
font-size: 13px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.package-card header .progress-inline-text-filled,
|
||||
@@ -1798,6 +1958,15 @@ body,
|
||||
transition: background 0.12s ease, border-color 0.12s ease, color 0.12s ease;
|
||||
}
|
||||
|
||||
.queue-package-card .pkg-toggle {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
border-radius: 3px;
|
||||
font-size: 12px;
|
||||
background: transparent;
|
||||
border-color: color-mix(in srgb, var(--border) 42%, transparent);
|
||||
}
|
||||
|
||||
.pkg-toggle:hover {
|
||||
border-color: var(--accent);
|
||||
color: var(--text);
|
||||
@@ -1837,14 +2006,21 @@ body,
|
||||
}
|
||||
|
||||
.progress {
|
||||
margin-top: 8px;
|
||||
height: 7px;
|
||||
margin-top: 6px;
|
||||
height: 6px;
|
||||
border-radius: 999px;
|
||||
background: var(--progress-track);
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.queue-package-card .progress {
|
||||
margin-top: 0;
|
||||
height: 2px;
|
||||
border-radius: 0;
|
||||
background: color-mix(in srgb, var(--progress-track) 80%, transparent);
|
||||
}
|
||||
|
||||
.progress-dl {
|
||||
height: 100%;
|
||||
background: linear-gradient(90deg, #3bc9ff, #22d3ee);
|
||||
@@ -1945,12 +2121,22 @@ td {
|
||||
/* grid-template-columns set via inline style from columnOrder */
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
margin: 0 -12px;
|
||||
padding: 4px 12px;
|
||||
font-size: 13px;
|
||||
margin: 0 -10px;
|
||||
padding: 3px 10px;
|
||||
font-size: 12px;
|
||||
border-top: 1px solid color-mix(in srgb, var(--border) 40%, transparent);
|
||||
}
|
||||
|
||||
.queue-package-card .item-row {
|
||||
margin: 0;
|
||||
padding: 2px 10px 2px 10px;
|
||||
border-top: 0;
|
||||
}
|
||||
|
||||
.queue-package-card .item-row + .item-row {
|
||||
border-top: 1px solid color-mix(in srgb, var(--border) 24%, transparent);
|
||||
}
|
||||
|
||||
.item-row:hover {
|
||||
background: color-mix(in srgb, var(--accent) 5%, transparent);
|
||||
}
|
||||
@@ -1960,7 +2146,7 @@ td {
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: var(--muted);
|
||||
font-size: 13px;
|
||||
font-size: 12px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@@ -1970,7 +2156,7 @@ td {
|
||||
|
||||
.item-row .pkg-col-name {
|
||||
color: var(--text);
|
||||
padding-left: 32px;
|
||||
padding-left: 28px;
|
||||
}
|
||||
|
||||
.link-status-dot {
|
||||
@@ -2522,6 +2708,17 @@ td {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
.account-subkey-row,
|
||||
.account-dl-key-limit-row {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.account-subkey-head {
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.account-picker-list {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user