mirror of
https://github.com/lifegpc/eh_downloader_flutter.git
synced 2026-07-08 01:30:28 +08:00
Update
This commit is contained in:
@@ -23,7 +23,7 @@ class ApiResult<T> {
|
|||||||
if (ok) {
|
if (ok) {
|
||||||
return data!;
|
return data!;
|
||||||
} else {
|
} else {
|
||||||
return throw (status, error!);
|
return throw (status, error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -321,6 +321,10 @@ class EHApi extends __EHApi {
|
|||||||
return _getTags(ids.join(","), cancel: cancel);
|
return _getTags(ids.join(","), cancel: cancel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<ApiResult<Tags>> getTags2(List<String> ids, {CancelToken? cancel}) {
|
||||||
|
return _getTags(ids.join(","), cancel: cancel);
|
||||||
|
}
|
||||||
|
|
||||||
String getFileUrl(int id) {
|
String getFileUrl(int id) {
|
||||||
final uri = Uri.parse(_combineBaseUrls(_dio.options.baseUrl, baseUrl));
|
final uri = Uri.parse(_combineBaseUrls(_dio.options.baseUrl, baseUrl));
|
||||||
final newUri = uri.resolve("file/$id");
|
final newUri = uri.resolve("file/$id");
|
||||||
|
|||||||
@@ -77,7 +77,8 @@ final _router = GoRouter(
|
|||||||
sortByGid: sortByGid,
|
sortByGid: sortByGid,
|
||||||
tag: tag,
|
tag: tag,
|
||||||
uploader: uploader,
|
uploader: uploader,
|
||||||
translatedTag: extra?.translatedTag);
|
translatedTag: extra?.translatedTag,
|
||||||
|
hasExtra: extra != null);
|
||||||
}),
|
}),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: GalleryPage.routeName,
|
path: GalleryPage.routeName,
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
@@ -17,16 +18,20 @@ class GalleriesPageExtra {
|
|||||||
|
|
||||||
class GalleriesPage extends StatefulWidget {
|
class GalleriesPage extends StatefulWidget {
|
||||||
const GalleriesPage(
|
const GalleriesPage(
|
||||||
{super.key, this.sortByGid, this.uploader, this.tag, this.translatedTag});
|
{super.key,
|
||||||
|
this.sortByGid,
|
||||||
|
this.uploader,
|
||||||
|
this.tag,
|
||||||
|
this.translatedTag,
|
||||||
|
this.hasExtra = false});
|
||||||
final SortByGid? sortByGid;
|
final SortByGid? sortByGid;
|
||||||
final String? uploader;
|
final String? uploader;
|
||||||
final String? tag;
|
final String? tag;
|
||||||
final String? translatedTag;
|
final String? translatedTag;
|
||||||
|
final bool hasExtra;
|
||||||
bool _stt(BuildContext context) =>
|
bool _stt(BuildContext context) =>
|
||||||
prefs.getBool("showTranslatedTag") ??
|
prefs.getBool("showTranslatedTag") ??
|
||||||
MainApp.of(context).lang.toLocale().languageCode == "zh";
|
MainApp.of(context).lang.toLocale().languageCode == "zh";
|
||||||
String? preferredTag(BuildContext context) =>
|
|
||||||
_stt(context) ? translatedTag ?? tag : tag;
|
|
||||||
|
|
||||||
static const String routeName = '/galleries';
|
static const String routeName = '/galleries';
|
||||||
|
|
||||||
@@ -39,6 +44,12 @@ class _GalleriesPage extends State<GalleriesPage>
|
|||||||
static const int _pageSize = 20;
|
static const int _pageSize = 20;
|
||||||
bool? _sortByGid;
|
bool? _sortByGid;
|
||||||
SortByGid _sortByGid2 = SortByGid.none;
|
SortByGid _sortByGid2 = SortByGid.none;
|
||||||
|
String? _translatedTag;
|
||||||
|
String? preferredTag(BuildContext context) =>
|
||||||
|
widget._stt(context) ? _translatedTag ?? widget.tag : widget.tag;
|
||||||
|
CancelToken? _tagCancel;
|
||||||
|
bool _isFetchingTag = false;
|
||||||
|
bool _fetchedTag = false;
|
||||||
|
|
||||||
final PagingController<int, GMeta> _pagingController =
|
final PagingController<int, GMeta> _pagingController =
|
||||||
PagingController(firstPageKey: 0);
|
PagingController(firstPageKey: 0);
|
||||||
@@ -65,6 +76,31 @@ class _GalleriesPage extends State<GalleriesPage>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> _fetchTag() async {
|
||||||
|
_isFetchingTag = true;
|
||||||
|
try {
|
||||||
|
_tagCancel = CancelToken();
|
||||||
|
final tags =
|
||||||
|
(await api.getTags2([widget.tag!], cancel: _tagCancel)).unwrap();
|
||||||
|
final tag = tags.tags[widget.tag!]!.unwrap();
|
||||||
|
if (!_tagCancel!.isCancelled) {
|
||||||
|
setState(() {
|
||||||
|
_translatedTag = tag.translated;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (e, stack) {
|
||||||
|
if (!_tagCancel!.isCancelled) {
|
||||||
|
if (e is (int, String)) {
|
||||||
|
_log.warning("Failed to fetch tags: $e");
|
||||||
|
} else {
|
||||||
|
_log.severe("Failed to fetch tags: $e\n$stack");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_fetchedTag = true;
|
||||||
|
_isFetchingTag = false;
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
try {
|
try {
|
||||||
@@ -78,9 +114,15 @@ class _GalleriesPage extends State<GalleriesPage>
|
|||||||
_pagingController.addPageRequestListener((pageKey) {
|
_pagingController.addPageRequestListener((pageKey) {
|
||||||
_fetchPage(pageKey);
|
_fetchPage(pageKey);
|
||||||
});
|
});
|
||||||
|
_translatedTag = widget.translatedTag;
|
||||||
|
listener.on("user_logined", _onStateChanged);
|
||||||
super.initState();
|
super.initState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onStateChanged(dynamic _) {
|
||||||
|
setState(() {});
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
tryInitApi(context);
|
tryInitApi(context);
|
||||||
@@ -101,7 +143,8 @@ class _GalleriesPage extends State<GalleriesPage>
|
|||||||
};
|
};
|
||||||
queryParameters.removeWhere((k, v) => v[0].isEmpty);
|
queryParameters.removeWhere((k, v) => v[0].isEmpty);
|
||||||
context.pushReplacementNamed("/galleries",
|
context.pushReplacementNamed("/galleries",
|
||||||
queryParameters: queryParameters);
|
queryParameters: queryParameters,
|
||||||
|
extra: GalleriesPageExtra(translatedTag: _translatedTag));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
label: Text(i18n.sortByGid),
|
label: Text(i18n.sortByGid),
|
||||||
@@ -113,16 +156,22 @@ class _GalleriesPage extends State<GalleriesPage>
|
|||||||
leadingIcon: const Icon(Icons.sort),
|
leadingIcon: const Icon(Icons.sort),
|
||||||
);
|
);
|
||||||
final title = widget.uploader != null && widget.tag != null
|
final title = widget.uploader != null && widget.tag != null
|
||||||
? i18n.tagUploaderGalleries(
|
? i18n.tagUploaderGalleries(preferredTag(context)!, widget.uploader!)
|
||||||
widget.preferredTag(context)!, widget.uploader!)
|
|
||||||
: widget.uploader != null
|
: widget.uploader != null
|
||||||
? i18n.uploaderGalleries(widget.uploader!)
|
? i18n.uploaderGalleries(widget.uploader!)
|
||||||
: widget.tag != null
|
: widget.tag != null
|
||||||
? i18n.tagGalleries(widget.preferredTag(context)!)
|
? i18n.tagGalleries(preferredTag(context)!)
|
||||||
: i18n.galleries;
|
: i18n.galleries;
|
||||||
if (isTop(context)) {
|
if (isTop(context)) {
|
||||||
setCurrentTitle(title, Theme.of(context).primaryColor.value);
|
setCurrentTitle(title, Theme.of(context).primaryColor.value);
|
||||||
}
|
}
|
||||||
|
if (auth.canManageTasks == true &&
|
||||||
|
!widget.hasExtra &&
|
||||||
|
widget.tag != null &&
|
||||||
|
!_isFetchingTag &&
|
||||||
|
!_fetchedTag) {
|
||||||
|
_fetchTag();
|
||||||
|
}
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
leading: IconButton(
|
leading: IconButton(
|
||||||
@@ -159,6 +208,8 @@ class _GalleriesPage extends State<GalleriesPage>
|
|||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_pagingController.dispose();
|
_pagingController.dispose();
|
||||||
|
_tagCancel?.cancel();
|
||||||
|
listener.removeEventListener("user_logined", _onStateChanged);
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user