wip

2026-03-06 17:56:17 +00:00 · 2024-11-23 22:42:04 +01:00
parent 4699ee9c18
commit 55f8af7069
13 changed files with 366 additions and 310 deletions
--- a/components/BitrateSelector.tsx
+++ b/components/BitrateSelector.tsx
@@ -6,7 +6,6 @@ import { useMemo } from "react";
 export type Bitrate = {
  key: string;
  value: number | undefined;
-  height?: number;
 };

 export const BITRATES: Bitrate[] = [
@@ -27,17 +26,14 @@ export const BITRATES: Bitrate[] = [
  {
    key: "2 Mb/s",
    value: 2000000,
-    height: 720,
  },
  {
    key: "500 Kb/s",
    value: 500000,
-    height: 480,
  },
  {
    key: "250 Kb/s",
    value: 250000,
-    height: 480,
  },
 ].sort((a, b) => (b.value || Infinity) - (a.value || Infinity));

--- a/components/DownloadItem.tsx
+++ b/components/DownloadItem.tsx
@@ -31,6 +31,7 @@ import { Loader } from "./Loader";
 import { MediaSourceSelector } from "./MediaSourceSelector";
 import ProgressCircle from "./ProgressCircle";
 import { SubtitleTrackSelector } from "./SubtitleTrackSelector";
+import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";

 interface DownloadProps extends ViewProps {
  item: BaseItemDto;
@@ -42,7 +43,7 @@ export const DownloadItem: React.FC<DownloadProps> = ({ item, ...props }) => {
  const [queue, setQueue] = useAtom(queueAtom);
  const [settings] = useSettings();
  const { processes, startBackgroundDownload } = useDownload();
-  const { startRemuxing } = useRemuxHlsToMp4(item);
+  const { startRemuxing } = useRemuxHlsToMp4();

  const [selectedMediaSource, setSelectedMediaSource] = useState<
    MediaSourceInfo | undefined | null
@@ -98,73 +99,33 @@ export const DownloadItem: React.FC<DownloadProps> = ({ item, ...props }) => {
      );
    }

-    const response = await api.axiosInstance.post(
-      `${api.basePath}/Items/${item.Id}/PlaybackInfo`,
-      {
-        DeviceProfile: native,
-        UserId: user.Id,
-        MaxStreamingBitrate: maxBitrate.value,
-        StartTimeTicks: 0,
-        EnableTranscoding: maxBitrate.value ? true : undefined,
-        AutoOpenLiveStream: true,
-        AllowVideoStreamCopy: maxBitrate.value ? false : true,
-        MediaSourceId: selectedMediaSource?.Id,
-        AudioStreamIndex: selectedAudioStream,
-        SubtitleStreamIndex: selectedSubtitleStream,
-      },
-      {
-        headers: {
-          Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
-        },
-      }
-    );
+    const res = await getStreamUrl({
+      api,
+      item,
+      startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
+      userId: user?.Id,
+      audioStreamIndex: selectedAudioStream,
+      maxStreamingBitrate: maxBitrate.value,
+      mediaSourceId: selectedMediaSource.Id,
+      subtitleStreamIndex: selectedSubtitleStream,
+      deviceProfile: native,
+    });

-    let url: string | undefined = undefined;
-    let fileExtension: string | undefined | null = "mp4";
+    if (!res) return null;

-    const mediaSource: MediaSourceInfo = response.data.MediaSources.find(
-      (source: MediaSourceInfo) => source.Id === selectedMediaSource?.Id
-    );
+    const { mediaSource, url } = res;

-    if (!mediaSource) {
-      throw new Error("No media source");
-    }
-
-    if (mediaSource.SupportsDirectPlay) {
-      if (item.MediaType === "Video") {
-        url = `${api.basePath}/Videos/${item.Id}/stream.mp4?mediaSourceId=${item.Id}&static=true&mediaSourceId=${mediaSource.Id}&deviceId=${api.deviceInfo.id}&api_key=${api.accessToken}`;
-      } else if (item.MediaType === "Audio") {
-        console.log("Using direct stream for audio!");
-        const searchParams = new URLSearchParams({
-          UserId: user.Id,
-          DeviceId: api.deviceInfo.id,
-          MaxStreamingBitrate: "140000000",
-          Container:
-            "opus,webm|opus,mp3,aac,m4a|aac,m4b|aac,flac,webma,webm|webma,wav,ogg",
-          TranscodingContainer: "mp4",
-          TranscodingProtocol: "hls",
-          AudioCodec: "aac",
-          api_key: api.accessToken,
-          StartTimeTicks: "0",
-          EnableRedirection: "true",
-          EnableRemoteMedia: "false",
-        });
-        url = `${api.basePath}/Audio/${
-          item.Id
-        }/universal?${searchParams.toString()}`;
-      }
-    } else if (mediaSource.TranscodingUrl) {
-      url = `${api.basePath}${mediaSource.TranscodingUrl}`;
-      fileExtension = mediaSource.TranscodingContainer;
-    }
-
-    if (!url) throw new Error("No url");
-    if (!fileExtension) throw new Error("No file extension");
+    if (!url || !mediaSource) throw new Error("No url");
+    if (!mediaSource.TranscodingContainer) throw new Error("No file extension");

    if (settings?.downloadMethod === "optimized") {
-      return await startBackgroundDownload(url, item, fileExtension);
+      return await startBackgroundDownload(
+        url,
+        item,
+        mediaSource.TranscodingContainer
+      );
    } else {
-      return await startRemuxing(url);
+      return await startRemuxing(item, url, mediaSource);
    }
  }, [
    api,
@@ -203,7 +164,7 @@ export const DownloadItem: React.FC<DownloadProps> = ({ item, ...props }) => {
  const process = useMemo(() => {
    if (!processes) return null;

-    return processes.find((process) => process?.item?.Id === item.Id);
+    return processes.find((process) => process?.item?.item.Id === item.Id);
  }, [processes, item.Id]);

  return (
@@ -211,7 +172,7 @@ export const DownloadItem: React.FC<DownloadProps> = ({ item, ...props }) => {
      className="bg-neutral-800/80 rounded-full h-10 w-10 flex items-center justify-center"
      {...props}
    >
-      {process && process?.item.Id === item.Id ? (
+      {process && process?.item.item.Id === item.Id ? (
        <TouchableOpacity
          onPress={() => {
            router.push("/downloads");
--- a/components/downloads/ActiveDownloads.tsx
+++ b/components/downloads/ActiveDownloads.tsx
@@ -93,18 +93,20 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
  const eta = (p: JobStatus) => {
    if (!p.speed || !p.progress) return null;

-    const length = p?.item?.RunTimeTicks || 0;
+    const length = p?.item?.item.RunTimeTicks || 0;
    const timeLeft = (length - length * (p.progress / 100)) / p.speed;
    return formatTimeString(timeLeft, "tick");
  };

  const base64Image = useMemo(() => {
-    return storage.getString(process.item.Id!);
+    return storage.getString(process.item.item.Id!);
  }, []);

  return (
    <TouchableOpacity
-      onPress={() => router.push(`/(auth)/items/page?id=${process.item.Id}`)}
+      onPress={() =>
+        router.push(`/(auth)/items/page?id=${process.item.item.Id}`)
+      }
      className="relative bg-neutral-900 border border-neutral-800 rounded-2xl overflow-hidden"
      {...props}
    >
@@ -138,10 +140,12 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
            </View>
          )}
          <View className="shrink mb-1">
-            <Text className="text-xs opacity-50">{process.item.Type}</Text>
-            <Text className="font-semibold shrink">{process.item.Name}</Text>
+            <Text className="text-xs opacity-50">{process.item.item.Type}</Text>
+            <Text className="font-semibold shrink">
+              {process.item.item.Name}
+            </Text>
            <Text className="text-xs opacity-50">
-              {process.item.ProductionYear}
+              {process.item.item.ProductionYear}
            </Text>
            <View className="flex flex-row items-center space-x-2 mt-1 text-purple-600">
              {process.progress === 0 ? (
--- a/components/downloads/EpisodeCard.tsx
+++ b/components/downloads/EpisodeCard.tsx
@@ -7,7 +7,7 @@ import {
  useActionSheet,
 } from "@expo/react-native-action-sheet";

-import { useFileOpener } from "@/hooks/useDownloadedFileOpener";
+import { useDownloadedFileOpener } from "@/hooks/useDownloadedFileOpener";
 import { Text } from "../common/Text";
 import { useDownload } from "@/providers/DownloadProvider";
 import { storage } from "@/utils/mmkv";
@@ -26,7 +26,7 @@ interface EpisodeCardProps {
 */
 export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item }) => {
  const { deleteFile } = useDownload();
-  const { openFile } = useFileOpener();
+  const { openFile } = useDownloadedFileOpener();
  const { showActionSheetWithOptions } = useActionSheet();

  const base64Image = useMemo(() => {
--- a/components/downloads/MovieCard.tsx
+++ b/components/downloads/MovieCard.tsx
@@ -10,7 +10,7 @@ import {
 import { runtimeTicksToMinutes } from "@/utils/time";
 import { Text } from "../common/Text";

-import { useFileOpener } from "@/hooks/useDownloadedFileOpener";
+import { useDownloadedFileOpener } from "@/hooks/useDownloadedFileOpener";
 import { useDownload } from "@/providers/DownloadProvider";
 import { storage } from "@/utils/mmkv";
 import { Image } from "expo-image";
@@ -28,7 +28,7 @@ interface MovieCardProps {
 */
 export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
  const { deleteFile } = useDownload();
-  const { openFile } = useFileOpener();
+  const { openFile } = useDownloadedFileOpener();
  const { showActionSheetWithOptions } = useActionSheet();

  const handleOpenFile = useCallback(() => {
--- a/components/video-player/Controls.tsx
+++ b/components/video-player/Controls.tsx
@@ -116,9 +116,7 @@ export const Controls: React.FC<Props> = ({
  const [settings] = useSettings();
  const router = useRouter();
  const insets = useSafeAreaInsets();
-  const { setPlaySettings, playSettings } = usePlaySettings();
  const api = useAtomValue(apiAtom);
-  const windowDimensions = Dimensions.get("window");

  const { previousItem, nextItem } = useAdjacentItems({ item });
  const { trickPlayUrl, calculateTrickplayUrl, trickplayInfo } = useTrickplay(
@@ -157,14 +155,6 @@ export const Controls: React.FC<Props> = ({
    const { bitrate, mediaSource, audioIndex, subtitleIndex } =
      getDefaultPlaySettings(previousItem, settings);

-    setPlaySettings({
-      item: previousItem,
-      bitrate,
-      mediaSource,
-      audioIndex,
-      subtitleIndex,
-    });
-
    const queryParams = new URLSearchParams({
      itemId: previousItem.Id ?? "", // Ensure itemId is a string
      audioIndex: audioIndex?.toString() ?? "",
@@ -183,14 +173,6 @@ export const Controls: React.FC<Props> = ({
    const { bitrate, mediaSource, audioIndex, subtitleIndex } =
      getDefaultPlaySettings(nextItem, settings);

-    setPlaySettings({
-      item: nextItem,
-      bitrate,
-      mediaSource,
-      audioIndex,
-      subtitleIndex,
-    });
-
    const queryParams = new URLSearchParams({
      itemId: nextItem.Id ?? "", // Ensure itemId is a string
      audioIndex: audioIndex?.toString() ?? "",
@@ -374,6 +356,8 @@ export const Controls: React.FC<Props> = ({
        }))
        .filter((sub) => !sub.name.endsWith("[External]")) || [];

+    console.log("embeddedSubs ~", embeddedSubs);
+
    const externalSubs =
      mediaSource?.MediaStreams?.filter(
        (stream) => stream.Type === "Subtitle" && !!stream.DeliveryUrl