Mirrors/movie-web
2
0
Fork 0
mirror of https://github.com/movie-web/movie-web.git synced 2024-12-28 17:31:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/movie-web/movie-web into exclude-dev-routes

Browse Source
This commit is contained in:
frost768 2023-03-31 21:11:44 +03:00
commit ba1ee0267b
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/providers/flixhq.ts
View File

@ -10,12 +10,13 @@ import { MWMediaType } from "../metadata/types";
const flixHqBase = "https://api.consumet.org/meta/tmdb"; const flixHqBase = "https://api.consumet.org/meta/tmdb";
type FlixHQMediaType = "Movie" | "TV Series";
interface FLIXMediaBase { interface FLIXMediaBase {
id: number; id: number;
title: string; title: string;
url: string; url: string;
image: string; image: string;
type: "Movie" | "TV Series"; type: FlixHQMediaType;
releaseDate: string; releaseDate: string;
} }
@ -38,9 +39,9 @@ const qualityMap: Record<string, MWStreamQuality> = {
"1080": MWStreamQuality.Q1080P, "1080": MWStreamQuality.Q1080P,
}; };
enum FlixHQMediaType { function flixTypeToMWType(type: FlixHQMediaType) {
MOVIE = "movie", if (type === "Movie") return MWMediaType.MOVIE;
SERIES = "series", return MWMediaType.SERIES;
} }
registerProvider({ registerProvider({
@ -48,7 +49,6 @@ registerProvider({
displayName: "FlixHQ", displayName: "FlixHQ",
rank: 100, rank: 100,
type: [MWMediaType.MOVIE, MWMediaType.SERIES], type: [MWMediaType.MOVIE, MWMediaType.SERIES],
async scrape({ media, episode, progress }) { async scrape({ media, episode, progress }) {
if (!this.type.includes(media.meta.type)) { if (!this.type.includes(media.meta.type)) {
throw new Error("Unsupported type"); throw new Error("Unsupported type");
@ -65,9 +65,11 @@ registerProvider({
if (v.type !== "Movie" && v.type !== "TV Series") return false; if (v.type !== "Movie" && v.type !== "TV Series") return false;
return ( return (
compareTitle(v.title, media.meta.title) && compareTitle(v.title, media.meta.title) &&
flixTypeToMWType(v.type) === media.meta.type &&
v.releaseDate === media.meta.year v.releaseDate === media.meta.year
); );
}); });
if (!foundItem) throw new Error("No watchable item found"); if (!foundItem) throw new Error("No watchable item found");
// get media info // get media info
@ -75,15 +77,12 @@ registerProvider({
const mediaInfo = await proxiedFetch<any>(`/info/${foundItem.id}`, { const mediaInfo = await proxiedFetch<any>(`/info/${foundItem.id}`, {
baseURL: flixHqBase, baseURL: flixHqBase,
params: { params: {
type: type: flixTypeToMWType(foundItem.type),
media.meta.type === MWMediaType.MOVIE
? FlixHQMediaType.MOVIE
: FlixHQMediaType.SERIES,
}, },
}); });
if (!mediaInfo.id) throw new Error("No watchable item found"); if (!mediaInfo.id) throw new Error("No watchable item found");
// get stream info from media // get stream info from media
progress(75); progress(50);
let episodeId: string | undefined; let episodeId: string | undefined;
if (media.meta.type === MWMediaType.MOVIE) { if (media.meta.type === MWMediaType.MOVIE) {
@ -98,7 +97,7 @@ registerProvider({
episodeId = season.episodes.find((o: any) => o.episode === episodeNo).id; episodeId = season.episodes.find((o: any) => o.episode === episodeNo).id;
} }
if (!episodeId) throw new Error("No watchable item found"); if (!episodeId) throw new Error("No watchable item found");
progress(75);
const watchInfo = await proxiedFetch<any>(`/watch/${episodeId}`, { const watchInfo = await proxiedFetch<any>(`/watch/${episodeId}`, {
baseURL: flixHqBase, baseURL: flixHqBase,
params: { params: {

2
src/hooks/useSearchQuery.ts
View File

@ -6,7 +6,7 @@ function getInitialValue(params: { type: string; query: string }) {
const type = const type =
Object.values(MWMediaType).find((v) => params.type === v) || Object.values(MWMediaType).find((v) => params.type === v) ||
MWMediaType.MOVIE; MWMediaType.MOVIE;
const searchQuery = params.query || ""; const searchQuery = decodeURIComponent(params.query || "");
return { type, searchQuery }; return { type, searchQuery };
} }

10
src/video/components/actions/KeyboardShortcutsAction.tsx
View File

@ -63,6 +63,16 @@ export function KeyboardShortcutsAction() {
toggleVolume(); toggleVolume();
break; break;
// Decrease volume
case "arrowdown":
controls.setVolume(Math.max(mediaPlaying.volume - 0.1, 0));
break;
// Increase volume
case "arrowup":
controls.setVolume(Math.min(mediaPlaying.volume + 0.1, 1));
break;
// Do a barrel Roll! // Do a barrel Roll!
case "r": case "r":
if (isRolling || evt.ctrlKey || evt.metaKey) return; if (isRolling || evt.ctrlKey || evt.metaKey) return;