diff --git a/lib/voe-account-storage.js b/lib/voe-account-storage.js index 565c883..b385d72 100644 --- a/lib/voe-account-storage.js +++ b/lib/voe-account-storage.js @@ -15,7 +15,7 @@ function parseVoeAccountStorage(html) { if (spans.length !== 2 || !/\bfloat-end\b/.test(spans[1][1])) continue; const used = parseStorageAmount(spans[0][2]); const total = parseStorageAmount(spans[1][2]); - if (used && total && total.value > 0) return { used, total }; + if (used && total && total.value > 0) return { used, total, unitBase: 1024 }; } return null; } diff --git a/package-lock.json b/package-lock.json index d5ba411..d531077 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "multi-hoster-uploader", - "version": "2.1.51", + "version": "2.1.52", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "multi-hoster-uploader", - "version": "2.1.51", + "version": "2.1.52", "dependencies": { "chokidar": "^3.6.0", "undici": "^7.29.0", diff --git a/package.json b/package.json index c397da5..78965f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "multi-hoster-uploader", - "version": "2.1.51", + "version": "2.1.52", "description": "Upload files to doodstream, voe, vidmoly, byse simultaneously", "main": "main.js", "scripts": { diff --git a/renderer/account-status.js b/renderer/account-status.js index 33894dc..d5840cb 100644 --- a/renderer/account-status.js +++ b/renderer/account-status.js @@ -62,7 +62,19 @@ const used = formatAmount(storage?.used); const total = formatAmount(storage?.total); if (!used || !total || storage.total.value <= 0) return null; - return `${used} ${String(locale).startsWith('de') ? 'von' : 'of'} ${total}`; + const toBytes = amount => { + const exponent = 'BKMGTPE'.indexOf(amount.unit[0]); + const base = amount.unit.includes('I') ? 1024 : storage.unitBase; + if (exponent > 0 && base !== 1024 && base !== 1000) return null; + return amount.value * (exponent === 0 ? 1 : base ** exponent); + }; + const usedBytes = toBytes(storage.used); + const totalBytes = toBytes(storage.total); + const percent = Number.isFinite(usedBytes) && Number.isFinite(totalBytes) && totalBytes > 0 ? usedBytes / totalBytes * 100 : null; + const percentageText = percent !== null && Number.isFinite(percent) + ? ` (${new Intl.NumberFormat(locale, { maximumFractionDigits: 1 }).format(percent)}%)` + : ''; + return `${used} ${String(locale).startsWith('de') ? 'von' : 'of'} ${total}${percentageText}`; } const accountStatus = { diff --git a/renderer/app.js b/renderer/app.js index abe17eb..e22d309 100644 --- a/renderer/app.js +++ b/renderer/app.js @@ -7614,7 +7614,7 @@ function _buildAccountCardHtml(name, account, idx) { const checkLabel = statusPresentation.requiresOtp ? 'Neuen Code anfordern' : 'Prüfen'; const storageText = name === 'voe.sx' ? window.AccountStatus.formatAccountStorage(st.storage, getUiLocale()) : null; const storageHtml = storageText - ? `
${escapeHtml(localizeUiText('Speicher'))}: ${escapeHtml(storageText)}
` + ? `
${escapeHtml(localizeUiText('Speicher'))}: ${escapeHtml(storageText)}
` : ''; const sessionPauseKey = `${name}:${account.id}`; diff --git a/renderer/styles.css b/renderer/styles.css index 4dc3a21..87f5197 100644 --- a/renderer/styles.css +++ b/renderer/styles.css @@ -1531,18 +1531,21 @@ select.hs-input { max-width: none; width: auto; min-width: 140px; } } .account-card:hover { background: var(--bg-card-hover); } .account-card-info { flex: 1; min-width: 0; } -.account-card-storage { font-size: 12px; color: var(--text-muted); margin-top: 4px; overflow-wrap: anywhere; } +.account-card-storage { display: flex; align-items: flex-start; gap: 7px; font-size: 13px; line-height: 1.5; color: var(--text-muted); margin-top: 5px; overflow-wrap: anywhere; } +.account-card-storage > span { min-width: 0; } +.account-storage-icon { width: 17px; height: 17px; flex: 0 0 17px; margin-top: 1px; } .account-card-title { font-size: 14px; font-weight: 600; } -.account-card-subtitle { font-size: 11px; color: var(--text-muted); margin-top: 2px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.account-card-subtitle { font-size: 13px; line-height: 1.5; color: var(--text-muted); margin-top: 3px; overflow-wrap: anywhere; } .account-otp-action { display: flex; align-items: center; gap: 6px; margin-top: 8px; } .account-otp-input { width: 150px; min-height: 28px; padding: 5px 8px; font-size: 11px; } .account-card-actions { display: flex; gap: 6px; flex-shrink: 0; } +.account-card .account-status { font-size: 12px; } .account-status { display: inline-flex; align-items: center; gap: 5px; - font-size: 11px; + font-size: 12px; padding: 3px 10px; border-radius: 4px; font-weight: 600; diff --git a/scripts/verify-public-release.mjs b/scripts/verify-public-release.mjs index 73cd1ec..126357c 100644 --- a/scripts/verify-public-release.mjs +++ b/scripts/verify-public-release.mjs @@ -70,6 +70,7 @@ const sourceFiles = [ 'lib/upload-manager.js', 'lib/vidmoly-upload.js', 'lib/voe-upload.js', + 'lib/voe-account-storage.js', 'lib/webhook-notify.js', 'main.js', 'package-lock.json',