Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

fix collectchanges sync (#1250)

floating14238ff02bf191c
diff --git a/lib/pages/collect/collect_controller.dart b/lib/pages/collect/collect_controller.dart
index 1c442657..b986eba4 100644
--- a/lib/pages/collect/collect_controller.dart
+++ b/lib/pages/collect/collect_controller.dart
@@ -101,7 +101,11 @@ abstract class _CollectController with Store {
if (!flag) {
return;
}
- await WebDav().syncCollectibles();
+ try {
+ await WebDav().syncCollectibles();
+ } catch (e){
+ KazumiDialog.showToast(message: 'WebDav同步失败 $e');
+ }
loadCollectibles();
}
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index 08b2f63f..b3349530 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -196,9 +196,7 @@ class _PlayerItemState extends State<PlayerItem>
try {
var webDav = WebDav();
await webDav.updateHistory();
- } catch (e) {
- KazumiLogger().log(Level.error, 'webDav update history failed $e');
- }
+ } catch (_) {}
}
}
diff --git a/lib/utils/webdav.dart b/lib/utils/webdav.dart
index aaaa9e30..48437006 100644
--- a/lib/utils/webdav.dart
+++ b/lib/utils/webdav.dart
@@ -47,7 +47,10 @@ class WebDav {
await client.ping();
try {
// KazumiLogger().log(Level.warning, 'webDav backup directory not exists, creating');
- await client.mkdir('/kazumiSync');
+ await client.mkdir('/kazumiSync');
+ if (!await webDavLocalTempDirectory.exists()) {
+ await webDavLocalTempDirectory.create(recursive: true);
+ }
initialized = true;
KazumiLogger().log(Level.info, 'webDav backup directory create success');
} catch (_) {
@@ -62,32 +65,34 @@ class WebDav {
Future<void> update(String boxName) async {
var directory = await getApplicationSupportDirectory();
- await File('${directory.path}/hive/$boxName.hive')
- .copy('${directory.path}/hive/$boxName.hive.tmp');
+ final localFilePath = '${directory.path}/hive/$boxName.hive';
+ final tempFilePath = '${webDavLocalTempDirectory.path}/$boxName.tmp';
+ final webDavPath = '/kazumiSync/$boxName.tmp';
+ await File(localFilePath)
+ .copy(tempFilePath);
try {
- await client.remove('/kazumiSync/$boxName.tmp.cache');
+ await client.remove('$webDavPath.cache');
} catch (_) {}
- await client.writeFromFile('${directory.path}/hive/$boxName.hive.tmp',
- '/kazumiSync/$boxName.tmp.cache', onProgress: (c, t) {
+ await client.writeFromFile(tempFilePath,
+ '$webDavPath.cache', onProgress: (c, t) {
// print(c / t);
});
try {
- await client.remove('/kazumiSync/$boxName.tmp');
+ await client.remove(webDavPath);
} catch (_) {
KazumiLogger().log(Level.warning, 'webDav former backup file not exist');
}
await client.rename(
- '/kazumiSync/$boxName.tmp.cache', '/kazumiSync/$boxName.tmp', true);
+ '$webDavPath.cache', webDavPath, true);
try {
- await File('${directory.path}/hive/$boxName.hive.tmp').delete();
+ await File(tempFilePath).delete();
} catch (_) {}
}
Future<void> updateHistory() async {
if (isHistorySyncing) {
KazumiLogger().log(Level.warning, 'History is currently syncing');
- //throw Exception('History is currently syncing');
- return;
+ throw Exception('History is currently syncing');
}
isHistorySyncing = true;
try {
@@ -110,6 +115,18 @@ class WebDav {
}
}
+ Future<void> download(String boxName) async {
+ String fileName = '$boxName.tmp';
+ final existingFile = File('${webDavLocalTempDirectory.path}/$fileName');
+ if (await existingFile.exists()) {
+ await existingFile.delete();
+ }
+ await client.read2File('/kazumiSync/$fileName', existingFile.path,
+ onProgress: (c, t) {
+ // print(c / t);
+ });
+ }
+
Future<void> downloadAndPatchHistory() async {
if (isHistorySyncing) {
KazumiLogger().log(Level.warning, 'History is currently syncing');
@@ -118,17 +135,8 @@ class WebDav {
isHistorySyncing = true;
String fileName = 'histories.tmp';
try {
- if (!await webDavLocalTempDirectory.exists()) {
- await webDavLocalTempDirectory.create(recursive: true);
- }
final existingFile = File('${webDavLocalTempDirectory.path}/$fileName');
- if (await existingFile.exists()) {
- await existingFile.delete();
- }
- await client.read2File('/kazumiSync/$fileName', existingFile.path,
- onProgress: (c, t) {
- // print(c / t);
- });
+ await download('histories');
await GStorage.patchHistory(existingFile.path);
} catch (e) {
KazumiLogger()
@@ -139,47 +147,19 @@ class WebDav {
}
}
- Future<void> downloadCollectibles() async {
- String fileName = 'collectibles.tmp';
- if (!await webDavLocalTempDirectory.exists()) {
- await webDavLocalTempDirectory.create(recursive: true);
- }
- final existingFile = File('${webDavLocalTempDirectory.path}/$fileName');
- if (await existingFile.exists()) {
- await existingFile.delete();
- }
- await client.read2File('/kazumiSync/$fileName', existingFile.path,
- onProgress: (c, t) {
- // print(c / t);
- });
- }
-
- Future<void> downloadCollectChanges() async {
- String fileName = 'collectChanges.tmp';
- if (!await webDavLocalTempDirectory.exists()) {
- await webDavLocalTempDirectory.create(recursive: true);
- }
- final existingFile = File('${webDavLocalTempDirectory.path}/$fileName');
- if (await existingFile.exists()) {
- await existingFile.delete();
- }
- await client.read2File('/kazumiSync/$fileName', existingFile.path,
- onProgress: (c, t) {
- // print(c / t);
- });
- }
-
Future<void> syncCollectibles() async {
List<CollectedBangumi> remoteCollectibles = [];
List<CollectedBangumiChange> remoteChanges = [];
// muliti thread download
- Future<void> collectiblesFuture = downloadCollectibles().catchError((e) {
+ Future<void> collectiblesFuture = download('collectibles').catchError((e) {
KazumiLogger().log(Level.error, 'webDav download collectibles failed $e');
+ throw Exception('webDav download collectibles failed');
});
- Future<void> changesFuture = downloadCollectChanges().catchError((e) {
+ Future<void> changesFuture = download('collectchanges').catchError((e) {
KazumiLogger()
.log(Level.error, 'webDav download collect changes failed $e');
+ throw Exception('webDav download collect changes failed');
});
await Future.wait([collectiblesFuture, changesFuture]);
@@ -191,10 +171,11 @@ class WebDav {
remoteCollectibles = await GStorage.getCollectiblesFromFile(
'${webDavLocalTempDirectory.path}/collectibles.tmp');
remoteChanges = await GStorage.getCollectChangesFromFile(
- '${webDavLocalTempDirectory.path}/collectChanges.tmp');
+ '${webDavLocalTempDirectory.path}/collectchanges.tmp');
} catch (e) {
KazumiLogger()
.log(Level.error, 'webDav get collectibles from file failed $e');
+ throw Exception('webDav get collectibles from file failed');
}
if (remoteChanges.isNotEmpty || remoteCollectibles.isNotEmpty) {
await GStorage.patchCollectibles(remoteCollectibles, remoteChanges);