基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
feat(windows): add custom download directory (#2300)
NanoShiki4d840164b5ad
diff --git a/lib/pages/download/download_controller.dart b/lib/pages/download/download_controller.dartindex 34aa6de7..9df68f18 100644--- a/lib/pages/download/download_controller.dart+++ b/lib/pages/download/download_controller.dart@@ -878,10 +878,16 @@ abstract class _DownloadController with Store {Future<void> cancelDownload(int bangumiId, String pluginName, int episodeNumber) async {final recordKey = '${pluginName}_$bangumiId';+ final episode =+ _repository.getEpisode(bangumiId, pluginName, episodeNumber);_downloadManager.cancel(recordKey, episodeNumber);_cancelResolve(recordKey, episodeNumber);await _downloadManager.deleteEpisodeFiles(- bangumiId, pluginName, episodeNumber);+ bangumiId,+ pluginName,+ episodeNumber,+ episode: episode,+ );await _repository.deleteEpisode(recordKey, episodeNumber);_refreshRecord(recordKey);_queueBackgroundNotificationUpdate();@@ -897,7 +903,11 @@ abstract class _DownloadController with Store {}}_cancelResolveRecord(recordKey);- await _downloadManager.deleteRecordFiles(bangumiId, pluginName);+ await _downloadManager.deleteRecordFiles(+ bangumiId,+ pluginName,+ record: record,+ );await _repository.deleteRecord(recordKey);_refreshRecord(recordKey);_queueBackgroundNotificationUpdate();@@ -909,8 +919,14 @@ abstract class _DownloadController with Store {_downloadManager.cancel(recordKey, episodeNumber);_speeds.remove('${recordKey}_$episodeNumber');_cancelResolve(recordKey, episodeNumber);+ final episode =+ _repository.getEpisode(bangumiId, pluginName, episodeNumber);await _downloadManager.deleteEpisodeFiles(- bangumiId, pluginName, episodeNumber);+ bangumiId,+ pluginName,+ episodeNumber,+ episode: episode,+ );await _repository.deleteEpisode(recordKey, episodeNumber);_refreshRecord(recordKey);_queueBackgroundNotificationUpdate();diff --git a/lib/pages/settings/download_settings.dart b/lib/pages/settings/download_settings.dartindex 9bc6258a..8092e2e9 100644--- a/lib/pages/settings/download_settings.dart+++ b/lib/pages/settings/download_settings.dart@@ -1,7 +1,12 @@+import 'dart:io';+import 'package:flutter/material.dart';import 'package:kazumi/bean/appbar/sys_app_bar.dart';+import 'package:kazumi/bean/dialog/dialog_helper.dart';import 'package:kazumi/services/storage/storage.dart';+import 'package:kazumi/utils/file_system.dart';import 'package:card_settings_ui/card_settings_ui.dart';+import 'package:file_picker/file_picker.dart';class DownloadSettingsPage extends StatefulWidget {const DownloadSettingsPage({super.key});@@ -14,6 +19,9 @@ class _DownloadSettingsPageState extends State<DownloadSettingsPage> {late int parallelEpisodes;late int parallelSegments;late bool downloadDanmaku;+ String downloadDirectory = '';+ String defaultDownloadDirectory = '';+ bool isSelectingDirectory = false;@overridevoid initState() {@@ -23,6 +31,73 @@ class _DownloadSettingsPageState extends State<DownloadSettingsPage> {parallelSegments =GStorage.getSetting(SettingsKeys.downloadParallelSegments);downloadDanmaku = GStorage.getSetting(SettingsKeys.downloadDanmaku);+ downloadDirectory =+ GStorage.getSetting(SettingsKeys.downloadDirectory).trim();+ _loadDefaultDownloadDirectory();+ }++ bool get _canPickDirectory => supportsCustomDownloadDirectory;++ bool get _hasCustomDirectory =>+ _canPickDirectory && downloadDirectory.isNotEmpty;++ String get _effectiveDownloadDirectory =>+ _hasCustomDirectory ? downloadDirectory : defaultDownloadDirectory;++ Future<void> _loadDefaultDownloadDirectory() async {+ final directory = await getDefaultDownloadDirectory();+ if (!mounted) return;+ setState(() {+ defaultDownloadDirectory = directory;+ });+ }++ Future<void> _selectDownloadDirectory() async {+ if (!_canPickDirectory) {+ KazumiDialog.showToast(message: '当前平台不支持手动选择目录');+ return;+ }+ if (isSelectingDirectory) return;++ setState(() => isSelectingDirectory = true);+ try {+ final effectiveDirectory = _effectiveDownloadDirectory;+ final initialDirectory = effectiveDirectory.isNotEmpty &&+ await Directory(effectiveDirectory).exists()+ ? effectiveDirectory+ : null;+ final selectedPath = await FilePicker.platform.getDirectoryPath(+ dialogTitle: '选择下载位置',+ initialDirectory: initialDirectory,+ );+ if (selectedPath == null || selectedPath.isEmpty) return;++ await ensureDirectoryWritable(selectedPath);+ await GStorage.putSetting(+ SettingsKeys.downloadDirectory,+ selectedPath,+ );+ if (mounted) {+ setState(() => downloadDirectory = selectedPath);+ }+ KazumiDialog.showToast(message: '下载位置已更新,仅对新下载生效');+ } on FileSystemException catch (e) {+ KazumiDialog.showToast(message: '无法写入该目录: ${e.message}');+ } catch (e) {+ KazumiDialog.showToast(message: '选择下载位置失败: $e');+ } finally {+ if (mounted) {+ setState(() => isSelectingDirectory = false);+ }+ }+ }++ Future<void> _resetDownloadDirectory() async {+ await GStorage.putSetting(SettingsKeys.downloadDirectory, '');+ if (mounted) {+ setState(() => downloadDirectory = '');+ }+ KazumiDialog.showToast(message: '已恢复默认下载位置,仅对新下载生效');}@override@@ -93,6 +168,44 @@ class _DownloadSettingsPageState extends State<DownloadSettingsPage> {SettingsSection(title: Text('缓存设置', style: TextStyle(fontFamily: fontFamily)),tiles: [+ SettingsTile(+ title: Text('下载位置', style: TextStyle(fontFamily: fontFamily)),+ description: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Text(+ _effectiveDownloadDirectory.isEmpty+ ? '正在读取默认位置...'+ : _effectiveDownloadDirectory,+ style: TextStyle(fontFamily: fontFamily),+ ),+ const SizedBox(height: 8),+ Text(+ _hasCustomDirectory+ ? '当前使用自定义下载位置,修改后仅对新下载生效'+ : '当前使用默认下载位置,修改后仅对新下载生效',+ style: TextStyle(+ color: Theme.of(context).textTheme.bodySmall?.color,+ fontFamily: fontFamily,+ ),+ ),+ ],+ ),+ trailing: isSelectingDirectory+ ? const SizedBox(+ width: 20,+ height: 20,+ child: CircularProgressIndicator(strokeWidth: 2),+ )+ : _hasCustomDirectory+ ? IconButton(+ tooltip: '恢复默认',+ icon: const Icon(Icons.restore_rounded),+ onPressed: _resetDownloadDirectory,+ )+ : null,+ onPressed: (_) => _selectDownloadDirectory(),+ ),SettingsTile.switchTile(onToggle: (value) {setState(() => downloadDanmaku = value ?? !downloadDanmaku);diff --git a/lib/services/download/download_manager.dart b/lib/services/download/download_manager.dartindex 76dd68ef..e7702c9c 100644--- a/lib/services/download/download_manager.dart+++ b/lib/services/download/download_manager.dart@@ -8,9 +8,10 @@ import 'package:kazumi/request/core/network_exception.dart';import 'package:kazumi/utils/m3u8_parser.dart';import 'package:kazumi/utils/m3u8_ad_filter.dart';import 'package:kazumi/utils/format.dart' as fmt;+import 'package:kazumi/utils/file_system.dart';import 'package:kazumi/services/logging/logger.dart';import 'package:kazumi/services/storage/storage.dart';-import 'package:path_provider/path_provider.dart';+import 'package:path/path.dart' as path;class _NotM3u8Exception implements Exception {final String message;@@ -100,8 +101,10 @@ abstract class IDownloadManager {void cancel(String recordKey, int episodeNumber);String? getLocalVideoPath(DownloadEpisode? episode);Future<void> deleteEpisodeFiles(- int bangumiId, String pluginName, int episodeNumber);- Future<void> deleteRecordFiles(int bangumiId, String pluginName);+ int bangumiId, String pluginName, int episodeNumber,+ {DownloadEpisode? episode});+ Future<void> deleteRecordFiles(int bangumiId, String pluginName,+ {DownloadRecord? record});double getSpeed(String recordKey, int episodeNumber);}@@ -212,13 +215,51 @@ class DownloadManager implements IDownloadManager {_activeTasks.containsKey(_taskKey(recordKey, episodeNumber));Future<String> get _downloadBaseDir async {- final appSupport = await getApplicationSupportDirectory();- return '${appSupport.path}/downloads';+ if (supportsCustomDownloadDirectory) {+ final customDir =+ GStorage.getSetting(SettingsKeys.downloadDirectory).trim();+ if (customDir.isNotEmpty) return customDir;+ }+ return getDefaultDownloadDirectory();}- String getEpisodeDir(String downloadBase, int bangumiId, String pluginName,+ String _getEpisodeDir(String downloadBase, int bangumiId, String pluginName,int episodeNumber) {- return '$downloadBase/${bangumiId}_$pluginName/$episodeNumber';+ return path.join(+ downloadBase, '${bangumiId}_$pluginName', '$episodeNumber');+ }++ /// Resolves the episode directory (kept from a previous attempt if any),+ /// verifies it is writable, and persists it on the episode.+ Future<String> _prepareEpisodeDir(+ DownloadEpisode episode,+ int bangumiId,+ String pluginName,+ int episodeNumber,+ ) async {+ final storedDir = episode.downloadDirectory.trim();+ final episodeDir = storedDir.isNotEmpty+ ? storedDir+ : _getEpisodeDir(+ await _downloadBaseDir, bangumiId, pluginName, episodeNumber);+ await ensureDirectoryWritable(episodeDir);+ episode.downloadDirectory = episodeDir;+ await _checkStorageSpace(episodeDir);+ return episodeDir;+ }++ /// Directory to remove for an episode: the recorded one, or the default+ /// location for episodes that never started downloading.+ Future<String> _episodeDirForDeletion(+ DownloadEpisode? episode,+ int bangumiId,+ String pluginName,+ int episodeNumber,+ ) async {+ final storedDir = episode?.downloadDirectory.trim() ?? '';+ if (storedDir.isNotEmpty) return storedDir;+ return _getEpisodeDir(await getDefaultDownloadDirectory(), bangumiId,+ pluginName, episodeNumber);}@override@@ -366,6 +407,9 @@ class DownloadManager implements IDownloadManager {}) async {final key = _taskKey(task.recordKey, task.episodeNumber);try {+ final episodeDir = await _prepareEpisodeDir(+ episode, bangumiId, pluginName, task.episodeNumber);+episode.status = DownloadStatus.downloading;episode.networkM3u8Url = m3u8Url;_notifyProgress(task.recordKey, task.episodeNumber, episode);@@ -434,12 +478,6 @@ class DownloadManager implements IDownloadManager {segments = M3u8AdFilter.filterAds(segments);}- final base = await _downloadBaseDir;- final episodeDir =- getEpisodeDir(base, bangumiId, pluginName, task.episodeNumber);- await Directory(episodeDir).create(recursive: true);- episode.downloadDirectory = episodeDir;- await _checkStorageSpace(base);final keys = M3u8Parser.extractUniqueKeys(M3u8MediaPlaylist(segments: segments,@@ -450,7 +488,7 @@ class DownloadManager implements IDownloadManager {final keyUriToLocal = <String, String>{};for (int i = 0; i < keys.length; i++) {final keyFile = 'key_$i.key';- final keyPath = '$episodeDir/$keyFile';+ final keyPath = path.join(episodeDir, keyFile);await _downloadFile(keys[i].uri, keyPath, httpHeaders, task.cancelToken);keyUriToLocal[keys[i].uri] = keyFile;@@ -473,8 +511,8 @@ class DownloadManager implements IDownloadManager {final existingSegments = <int>{};var existingBytes = 0;for (int i = 0; i < segments.length; i++) {- final segFile =- File('$episodeDir/seg_${i.toString().padLeft(5, '0')}.ts');+ final segFile = File(+ path.join(episodeDir, 'seg_${i.toString().padLeft(5, '0')}.ts'));if (await segFile.exists()) {final segmentBytes = await segFile.length();if (segmentBytes <= 0) continue;@@ -517,7 +555,7 @@ class DownloadManager implements IDownloadManager {_downloadSegmentWithRetry(segments[idx].uri,- '$episodeDir/seg_${idx.toString().padLeft(5, '0')}.ts',+ path.join(episodeDir, 'seg_${idx.toString().padLeft(5, '0')}.ts'),httpHeaders,task.cancelToken,).then((bytes) {@@ -572,7 +610,7 @@ class DownloadManager implements IDownloadManager {targetDuration: targetDuration,keyUriToLocal: keyUriToLocal,);- final m3u8Path = '$episodeDir/playlist.m3u8';+ final m3u8Path = path.join(episodeDir, 'playlist.m3u8');await File(m3u8Path).writeAsString(localM3u8);final finalVideoBytes = await calculateM3u8VideoBytes(episodeDir);@@ -629,14 +667,10 @@ class DownloadManager implements IDownloadManager {}) async {final key = _taskKey(task.recordKey, task.episodeNumber);try {- final base = await _downloadBaseDir;- final episodeDir =- getEpisodeDir(base, bangumiId, pluginName, task.episodeNumber);- await Directory(episodeDir).create(recursive: true);- episode.downloadDirectory = episodeDir;- await _checkStorageSpace(base);-- final filePath = '$episodeDir/video.mp4';+ final episodeDir = await _prepareEpisodeDir(+ episode, bangumiId, pluginName, task.episodeNumber);++ final filePath = path.join(episodeDir, 'video.mp4');final tmpPath = '$filePath.tmp';int existingBytes = 0;@@ -869,21 +903,46 @@ class DownloadManager implements IDownloadManager {@overrideFuture<void> deleteEpisodeFiles(- int bangumiId, String pluginName, int episodeNumber) async {- final base = await _downloadBaseDir;- final dir =- Directory(getEpisodeDir(base, bangumiId, pluginName, episodeNumber));+ int bangumiId, String pluginName, int episodeNumber,+ {DownloadEpisode? episode}) async {+ final dir = Directory(await _episodeDirForDeletion(+ episode, bangumiId, pluginName, episodeNumber));if (await dir.exists()) {await dir.delete(recursive: true);}}@override- Future<void> deleteRecordFiles(int bangumiId, String pluginName) async {- final base = await _downloadBaseDir;- final dir = Directory('$base/${bangumiId}_$pluginName');- if (await dir.exists()) {- await dir.delete(recursive: true);+ Future<void> deleteRecordFiles(int bangumiId, String pluginName,+ {DownloadRecord? record}) async {+ if (record == null) {+ final dir = Directory(path.join(+ await getDefaultDownloadDirectory(), '${bangumiId}_$pluginName'));+ if (await dir.exists()) {+ await dir.delete(recursive: true);+ }+ return;+ }++ // Episodes may live under different base directories, so delete each+ // episode directory individually.+ final parentDirs = <String>{};+ for (final entry in record.episodes.entries) {+ final episodeDir = await _episodeDirForDeletion(+ entry.value, bangumiId, pluginName, entry.key);+ final dir = Directory(episodeDir);+ if (await dir.exists()) {+ await dir.delete(recursive: true);+ }+ parentDirs.add(path.dirname(episodeDir));+ }++ for (final parentDir in parentDirs) {+ try {+ await Directory(parentDir).delete();+ } on FileSystemException {+ // Parent is missing or still holds other files; leave it.+ }}}diff --git a/lib/services/storage/settings_keys.dart b/lib/services/storage/settings_keys.dartindex 2c8f57c7..1f80e628 100644--- a/lib/services/storage/settings_keys.dart+++ b/lib/services/storage/settings_keys.dart@@ -441,6 +441,11 @@ class SettingsKeys {true,group: SettingGroup.download,);+ static const downloadDirectory = SettingKey<String>(+ _SettingBoxKey.downloadDirectory,+ '',+ group: SettingGroup.download,+ );static const shortcutDialogShown = SettingKey<bool>(_SettingBoxKey.shortcutDialogShown,false,@@ -583,6 +588,7 @@ class SettingsKeys {downloadParallelEpisodes,downloadParallelSegments,downloadDanmaku,+ downloadDirectory,shortcutDialogShown,bangumiSyncEnable,bangumiAccessToken,@@ -693,6 +699,7 @@ class _SettingBoxKey {downloadParallelEpisodes = 'downloadParallelEpisodes',downloadParallelSegments = 'downloadParallelSegments',downloadDanmaku = 'downloadDanmaku',+ downloadDirectory = 'downloadDirectory',shortcutDialogShown = 'shortcutDialogShown',bangumiSyncEnable = 'bangumiSyncEnable',bangumiAccessToken = 'bangumiAccessToken',diff --git a/lib/utils/file_system.dart b/lib/utils/file_system.dartnew file mode 100644index 00000000..23897d3a--- /dev/null+++ b/lib/utils/file_system.dart@@ -0,0 +1,34 @@+import 'dart:io';++import 'package:path/path.dart' as path;+import 'package:path_provider/path_provider.dart';++/// Custom download directories are currently Windows-only.+bool get supportsCustomDownloadDirectory => Platform.isWindows;++Future<String> getDefaultDownloadDirectory() async {+ final appSupport = await getApplicationSupportDirectory();+ return path.join(appSupport.path, 'downloads');+}++Future<void> ensureDirectoryWritable(String directoryPath) async {+ final directory = Directory(directoryPath);+ await directory.create(recursive: true);++ final probe = File(path.join(+ directoryPath,+ '.kazumi_write_test_${DateTime.now().microsecondsSinceEpoch}.tmp',+ ));++ try {+ await probe.writeAsString('ok', flush: true);+ } finally {+ try {+ if (await probe.exists()) {+ await probe.delete();+ }+ } on FileSystemException {+ // The write check already succeeded; a leftover probe is not fatal.+ }+ }+}diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swiftindex 74657048..491244c6 100644--- a/macos/Flutter/GeneratedPluginRegistrant.swift+++ b/macos/Flutter/GeneratedPluginRegistrant.swift@@ -9,6 +9,7 @@ import audio_serviceimport audio_sessionimport connectivity_plusimport dynamic_color+import file_pickerimport file_selector_macosimport flutter_inappwebview_macosimport flutter_volume_controller@@ -28,6 +29,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))+ FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))FlutterVolumeControllerPlugin.register(with: registry.registrar(forPlugin: "FlutterVolumeControllerPlugin"))diff --git a/pubspec.lock b/pubspec.lockindex c6e866c6..ed46901a 100644--- a/pubspec.lock+++ b/pubspec.lock@@ -436,6 +436,14 @@ packages:url: "https://pub.dev"source: hostedversion: "7.0.1"+ file_picker:+ dependency: "direct main"+ description:+ name: file_picker+ sha256: "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343"+ url: "https://pub.dev"+ source: hosted+ version: "10.3.10"file_selector_linux:dependency: transitivedescription:diff --git a/pubspec.yaml b/pubspec.yamlindex 1b78c438..fc5b00aa 100644--- a/pubspec.yaml+++ b/pubspec.yaml@@ -53,6 +53,7 @@ dependencies:image: ^4.8.0# cached_network_image_ce: ^4.6.4card_settings_ui: ^2.0.1+ file_picker: ^10.3.7# fvp: ^0.28.0# video_player: ^2.9.1