Merge pull request #36 from nini22P/dev

v1.4.1

Author: nini22P

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
           # Create a directory to hold the files
           mkdir IRIS
           # Copy the build output to the IRIS directory
-          Copy-Item -Path "build\windows\x64\runner\Release\*" -Destination "IRIS" -Force
+          Copy-Item -Path "build\windows\x64\runner\Release\*" -Destination "IRIS" -Recurse -Force
           # Create a ZIP file
           Compress-Archive -Path "IRIS" -DestinationPath "IRIS-windows.zip"
       - name: Upload artifact
@@ -133,7 +133,7 @@ jobs:
         id: tag_name
         run: |
           VERSION="${{ steps.yq.outputs.result }}"
-          TAG_NAME="v${VERSION}"
+          TAG_NAME="v${VERSION%%+*}"
           echo "TAG_NAME=$TAG_NAME" >> "$GITHUB_OUTPUT"
       - name: Check tag
         uses: mukunku/tag-exists-action@v1.6.0

CHANGELOG.md

@@ -1,3 +1,13 @@
+## v1.4.1
+
+### Changelog
+
+* Dynamic FTP streaming url
+
+### 更新日志
+
+* FTP 串流使用动态 url
+
 ## v1.4.0
 
 ### Changelog

inno.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "IRIS"
-#define MyAppVersion "1.4.0"
+#define MyAppVersion "1.4.1"
 #define MyAppPublisher "nini22P"
 #define MyAppURL "https://github.com/nini22P/iris"
 #define MyAppExeName "iris.exe"

lib/hooks/use_fvp_player.dart

@@ -7,6 +7,7 @@ import 'package:iris/globals.dart' as globals;
 import 'package:iris/models/file.dart';
 import 'package:iris/models/player.dart';
 import 'package:iris/models/progress.dart';
+import 'package:iris/models/storages/storage.dart';
 import 'package:iris/models/store/app_state.dart';
 import 'package:iris/store/use_app_store.dart';
 import 'package:iris/store/use_history_store.dart';
@@ -15,6 +16,7 @@ import 'package:iris/store/use_storage_store.dart';
 import 'package:iris/utils/check_data_source_type.dart';
 import 'package:iris/utils/logger.dart';
 import 'package:iris/utils/platform.dart';
+import 'package:media_stream/media_stream.dart';
 import 'package:saf_util/saf_util.dart';
 import 'package:video_player/video_player.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
@@ -60,6 +62,9 @@ FvpPlayer useFvpPlayer(BuildContext context) {
 
   Future<void> init() async => initValue.value = true;
 
+  MediaStream mediaStream = MediaStream();
+  final streamUrl = mediaStream.url;
+
   final controllerFuture = useMemoized(() async {
     if (file == null) return VideoPlayerController.networkUrl(Uri.parse(''));
     isInitializing.value = true;
@@ -79,7 +84,9 @@ FvpPlayer useFvpPlayer(BuildContext context) {
         );
       default:
         return VideoPlayerController.networkUrl(
-          Uri.parse(file.uri),
+          Uri.parse(file.storageType == StorageType.ftp
+              ? '$streamUrl/${file.uri}'
+              : file.uri),
           httpHeaders: auth != null ? {'authorization': auth} : {},
         );
     }
@@ -167,17 +174,21 @@ FvpPlayer useFvpPlayer(BuildContext context) {
       } else if (externalSubtitle.value! < externalSubtitles.length) {
         bool isExists = true;
 
+        final uri = file?.storageType == StorageType.ftp
+            ? '$streamUrl/${externalSubtitles[currentExternalSubtitle].uri}'
+            : externalSubtitles[currentExternalSubtitle].uri;
+
+        logger('External subtitle uri: $uri');
+
         if (Platform.isAndroid &&
             externalSubtitles[currentExternalSubtitle]
                 .uri
                 .startsWith('content://')) {
-          isExists = await SafUtil()
-              .exists(externalSubtitles[currentExternalSubtitle].uri, false);
+          isExists = await SafUtil().exists(uri, false);
         }
 
         if (isExists) {
-          controller.setExternalSubtitle(
-              externalSubtitles[currentExternalSubtitle].uri);
+          controller.setExternalSubtitle(uri);
         } else {
           externalSubtitle.value = null;
         }

lib/hooks/use_media_kit_player.dart

@@ -7,6 +7,7 @@ import 'package:iris/globals.dart' as globals;
 import 'package:iris/models/file.dart';
 import 'package:iris/models/player.dart';
 import 'package:iris/models/progress.dart';
+import 'package:iris/models/storages/storage.dart';
 import 'package:iris/models/store/app_state.dart';
 import 'package:iris/store/use_app_store.dart';
 import 'package:iris/store/use_history_store.dart';
@@ -16,6 +17,7 @@ import 'package:iris/utils/logger.dart';
 import 'package:iris/utils/platform.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
+import 'package:media_stream/media_stream.dart';
 import 'package:path_provider/path_provider.dart';
 
 MediaKitPlayer useMediaKitPlayer(BuildContext context) {
@@ -130,6 +132,9 @@ MediaKitPlayer useMediaKitPlayer(BuildContext context) {
 
   final isInitializing = useState(false);
 
+  MediaStream mediaStream = MediaStream();
+  final streamUrl = mediaStream.url;
+
   Future<void> init(FileItem file) async {
     if (file.uri == '') return;
     isInitializing.value = true;
@@ -140,7 +145,9 @@ MediaKitPlayer useMediaKitPlayer(BuildContext context) {
       logger('Open file: $file');
       await player.open(
         Media(
-          file.uri,
+          file.storageType == StorageType.ftp
+              ? '$streamUrl/${file.uri}'
+              : file.uri,
           httpHeaders: auth != null ? {'authorization': auth} : {},
         ),
         play: autoPlay,
@@ -202,9 +209,13 @@ MediaKitPlayer useMediaKitPlayer(BuildContext context) {
       // 设置字幕
       if (externalSubtitles!.isNotEmpty) {
         logger('Set external subtitle: ${externalSubtitles[0]}');
+        final uri = file?.storageType == StorageType.ftp
+            ? '$streamUrl/${externalSubtitles[0].uri}'
+            : externalSubtitles[0].uri;
+        logger('External subtitle uri: $uri');
         await player.setSubtitleTrack(
           SubtitleTrack.uri(
-            externalSubtitles[0].uri,
+            uri,
             title: externalSubtitles[0].name,
           ),
         );

lib/models/storages/ftp.dart

@@ -33,7 +33,7 @@ Future<List<FileItem>> getFTPFiles(
     await client.disconnect();
 
     final baseUri =
-        'http://localhost:8760/ftp?host=${storage.host}&port=${storage.port}&path=${path.join('/').replaceFirst('//', '/')}';
+        'ftp?host=${storage.host}&port=${storage.port}&path=${path.join('/').replaceFirst('//', '/')}';
 
     return await Future.wait(files.map(
       (file) async => FileItem(