feat: ui detail upgrade

This commit is contained in:
Simon Ding
2024-07-21 17:46:05 +08:00
parent f7d858f920
commit 254de1d018
4 changed files with 213 additions and 212 deletions

View File

@@ -62,17 +62,17 @@ class ActivityDataSource extends DataTableSource {
DataCell(() { DataCell(() {
if (activity.status == "uploading") { if (activity.status == "uploading") {
return const SizedBox( return const SizedBox(
width: 20, height: 20, child: CircularProgressIndicator()); width: 20, height: 20, child: Tooltip(message: "正在上传到指定存储",child: CircularProgressIndicator(),) );
} else if (activity.status == "fail") { } else if (activity.status == "fail") {
return const Icon( return const Tooltip(message: "下载失败",child: Icon(
Icons.close, Icons.close,
color: Colors.red, color: Colors.red,
); ));
} else if (activity.status == "success") { } else if (activity.status == "success") {
return const Icon( return const Tooltip(message: "下载成功",child: Icon(
Icons.check, Icons.check,
color: Colors.green, color: Colors.green,
); ),) ;
} }
double p = double p =

View File

@@ -27,7 +27,6 @@ class MovieDetailsPage extends ConsumerStatefulWidget {
} }
class _MovieDetailsPageState extends ConsumerState<MovieDetailsPage> { class _MovieDetailsPageState extends ConsumerState<MovieDetailsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var seriesDetails = ref.watch(mediaDetailsProvider(widget.id)); var seriesDetails = ref.watch(mediaDetailsProvider(widget.id));
@@ -104,10 +103,14 @@ class _MovieDetailsPageState extends ConsumerState<MovieDetailsPage> {
IconButton( IconButton(
onPressed: () { onPressed: () {
ref ref
.read( .read(mediaDetailsProvider(widget.id)
mediaDetailsProvider(widget.id).notifier) .notifier)
.delete(); .delete()
context.go(WelcomePage.routeMoivie); .whenComplete(() => context
.go(WelcomePage.routeMoivie))
.onError((error, trace) =>
Utils.showSnakeBar(
"删除失败:$error"));
}, },
icon: const Icon(Icons.delete)) icon: const Icon(Icons.delete))
], ],
@@ -138,11 +141,13 @@ class _MovieDetailsPageState extends ConsumerState<MovieDetailsPage> {
DataCell(Text("${torrent.peers}")), DataCell(Text("${torrent.peers}")),
DataCell(IconButton( DataCell(IconButton(
icon: const Icon(Icons.download), icon: const Icon(Icons.download),
onPressed: () async { onPressed: () {
await ref ref
.read(movieTorrentsDataProvider(widget.id) .read(movieTorrentsDataProvider(widget.id)
.notifier) .notifier)
.download(torrent.link!); .download(torrent.link!)
.whenComplete(() => Utils.showSnakeBar(
"开始下载:${torrent.name}")).onError((error, trace) => Utils.showSnakeBar("操作失败: $error"));
}, },
)) ))
]); ]);

View File

@@ -43,6 +43,7 @@ class SeriesDetailData
if (sp.code != 0) { if (sp.code != 0) {
throw sp.message; throw sp.message;
} }
ref.invalidateSelf();
var name = (sp.data as Map<String, dynamic>)["name"]; var name = (sp.data as Map<String, dynamic>)["name"];
return name; return name;
} }

View File

@@ -26,7 +26,6 @@ class TvDetailsPage extends ConsumerStatefulWidget {
} }
class _TvDetailsPageState extends ConsumerState<TvDetailsPage> { class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
Future<String>? _pendingFuture;
@override @override
void initState() { void initState() {
@@ -37,10 +36,6 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
var seriesDetails = ref.watch(mediaDetailsProvider(widget.seriesId)); var seriesDetails = ref.watch(mediaDetailsProvider(widget.seriesId));
var storage = ref.watch(storageSettingProvider); var storage = ref.watch(storageSettingProvider);
return FutureBuilder(
// We listen to the pending operation, to update the UI accordingly.
future: _pendingFuture,
builder: (context, snapshot) {
return seriesDetails.when( return seriesDetails.when(
data: (details) { data: (details) {
Map<int, List<DataRow>> m = {}; Map<int, List<DataRow>> m = {};
@@ -56,39 +51,42 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
Opacity( Opacity(
opacity: 0.7, opacity: 0.7,
child: ep.status == "downloading" child: ep.status == "downloading"
? const Tooltip(message: "下载中",child: Icon(Icons.downloading),) ? const Tooltip(
message: "下载中",
child: Icon(Icons.downloading),
)
: (ep.status == "downloaded" : (ep.status == "downloaded"
? const Tooltip(message: "已下载",child: Icon(Icons.download_done),) ? const Tooltip(
: const Tooltip(message: "下载",child: Icon(Icons.warning_amber_rounded),) )), message: "下载",
child: Icon(Icons.download_done),
)
: const Tooltip(
message: "未下载",
child: Icon(Icons.warning_amber_rounded),
))),
), ),
DataCell(Row( DataCell(Row(
children: [ children: [
Tooltip( Tooltip(
message: "搜索下载对应剧集", message: "搜索下载对应剧集",
child: IconButton( child: IconButton(
onPressed: () async { onPressed: () {
var f = ref ref
.read(mediaDetailsProvider(widget.seriesId) .read(mediaDetailsProvider(widget.seriesId)
.notifier) .notifier)
.searchAndDownload(widget.seriesId, .searchAndDownload(widget.seriesId,
ep.seasonNumber!, ep.episodeNumber!); ep.seasonNumber!, ep.episodeNumber!)
setState(() { .then((v) => Utils.showSnakeBar("开始下载: $v"))
_pendingFuture = f; .onError((error, trace) =>
}); Utils.showSnakeBar("操作失败: $error"));
if (!Utils.showError(context, snapshot)) {
var name = await f;
Utils.showSnakeBar("开始下载: $name");
}
}, },
icon: const Icon(Icons.search)), icon: const Icon(Icons.search)),
) ),
,
const SizedBox( const SizedBox(
width: 10, width: 10,
), ),
IconButton( IconButton(
onPressed: () {}, onPressed: () {}, icon: const Icon(Icons.manage_search))
icon: const Icon(Icons.manage_search))
], ],
)) ))
]); ]);
@@ -114,24 +112,21 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
), ),
const DataColumn(label: Text("播出时间")), const DataColumn(label: Text("播出时间")),
const DataColumn(label: Text("状态")), const DataColumn(label: Text("状态")),
DataColumn(label: Tooltip( DataColumn(
label: Tooltip(
message: "搜索下载全部剧集", message: "搜索下载全部剧集",
child: IconButton( child: IconButton(
onPressed: () async { onPressed: () {
var f = ref ref
.read(mediaDetailsProvider(widget.seriesId) .read(mediaDetailsProvider(widget.seriesId)
.notifier) .notifier)
.searchAndDownload(widget.seriesId, .searchAndDownload(widget.seriesId, k, 0)
k, 0); .then((v) => Utils.showSnakeBar("开始下载: $v"))
setState(() { .onError((error, trace) =>
_pendingFuture = f; Utils.showSnakeBar("操作失败: $error"));
});
if (!Utils.showError(context, snapshot)) {
var name = await f;
Utils.showSnakeBar("开始下载: $name");
}
}, },
icon: const Icon(Icons.search)),) ) icon: const Icon(Icons.search)),
))
], rows: m[k]!), ], rows: m[k]!),
], ],
); );
@@ -171,8 +166,7 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
Row( Row(
children: [ children: [
@@ -183,8 +177,7 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
storage.when( storage.when(
data: (value) { data: (value) {
for (final s in value) { for (final s in value) {
if (s.id == if (s.id == details.storageId) {
details.storageId) {
return Text( return Text(
"${s.name}(${s.implementation})"); "${s.name}(${s.implementation})");
} }
@@ -193,8 +186,7 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
}, },
error: (error, stackTrace) => error: (error, stackTrace) =>
Text("$error"), Text("$error"),
loading: () => loading: () => const Text("")),
const Text("")),
], ],
), ),
const Divider(thickness: 1, height: 1), const Divider(thickness: 1, height: 1),
@@ -218,8 +210,12 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
.read(mediaDetailsProvider( .read(mediaDetailsProvider(
widget.seriesId) widget.seriesId)
.notifier) .notifier)
.delete(); .delete()
context.go(WelcomePage.routeTv); .whenComplete(() =>
context.go(WelcomePage.routeTv))
.onError((error, trace) =>
Utils.showSnakeBar(
"删除失败: $error"));
}, },
icon: const Icon(Icons.delete)) icon: const Icon(Icons.delete))
], ],
@@ -242,6 +238,5 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
return Text("$err"); return Text("$err");
}, },
loading: () => const MyProgressIndicator()); loading: () => const MyProgressIndicator());
});
} }
} }