gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-14 09:46:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Improve urls/paths joining

Browse source
This commit is contained in:
PartyDonut 2025-02-07 16:24:00 +01:00
parent 8012fdcea8
commit 2a5e2b4be1
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/models/playback/playback_model.dart
View file

@ -3,6 +3,7 @@ import 'dart:developer';
import 'package:chopper/chopper.dart'; import 'package:chopper/chopper.dart';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:path/path.dart';
import 'package:fladder/jellyfin/jellyfin_open_api.swagger.dart'; import 'package:fladder/jellyfin/jellyfin_open_api.swagger.dart';
import 'package:fladder/models/item_base_model.dart'; import 'package:fladder/models/item_base_model.dart';
@ -224,6 +225,7 @@ class PlaybackModelHelper {
} }
final params = Uri(queryParameters: directOptions).query; final params = Uri(queryParameters: directOptions).query;
final playbackUrl = joinAll([ref.read(userProvider)!.server, "Videos", mediaSource.id!, "stream?$params"]);
return DirectPlaybackModel( return DirectPlaybackModel(
item: fullItem.body ?? item, item: fullItem.body ?? item,
@ -233,7 +235,7 @@ class PlaybackModelHelper {
playbackInfo: playbackInfo, playbackInfo: playbackInfo,
trickPlay: trickPlay, trickPlay: trickPlay,
media: Media( media: Media(
url: mediaPath ?? '${ref.read(userProvider)?.server ?? ""}/Videos/${mediaSource.id}/stream?$params', url: mediaPath ?? playbackUrl,
), ),
mediaStreams: mediaStreamsWithUrls, mediaStreams: mediaStreamsWithUrls,
); );

3
lib/screens/photo_viewer/simple_video_player.dart
View file

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:ficonsax/ficonsax.dart'; import 'package:ficonsax/ficonsax.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:path/path.dart';
import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:wakelock_plus/wakelock_plus.dart';
import 'package:window_manager/window_manager.dart'; import 'package:window_manager/window_manager.dart';
@ -92,7 +93,7 @@ class _SimpleVideoPlayerState extends ConsumerState<SimpleVideoPlayer> with Wind
player.init(ref.read(videoPlayerSettingsProvider)); player.init(ref.read(videoPlayerSettingsProvider));
videoUrl = '${ref.read(userProvider)?.server ?? ""}/Videos/${widget.video.id}/stream?$params'; videoUrl = joinAll([ref.read(userProvider)?.server ?? "", "Videos", widget.video.id, "stream?$params"]);
subscriptions.add(player.stateStream.listen((event) { subscriptions.add(player.stateStream.listen((event) {
setState(() { setState(() {