chore: code improvements refactor

This commit is contained in:
Fredrik Burmester
2024-08-09 18:45:53 +02:00
parent c985acb9cd
commit f4e3a28056
11 changed files with 18 additions and 73 deletions

View File

@@ -1,7 +1,5 @@
import { Feather, FontAwesome, Ionicons } from "@expo/vector-icons";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import React, { useEffect } from "react";
import { TouchableOpacity, View } from "react-native";
import {
CastButton,
useCastDevice,
@@ -9,14 +7,13 @@ import {
useRemoteMediaClient,
} from "react-native-google-cast";
import GoogleCast from "react-native-google-cast";
import { Text } from "./common/Text";
type Props = {
item?: BaseItemDto | null;
startTimeTicks?: number | null;
};
export const Chromecast: React.FC<Props> = ({ item, startTimeTicks }) => {
export const Chromecast: React.FC<Props> = () => {
const client = useRemoteMediaClient();
const castDevice = useCastDevice();
const devices = useDevices();
@@ -26,43 +23,12 @@ export const Chromecast: React.FC<Props> = ({ item, startTimeTicks }) => {
useEffect(() => {
(async () => {
if (!discoveryManager) {
console.log("No discoveryManager client");
return;
}
await discoveryManager.startDiscovery();
const started = await discoveryManager.isRunning();
console.log({
devices,
castDevice,
sessionManager,
});
})();
}, [client, devices, castDevice, sessionManager, discoveryManager]);
const cast = () => {
if (!client) {
console.log("No chromecast client");
return;
}
client.loadMedia({
mediaInfo: {
contentUrl:
"https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/mp4/BigBuckBunny.mp4",
contentType: "video/mp4",
metadata: {
type: item?.Type === "Episode" ? "tvShow" : "movie",
title: item?.Name || "",
subtitle: item?.Overview || "",
},
streamDuration: Math.floor((item?.RunTimeTicks || 0) / 10000),
},
startTime: Math.floor((startTimeTicks || 0) / 10000),
});
};
return <CastButton style={{ tintColor: "white", height: 48, width: 48 }} />;
};

View File

@@ -42,8 +42,6 @@ export const DownloadItem: React.FC<DownloadProps> = ({
const source = playbackInfo.MediaSources?.[0];
console.log("Source:", JSON.stringify(source));
if (source?.SupportsDirectPlay && item.CanDownload) {
downloadMedia(item);
} else {

View File

@@ -1,13 +1,13 @@
import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { markAsNotPlayed } from "@/utils/jellyfin/playstate/markAsNotPlayed";
import { markAsPlayed } from "@/utils/jellyfin/playstate/markAsPlayed";
import { Ionicons } from "@expo/vector-icons";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { useQueryClient, InvalidateQueryFilters } from "@tanstack/react-query";
import { useQueryClient } from "@tanstack/react-query";
import * as Haptics from "expo-haptics";
import { useAtom } from "jotai";
import React, { useCallback } from "react";
import { TouchableOpacity, View } from "react-native";
import * as Haptics from "expo-haptics";
import { markAsNotPlayed } from "@/utils/jellyfin/playstate/markAsNotPlayed";
import { markAsPlayed } from "@/utils/jellyfin/playstate/markAsPlayed";
export const PlayedStatus: React.FC<{ item: BaseItemDto }> = ({ item }) => {
const [api] = useAtom(apiAtom);
@@ -18,23 +18,18 @@ export const PlayedStatus: React.FC<{ item: BaseItemDto }> = ({ item }) => {
const invalidateQueries = useCallback(() => {
queryClient.invalidateQueries({
queryKey: ["item", item.Id],
refetchType: "all",
});
queryClient.invalidateQueries({
queryKey: ["resumeItems", user?.Id],
refetchType: "all",
});
queryClient.invalidateQueries({
queryKey: ["nextUp", item.SeriesId],
refetchType: "all",
});
queryClient.invalidateQueries({
queryKey: ["episodes"],
refetchType: "all",
});
queryClient.invalidateQueries({
queryKey: ["seasons"],
refetchType: "all",
});
}, [api, item.Id, queryClient, user?.Id]);
@@ -42,13 +37,13 @@ export const PlayedStatus: React.FC<{ item: BaseItemDto }> = ({ item }) => {
<View>
{item.UserData?.Played ? (
<TouchableOpacity
onPress={() => {
markAsNotPlayed({
onPress={async () => {
Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
await markAsNotPlayed({
api: api,
itemId: item?.Id,
userId: user?.Id,
});
Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
invalidateQueries();
}}
>
@@ -56,13 +51,13 @@ export const PlayedStatus: React.FC<{ item: BaseItemDto }> = ({ item }) => {
</TouchableOpacity>
) : (
<TouchableOpacity
onPress={() => {
markAsPlayed({
onPress={async () => {
Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
await markAsPlayed({
api: api,
item: item,
userId: user?.Id,
});
Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
invalidateQueries();
}}
>

View File

@@ -105,8 +105,6 @@ export const VideoPlayer: React.FC<VideoPlayerProps> = ({
deviceProfile: castDevice?.deviceId ? chromecastProfile : ios12,
});
console.log("Transcode URL:", url);
onChangePlaybackURL(url);
return url;