mirror of
https://github.com/hydralauncher/hydra.git
synced 2026-01-28 13:21:02 +00:00
Compare commits
10 Commits
feat/LBX-1
...
fix/librar
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92d87c5d33 | ||
|
|
af884d3772 | ||
|
|
dc31ac0831 | ||
|
|
9769eecec6 | ||
|
|
91adb97013 | ||
|
|
f138b2efcb | ||
|
|
991aa05760 | ||
|
|
aff9e13bca | ||
|
|
240a75c1d0 | ||
|
|
edbe86a1fb |
@@ -35,18 +35,27 @@ export class DownloadManager {
|
|||||||
): string | undefined {
|
): string | undefined {
|
||||||
if (originalUrl?.includes("#")) {
|
if (originalUrl?.includes("#")) {
|
||||||
const hashPart = originalUrl.split("#")[1];
|
const hashPart = originalUrl.split("#")[1];
|
||||||
if (hashPart && !hashPart.startsWith("http")) return hashPart;
|
if (hashPart && !hashPart.startsWith("http") && hashPart.includes(".")) {
|
||||||
|
return hashPart;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (url.includes("#")) {
|
if (url.includes("#")) {
|
||||||
const hashPart = url.split("#")[1];
|
const hashPart = url.split("#")[1];
|
||||||
if (hashPart && !hashPart.startsWith("http")) return hashPart;
|
if (hashPart && !hashPart.startsWith("http") && hashPart.includes(".")) {
|
||||||
|
return hashPart;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const urlObj = new URL(url);
|
const urlObj = new URL(url);
|
||||||
const filename = urlObj.pathname.split("/").pop();
|
const pathname = urlObj.pathname;
|
||||||
if (filename?.length) return filename;
|
const pathParts = pathname.split("/");
|
||||||
|
const filename = pathParts[pathParts.length - 1];
|
||||||
|
|
||||||
|
if (filename?.includes(".") && filename.length > 0) {
|
||||||
|
return decodeURIComponent(filename);
|
||||||
|
}
|
||||||
} catch {
|
} catch {
|
||||||
// Invalid URL
|
// Invalid URL
|
||||||
}
|
}
|
||||||
@@ -55,7 +64,7 @@ export class DownloadManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static sanitizeFilename(filename: string): string {
|
private static sanitizeFilename(filename: string): string {
|
||||||
return filename.replace(/[<>:"/\\|?*]/g, "_");
|
return filename.replaceAll(/[<>:"/\\|?*]/g, "_");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static createDownloadPayload(
|
private static createDownloadPayload(
|
||||||
@@ -64,13 +73,19 @@ export class DownloadManager {
|
|||||||
downloadId: string,
|
downloadId: string,
|
||||||
savePath: string
|
savePath: string
|
||||||
) {
|
) {
|
||||||
const filename = this.extractFilename(directUrl, originalUrl);
|
const filename =
|
||||||
|
this.extractFilename(originalUrl, directUrl) ||
|
||||||
|
this.extractFilename(directUrl);
|
||||||
const sanitizedFilename = filename
|
const sanitizedFilename = filename
|
||||||
? this.sanitizeFilename(filename)
|
? this.sanitizeFilename(filename)
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
if (sanitizedFilename) {
|
if (sanitizedFilename) {
|
||||||
logger.log(`[DownloadManager] Using filename: ${sanitizedFilename}`);
|
logger.log(`[DownloadManager] Using filename: ${sanitizedFilename}`);
|
||||||
|
} else {
|
||||||
|
logger.log(
|
||||||
|
`[DownloadManager] No filename extracted, aria2 will use default`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -227,10 +242,10 @@ export class DownloadManager {
|
|||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
gameFilesManager.extractDownloadedFile();
|
gameFilesManager.extractDownloadedFile();
|
||||||
} else {
|
} else if (download.folderName) {
|
||||||
gameFilesManager
|
gameFilesManager
|
||||||
.extractFilesInDirectory(
|
.extractFilesInDirectory(
|
||||||
path.join(download.downloadPath, download.folderName!)
|
path.join(download.downloadPath, download.folderName)
|
||||||
)
|
)
|
||||||
.then(() => gameFilesManager.setExtractionComplete());
|
.then(() => gameFilesManager.setExtractionComplete());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -221,6 +221,26 @@
|
|||||||
left: 0;
|
left: 0;
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__cover-placeholder {
|
||||||
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
min-width: 100%;
|
||||||
|
min-height: 100%;
|
||||||
|
background: linear-gradient(
|
||||||
|
90deg,
|
||||||
|
rgba(255, 255, 255, 0.08) 0%,
|
||||||
|
rgba(255, 255, 255, 0.04) 50%,
|
||||||
|
rgba(255, 255, 255, 0.08) 100%
|
||||||
|
);
|
||||||
|
border-radius: 4px;
|
||||||
|
color: rgba(255, 255, 255, 0.3);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
z-index: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes pulse {
|
@keyframes pulse {
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
import { LibraryGame } from "@types";
|
import { LibraryGame } from "@types";
|
||||||
import { useGameCard } from "@renderer/hooks";
|
import { useGameCard } from "@renderer/hooks";
|
||||||
import { memo } from "react";
|
import { memo, useState } from "react";
|
||||||
import { ClockIcon, AlertFillIcon, TrophyIcon } from "@primer/octicons-react";
|
import {
|
||||||
|
ClockIcon,
|
||||||
|
AlertFillIcon,
|
||||||
|
TrophyIcon,
|
||||||
|
ImageIcon,
|
||||||
|
} from "@primer/octicons-react";
|
||||||
import "./library-game-card.scss";
|
import "./library-game-card.scss";
|
||||||
|
|
||||||
interface LibraryGameCardProps {
|
interface LibraryGameCardProps {
|
||||||
@@ -25,14 +30,9 @@ export const LibraryGameCard = memo(function LibraryGameCard({
|
|||||||
const { formatPlayTime, handleCardClick, handleContextMenuClick } =
|
const { formatPlayTime, handleCardClick, handleContextMenuClick } =
|
||||||
useGameCard(game, onContextMenu);
|
useGameCard(game, onContextMenu);
|
||||||
|
|
||||||
const coverImage = (
|
const coverImage = game.coverImageUrl?.replaceAll("\\", "/") ?? "";
|
||||||
game.customIconUrl ??
|
|
||||||
game.coverImageUrl ??
|
const [imageError, setImageError] = useState(false);
|
||||||
game.libraryImageUrl ??
|
|
||||||
game.libraryHeroImageUrl ??
|
|
||||||
game.iconUrl ??
|
|
||||||
""
|
|
||||||
).replaceAll("\\", "/");
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
@@ -98,12 +98,19 @@ export const LibraryGameCard = memo(function LibraryGameCard({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<img
|
{imageError || !coverImage ? (
|
||||||
src={coverImage ?? undefined}
|
<div className="library-game-card__cover-placeholder">
|
||||||
alt={game.title}
|
<ImageIcon size={48} />
|
||||||
className="library-game-card__game-image"
|
</div>
|
||||||
loading="lazy"
|
) : (
|
||||||
/>
|
<img
|
||||||
|
src={coverImage}
|
||||||
|
alt={game.title}
|
||||||
|
className="library-game-card__game-image"
|
||||||
|
loading="lazy"
|
||||||
|
onError={() => setImageError(true)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user