Compare commits
No commits in common. "main" and "v2.0.0-beta.3" have entirely different histories.
main
...
v2.0.0-bet
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "real-debrid-downloader-beta",
|
"name": "real-debrid-downloader-beta",
|
||||||
"version": "2.0.0-beta.5",
|
"version": "2.0.0-beta.3",
|
||||||
"description": "Desktop downloader",
|
"description": "Desktop downloader",
|
||||||
"main": "build/main/main/main.js",
|
"main": "build/main/main/main.js",
|
||||||
"author": "Sucukdeluxe",
|
"author": "Sucukdeluxe",
|
||||||
|
|||||||
@ -36,7 +36,7 @@ export const MAX_LINK_ARTIFACT_BYTES = 256 * 1024;
|
|||||||
export const SPEED_WINDOW_SECONDS = 1;
|
export const SPEED_WINDOW_SECONDS = 1;
|
||||||
export const CLIPBOARD_POLL_INTERVAL_MS = 2000;
|
export const CLIPBOARD_POLL_INTERVAL_MS = 2000;
|
||||||
|
|
||||||
export const DEFAULT_UPDATE_REPO = "Administrator/beta-real-debrid-downloader";
|
export const DEFAULT_UPDATE_REPO = "Administrator/real-debrid-downloader";
|
||||||
|
|
||||||
export function defaultSettings(): AppSettings {
|
export function defaultSettings(): AppSettings {
|
||||||
const baseDir = path.join(os.homedir(), "Downloads", "RealDebrid");
|
const baseDir = path.join(os.homedir(), "Downloads", "RealDebrid");
|
||||||
|
|||||||
@ -1594,47 +1594,16 @@ export class DownloadManager extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private normalizeSessionStatuses(): void {
|
private normalizeSessionStatuses(): void {
|
||||||
// Critical: reset session-level running state on startup.
|
|
||||||
// Without this, if the app crashes while running, session.running stays true
|
|
||||||
// in the persisted JSON and start() silently returns on next launch.
|
|
||||||
this.session.running = false;
|
|
||||||
this.session.paused = false;
|
|
||||||
this.session.reconnectUntil = 0;
|
|
||||||
this.session.reconnectReason = "";
|
|
||||||
|
|
||||||
for (const item of Object.values(this.session.items)) {
|
for (const item of Object.values(this.session.items)) {
|
||||||
// Items that were stopped mid-run should be re-queued
|
if (item.status === "downloading" || item.status === "validating" || item.status === "integrity_check") {
|
||||||
if (item.status === "cancelled" && item.fullStatus === "Gestoppt") {
|
|
||||||
item.status = "queued";
|
item.status = "queued";
|
||||||
item.fullStatus = "Wartet";
|
item.fullStatus = "Wartet";
|
||||||
item.lastError = "";
|
|
||||||
item.speedBps = 0;
|
|
||||||
item.provider = null;
|
|
||||||
item.updatedAt = nowMs();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
// Items that were extracting/checking integrity are already fully downloaded
|
|
||||||
if (item.status === "extracting" || item.status === "integrity_check") {
|
|
||||||
item.status = "completed";
|
|
||||||
item.fullStatus = `Fertig (${humanSize(item.downloadedBytes)})`;
|
|
||||||
item.speedBps = 0;
|
|
||||||
item.updatedAt = nowMs();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
// Active/paused/reconnecting items → re-queue
|
|
||||||
if (item.status === "downloading" || item.status === "validating"
|
|
||||||
|| item.status === "paused" || item.status === "reconnect_wait") {
|
|
||||||
item.status = "queued";
|
|
||||||
const pkg = this.session.packages[item.packageId];
|
|
||||||
item.fullStatus = (pkg && pkg.enabled === false) ? "Paket gestoppt" : "Wartet";
|
|
||||||
item.speedBps = 0;
|
item.speedBps = 0;
|
||||||
item.updatedAt = nowMs();
|
item.updatedAt = nowMs();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (const pkg of Object.values(this.session.packages)) {
|
for (const pkg of Object.values(this.session.packages)) {
|
||||||
if (pkg.status === "downloading" || pkg.status === "validating"
|
if (pkg.status === "downloading" || pkg.status === "validating" || pkg.status === "extracting") {
|
||||||
|| pkg.status === "extracting" || pkg.status === "integrity_check"
|
|
||||||
|| pkg.status === "paused" || pkg.status === "reconnect_wait") {
|
|
||||||
pkg.status = "queued";
|
pkg.status = "queued";
|
||||||
pkg.updatedAt = nowMs();
|
pkg.updatedAt = nowMs();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -46,7 +46,7 @@ afterEach(() => {
|
|||||||
|
|
||||||
describe("update", () => {
|
describe("update", () => {
|
||||||
it("normalizes update repo input", () => {
|
it("normalizes update repo input", () => {
|
||||||
expect(normalizeUpdateRepo("")).toBe("Administrator/beta-real-debrid-downloader");
|
expect(normalizeUpdateRepo("")).toBe("Administrator/real-debrid-downloader");
|
||||||
expect(normalizeUpdateRepo("owner/repo")).toBe("owner/repo");
|
expect(normalizeUpdateRepo("owner/repo")).toBe("owner/repo");
|
||||||
expect(normalizeUpdateRepo("https://codeberg.org/owner/repo")).toBe("owner/repo");
|
expect(normalizeUpdateRepo("https://codeberg.org/owner/repo")).toBe("owner/repo");
|
||||||
expect(normalizeUpdateRepo("https://www.codeberg.org/owner/repo")).toBe("owner/repo");
|
expect(normalizeUpdateRepo("https://www.codeberg.org/owner/repo")).toBe("owner/repo");
|
||||||
@ -518,14 +518,14 @@ describe("normalizeUpdateRepo extended", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("returns default for malformed inputs", () => {
|
it("returns default for malformed inputs", () => {
|
||||||
expect(normalizeUpdateRepo("just-one-part")).toBe("Administrator/beta-real-debrid-downloader");
|
expect(normalizeUpdateRepo("just-one-part")).toBe("Administrator/real-debrid-downloader");
|
||||||
expect(normalizeUpdateRepo(" ")).toBe("Administrator/beta-real-debrid-downloader");
|
expect(normalizeUpdateRepo(" ")).toBe("Administrator/real-debrid-downloader");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("rejects traversal-like owner or repo segments", () => {
|
it("rejects traversal-like owner or repo segments", () => {
|
||||||
expect(normalizeUpdateRepo("../owner/repo")).toBe("Administrator/beta-real-debrid-downloader");
|
expect(normalizeUpdateRepo("../owner/repo")).toBe("Administrator/real-debrid-downloader");
|
||||||
expect(normalizeUpdateRepo("owner/../repo")).toBe("Administrator/beta-real-debrid-downloader");
|
expect(normalizeUpdateRepo("owner/../repo")).toBe("Administrator/real-debrid-downloader");
|
||||||
expect(normalizeUpdateRepo("https://codeberg.org/owner/../../repo")).toBe("Administrator/beta-real-debrid-downloader");
|
expect(normalizeUpdateRepo("https://codeberg.org/owner/../../repo")).toBe("Administrator/real-debrid-downloader");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("handles www prefix", () => {
|
it("handles www prefix", () => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user