add support for novel image

lib/foundation/image_provider.dart

@@ -161,10 +161,10 @@ class CachedImageProvider extends BaseImageProvider<CachedImageProvider> {
       return await File(cached).readAsBytes();
     }
     var dio = AppDio();
-    final time = DateFormat("yyyy-MM-dd'T'HH:mm:ss'+00:00'").format(DateTime.now());
+    final time =
+        DateFormat("yyyy-MM-dd'T'HH:mm:ss'+00:00'").format(DateTime.now());
     final hash = md5.convert(utf8.encode(time + Network.hashSalt)).toString();
-    var res = await dio.get<ResponseBody>(
+    var res = await dio.get<ResponseBody>(url,
-      url,
         options: Options(
             responseType: ResponseType.stream,
             validateStatus: (status) => status != null && status < 500,
@@ -174,9 +174,7 @@ class CachedImageProvider extends BaseImageProvider<CachedImageProvider> {
               "x-client-time": time,
               "x-client-hash": hash,
               "accept-enconding": "gzip",
-        }
+            }));
-      )
-    );
     if (res.statusCode != 200) {
       throw BadRequestException("Failed to load image: ${res.statusCode}");
     }
@@ -203,3 +201,71 @@ class CachedImageProvider extends BaseImageProvider<CachedImageProvider> {
     return SynchronousFuture<CachedImageProvider>(this);
   }
 }
+
+class CachedNovelImageProvider
+    extends BaseImageProvider<CachedNovelImageProvider> {
+  final String novelId;
+  final String imageId;
+
+  CachedNovelImageProvider(this.novelId, this.imageId);
+
+  @override
+  String get key => "$novelId/$imageId";
+
+  @override
+  Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
+    chunkEvents.add(const ImageChunkEvent(
+      cumulativeBytesLoaded: 0,
+      expectedTotalBytes: 1,
+    ));
+    var cached = await CacheManager().findCache(key);
+    if (cached != null) {
+      chunkEvents.add(const ImageChunkEvent(
+        cumulativeBytesLoaded: 1,
+        expectedTotalBytes: 1,
+      ));
+      return await File(cached).readAsBytes();
+    }
+    var urlRes = await Network().getNovelImage(novelId, imageId);
+    var url = urlRes.data;
+    var dio = AppDio();
+    final time =
+        DateFormat("yyyy-MM-dd'T'HH:mm:ss'+00:00'").format(DateTime.now());
+    final hash = md5.convert(utf8.encode(time + Network.hashSalt)).toString();
+    var res = await dio.get<ResponseBody>(url,
+        options: Options(
+            responseType: ResponseType.stream,
+            validateStatus: (status) => status != null && status < 500,
+            headers: {
+              "referer": "https://app-api.pixiv.net/",
+              "user-agent": "PixivAndroidApp/5.0.234 (Android 14; Pixes)",
+              "x-client-time": time,
+              "x-client-hash": hash,
+              "accept-enconding": "gzip",
+            }));
+    if (res.statusCode != 200) {
+      throw BadRequestException("Failed to load image: ${res.statusCode}");
+    }
+    var data = <int>[];
+    var cachingFile = await CacheManager().openWrite(key);
+    await for (var chunk in res.data!.stream) {
+      var length = res.data!.contentLength + 1;
+      if (length < data.length) {
+        length = data.length + 1;
+      }
+      data.addAll(chunk);
+      await cachingFile.writeBytes(chunk);
+      chunkEvents.add(ImageChunkEvent(
+        cumulativeBytesLoaded: data.length,
+        expectedTotalBytes: length,
+      ));
+    }
+    await cachingFile.close();
+    return Uint8List.fromList(data);
+  }
+
+  @override
+  Future<CachedNovelImageProvider> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture<CachedNovelImageProvider>(this);
+  }
+}

lib/network/network.dart

@@ -134,8 +134,7 @@ class Network {
       }
       final res = await dio.get<Map<String, dynamic>>(path,
           queryParameters: query,
-          options:
+          options: Options(headers: headers, validateStatus: (status) => true));
-              Options(headers: headers, validateStatus: (status) => true));
       if (res.statusCode == 200) {
         return Res(res.data!);
       } else if (res.statusCode == 400) {
@@ -169,8 +168,7 @@ class Network {
       }
       final res = await dio.get<String>(path,
           queryParameters: query,
-          options:
+          options: Options(headers: headers, validateStatus: (status) => true));
-              Options(headers: headers, validateStatus: (status) => true));
       if (res.statusCode == 200) {
         return Res(res.data!);
       } else if (res.statusCode == 400) {
@@ -242,14 +240,15 @@ class Network {
     }
   }
 
-  static const recommendationUrl = "/v1/illust/recommended?include_privacy_policy=true&filter=for_android&include_ranking_illusts=true";
+  static const recommendationUrl =
+      "/v1/illust/recommended?include_privacy_policy=true&filter=for_android&include_ranking_illusts=true";
 
   Future<Res<List<Illust>>> getRecommendedIllusts() async {
     var res = await apiGet(recommendationUrl);
     if (res.success) {
-      return Res((res.data["illusts"] as List)
+      return Res(
-          .map((e) => Illust.fromJson(e))
+          (res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
-          .toList(), subData: recommendationUrl);
+          subData: recommendationUrl);
     } else {
       return Res.error(res.errorMessage);
     }
@@ -268,9 +267,10 @@ class Network {
     }
   }
 
-  Future<Res<List<Illust>>> getUserBookmarks(String uid, [String? nextUrl]) async {
+  Future<Res<List<Illust>>> getUserBookmarks(String uid,
-    var res = await apiGet(nextUrl ??
+      [String? nextUrl]) async {
-        "/v1/user/bookmarks/illust?user_id=$uid&restrict=public");
+    var res = await apiGet(
+        nextUrl ?? "/v1/user/bookmarks/illust?user_id=$uid&restrict=public");
     if (res.success) {
       return Res(
           (res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
@@ -356,12 +356,16 @@ class Network {
     }
   }
 
-  Future<Res<List<UserPreview>>> searchUsers(String keyword, [String? nextUrl]) async{
+  Future<Res<List<UserPreview>>> searchUsers(String keyword,
-    var path = nextUrl ?? "/v1/search/user?filter=for_android&word=${Uri.encodeComponent(keyword)}";
+      [String? nextUrl]) async {
+    var path = nextUrl ??
+        "/v1/search/user?filter=for_android&word=${Uri.encodeComponent(keyword)}";
     var res = await apiGet(path);
     if (res.success) {
       return Res(
-          (res.data["user_previews"] as List).map((e) => UserPreview.fromJson(e)).toList(),
+          (res.data["user_previews"] as List)
+              .map((e) => UserPreview.fromJson(e))
+              .toList(),
           subData: res.data["next_url"]);
     } else {
       return Res.error(res.errorMessage);
@@ -369,7 +373,8 @@ class Network {
   }
 
   Future<Res<List<Illust>>> getUserIllusts(String uid) async {
-    var res = await apiGet("/v1/user/illusts?filter=for_android&user_id=$uid&type=illust");
+    var res = await apiGet(
+        "/v1/user/illusts?filter=for_android&user_id=$uid&type=illust");
     if (res.success) {
       return Res(
           (res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
@@ -379,19 +384,24 @@ class Network {
     }
   }
 
-  Future<Res<List<UserPreview>>> getFollowing(String uid, String type, [String? nextUrl]) async {
+  Future<Res<List<UserPreview>>> getFollowing(String uid, String type,
-    var path = nextUrl ?? "/v1/user/following?filter=for_android&user_id=$uid&restrict=$type";
+      [String? nextUrl]) async {
+    var path = nextUrl ??
+        "/v1/user/following?filter=for_android&user_id=$uid&restrict=$type";
     var res = await apiGet(path);
     if (res.success) {
       return Res(
-          (res.data["user_previews"] as List).map((e) => UserPreview.fromJson(e)).toList(),
+          (res.data["user_previews"] as List)
+              .map((e) => UserPreview.fromJson(e))
+              .toList(),
           subData: res.data["next_url"]);
     } else {
       return Res.error(res.errorMessage);
     }
   }
 
-  Future<Res<List<Illust>>> getFollowingArtworks(String restrict, [String? nextUrl]) async {
+  Future<Res<List<Illust>>> getFollowingArtworks(String restrict,
+      [String? nextUrl]) async {
     var res = await apiGet(nextUrl ?? "/v2/illust/follow?restrict=$restrict");
     if (res.success) {
       return Res(
@@ -406,7 +416,9 @@ class Network {
     var res = await apiGet("/v1/user/recommended?filter=for_android");
     if (res.success) {
       return Res(
-          (res.data["user_previews"] as List).map((e) => UserPreview.fromJson(e)).toList(),
+          (res.data["user_previews"] as List)
+              .map((e) => UserPreview.fromJson(e))
+              .toList(),
           subData: res.data["next_url"]);
     } else {
       return Res.error(res.errorMessage);
@@ -415,7 +427,8 @@ class Network {
 
   /// mode: day, week, month, day_male, day_female, week_original, week_rookie, day_manga, week_manga, month_manga, day_r18_manga, day_r18
   Future<Res<List<Illust>>> getRanking(String mode, [String? nextUrl]) async {
-    var res = await apiGet(nextUrl ?? "/v1/illust/ranking?filter=for_android&mode=$mode");
+    var res = await apiGet(
+        nextUrl ?? "/v1/illust/ranking?filter=for_android&mode=$mode");
     if (res.success) {
       return Res(
           (res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
@@ -429,7 +442,9 @@ class Network {
     var res = await apiGet(nextUrl ?? "/v3/illust/comments?illust_id=$id");
     if (res.success) {
       return Res(
-          (res.data["comments"] as List).map((e) => Comment.fromJson(e)).toList(),
+          (res.data["comments"] as List)
+              .map((e) => Comment.fromJson(e))
+              .toList(),
           subData: res.data["next_url"]);
     } else {
       return Res.error(res.errorMessage);
@@ -456,7 +471,8 @@ class Network {
   }
 
   Future<Res<List<Illust>>> getRecommendedMangas() async {
-    var res = await apiGet("/v1/manga/recommended?filter=for_android&include_ranking_illusts=true&include_privacy_policy=true");
+    var res = await apiGet(
+        "/v1/manga/recommended?filter=for_android&include_ranking_illusts=true&include_privacy_policy=true");
     if (res.success) {
       return Res(
           (res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList(),
@@ -474,7 +490,8 @@ class Network {
     var res = await apiGet("/v1/user/browsing-history/illusts$param");
     if (res.success) {
       return Res((res.data["illusts"] as List)
-          .map((e) => Illust.fromJson(e)).toList());
+          .map((e) => Illust.fromJson(e))
+          .toList());
     } else {
       return Res.error(res.errorMessage);
     }
@@ -483,19 +500,18 @@ class Network {
   Future<List<Tag>> getMutedTags() async {
     var res = await apiGet("/v1/mute/list");
     if (res.success) {
-      return res.data["mute_tags"].map<Tag>((e) =>
+      return res.data["mute_tags"]
-          Tag(e["tag"]["name"], e["tag"]["translated_name"]))
+          .map<Tag>((e) => Tag(e["tag"]["name"], e["tag"]["translated_name"]))
           .toList();
     } else {
       return [];
     }
   }
 
-  Future<Res<bool>> muteTags(List<String> muteTags, List<String> unmuteTags) async {
+  Future<Res<bool>> muteTags(
-    var res = await apiPost("/v1/mute/edit", data: {
+      List<String> muteTags, List<String> unmuteTags) async {
-      "add_tags": muteTags,
+    var res = await apiPost("/v1/mute/edit",
-      "delete_tags": unmuteTags
+        data: {"add_tags": muteTags, "delete_tags": unmuteTags});
-    });
     if (res.success) {
       return const Res(true);
     } else {
@@ -504,20 +520,37 @@ class Network {
   }
 
   Future<Res<List<UserPreview>>> relatedUsers(String id) async {
-    var res = await apiGet("/v1/user/related?filter=for_android&seed_user_id=$id");
+    var res =
+        await apiGet("/v1/user/related?filter=for_android&seed_user_id=$id");
     if (res.success) {
-      return Res(
+      return Res((res.data["user_previews"] as List)
-          (res.data["user_previews"] as List).map((e) => UserPreview.fromJson(e)).toList());
+          .map((e) => UserPreview.fromJson(e))
+          .toList());
     } else {
       return Res.error(res.errorMessage);
     }
   }
 
   Future<Res<List<Illust>>> relatedIllusts(String id) async {
-    var res = await apiGet("/v2/illust/related?filter=for_android&illust_id=$id");
+    var res =
+        await apiGet("/v2/illust/related?filter=for_android&illust_id=$id");
     if (res.success) {
-      return Res(
+      return Res((res.data["illusts"] as List)
-          (res.data["illusts"] as List).map((e) => Illust.fromJson(e)).toList());
+          .map((e) => Illust.fromJson(e))
+          .toList());
+    } else {
+      return Res.error(res.errorMessage);
+    }
+  }
+
+  Future<Res<String>> getNovelImage(String novelId, String imageId) async {
+    var res = await apiGetPlain(
+        "/web/v1/novel/image?novel_id=$novelId&uploaded_image_id=$imageId");
+    if (res.success) {
+      var html = res.data;
+      int start = html.indexOf('<img src="') + 10;
+      int end = html.indexOf('"', start);
+      return Res(html.substring(start, end));
     } else {
       return Res.error(res.errorMessage);
     }

lib/pages/image_page.dart

@@ -16,15 +16,14 @@ import 'package:share_plus/share_plus.dart';
 import 'package:window_manager/window_manager.dart';
 
 class ImagePage extends StatefulWidget {
-  const ImagePage(this.urls, {this.initialPage = 1, super.key});
+  const ImagePage(this.urls, {this.initialPage = 0, super.key});
 
   final List<String> urls;
 
   final int initialPage;
 
-  static show(List<String> urls, {int initialPage = 1}) {
+  static show(List<String> urls, {int initialPage = 0}) {
-    App.rootNavigatorKey.currentState
+    App.rootNavigatorKey.currentState?.push(AppPageRoute(
-        ?.push(AppPageRoute(
         builder: (context) => ImagePage(urls, initialPage: initialPage)));
   }
 
@@ -72,10 +71,12 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
     if (image.startsWith("file://")) {
       return File(image.replaceFirst("file://", ""));
     }
-    var file = await CacheManager().findCache(image);
+    var key = image;
-    return file == null
+    if (key.startsWith("novel:")) {
-        ? null
+      key = key.split(':').last;
-        : File(file);
+    }
+    var file = await CacheManager().findCache(key);
+    return file == null ? null : File(file);
   }
 
   String getExtensionName() {
@@ -87,9 +88,12 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
   }
 
   void showMenu() {
-    menuController.showFlyout(builder: (context) => MenuFlyout(
+    menuController.showFlyout(
+        builder: (context) => MenuFlyout(
               items: [
-        MenuFlyoutItem(text: Text("Save to".tl), onPressed: () async{
+                MenuFlyoutItem(
+                    text: Text("Save to".tl),
+                    onPressed: () async {
                       var file = await getFile();
                       if (file != null) {
                         var fileName = file.path.split('/').last;
@@ -99,7 +103,9 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
                         saveFile(file, fileName);
                       }
                     }),
-        MenuFlyoutItem(text: Text("Share".tl), onPressed: () async{
+                MenuFlyoutItem(
+                    text: Text("Share".tl),
+                    onPressed: () async {
                       var file = await getFile();
                       if (file != null) {
                         var ext = getExtensionName();
@@ -115,11 +121,10 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
                           '.webp' => 'image/webp',
                           _ => 'application/octet-stream'
                         };
-            Share.shareXFiles([XFile.fromData(
+                        Share.shareXFiles([
-              await file.readAsBytes(),
+                          XFile.fromData(await file.readAsBytes(),
-              mimeType: mediaType,
+                              mimeType: mediaType, name: fileName)
-              name: fileName)]
+                        ]);
-            );
                       }
                     }),
               ],
@@ -135,10 +140,11 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
         onPointerSignal: (event) {
           if (event is PointerScrollEvent &&
               !HardwareKeyboard.instance.isControlPressed) {
-            if(event.scrollDelta.dy > 0
+            if (event.scrollDelta.dy > 0 &&
-                && controller.page!.toInt() < widget.urls.length - 1) {
+                controller.page!.toInt() < widget.urls.length - 1) {
               controller.jumpToPage(controller.page!.toInt() + 1);
-            } else if(event.scrollDelta.dy < 0 && controller.page!.toInt() > 0){
+            } else if (event.scrollDelta.dy < 0 &&
+                controller.page!.toInt() > 0) {
               controller.jumpToPage(controller.page!.toInt() - 1);
             }
           }
@@ -148,19 +154,17 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
             var height = constrains.maxHeight;
             return Stack(
               children: [
-                Positioned.fill(child: PhotoViewGallery.builder(
+                Positioned.fill(
+                    child: PhotoViewGallery.builder(
                   pageController: controller,
-                  backgroundDecoration: const BoxDecoration(
+                  backgroundDecoration:
-                      color: Colors.transparent
+                      const BoxDecoration(color: Colors.transparent),
-                  ),
                   itemCount: widget.urls.length,
                   builder: (context, index) {
                     var image = widget.urls[index];
 
                     return PhotoViewGalleryPageOptions(
-                      imageProvider: image.startsWith("file://")
+                      imageProvider: getImageProvider(image),
-                          ? FileImage(File(image.replaceFirst("file://", "")))
-                          : CachedImageProvider(image) as ImageProvider,
                     );
                   },
                   onPageChanged: (index) {
@@ -177,17 +181,22 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
                     height: 36,
                     child: Row(
                       children: [
-                        const SizedBox(width: 6,),
+                        const SizedBox(
+                          width: 6,
+                        ),
                         IconButton(
                             icon: const Icon(FluentIcons.back).paddingAll(2),
-                            onPressed: () => context.pop()
+                            onPressed: () => context.pop()),
-                        ),
                         const Expanded(
-                          child: DragToMoveArea(child: SizedBox.expand(),),
+                          child: DragToMoveArea(
+                            child: SizedBox.expand(),
+                          ),
                         ),
                         buildActions(),
                         if (App.isDesktop)
-                          WindowButtons(key: ValueKey(windowButtonKey),),
+                          WindowButtons(
+                            key: ValueKey(windowButtonKey),
+                          ),
                       ],
                     ),
                   ),
@@ -196,7 +205,10 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
                   left: 0,
                   top: height / 2 - 9,
                   child: IconButton(
-                    icon: const Icon(FluentIcons.chevron_left, size: 18,),
+                    icon: const Icon(
+                      FluentIcons.chevron_left,
+                      size: 18,
+                    ),
                     onPressed: () {
                       controller.previousPage(
                         duration: const Duration(milliseconds: 300),
@@ -260,4 +272,14 @@ class _ImagePageState extends State<ImagePage> with WindowListener {
               onPressed: showMenu),
     );
   }
+
+  ImageProvider getImageProvider(String url) {
+    if (url.startsWith("file://")) {
+      return FileImage(File(url.replaceFirst("file://", "")));
+    } else if (url.startsWith("novel:")) {
+      var ids = url.split(':').last.split('/');
+      return CachedNovelImageProvider(ids[0], ids[1]);
+    }
+    return CachedImageProvider(url) as ImageProvider;
+  }
 }

lib/pages/novel_reading_page.dart

@@ -1,6 +1,10 @@
 import 'package:fluent_ui/fluent_ui.dart';
+import 'package:pixes/components/animated_image.dart';
 import 'package:pixes/components/loading.dart';
+import 'package:pixes/foundation/image_provider.dart';
 import 'package:pixes/network/network.dart';
+import 'package:pixes/pages/image_page.dart';
+import 'package:pixes/utils/ext.dart';
 
 class NovelReadingPage extends StatefulWidget {
   const NovelReadingPage(this.novel, {super.key});
@@ -14,31 +18,20 @@ class NovelReadingPage extends StatefulWidget {
 class _NovelReadingPageState extends LoadingState<NovelReadingPage, String> {
   @override
   Widget buildContent(BuildContext context, String data) {
+    var content = buildList(context).toList();
     return ScaffoldPage(
       padding: EdgeInsets.zero,
       content: SelectionArea(
-        child: SingleChildScrollView(
+          child: DefaultTextStyle.merge(
+        style: const TextStyle(fontSize: 16.0, height: 1.6),
+        child: ListView.builder(
           padding: const EdgeInsets.all(16.0),
-          child: Column(
+          itemBuilder: (context, index) {
-            crossAxisAlignment: CrossAxisAlignment.start,
+            return content[index];
-            children: [
+          },
-              Text(widget.novel.title,
+          itemCount: content.length,
-                  style: const TextStyle(
-                      fontSize: 24.0, fontWeight: FontWeight.bold)),
-              const SizedBox(height: 12.0),
-              const Divider(
-                style: DividerThemeData(horizontalMargin: EdgeInsets.all(0)),
         ),
-              const SizedBox(height: 12.0),
-              Text(data,
-                  style: const TextStyle(
-                    fontSize: 16.0,
-                    height: 1.6,
       )),
-            ],
-          ),
-        ),
-      ),
     );
   }
 
@@ -46,4 +39,41 @@ class _NovelReadingPageState extends LoadingState<NovelReadingPage, String> {
   Future<Res<String>> loadData() {
     return Network().getNovelContent(widget.novel.id.toString());
   }
+
+  Iterable<Widget> buildList(BuildContext context) sync* {
+    yield Text(widget.novel.title,
+        style: const TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold));
+    yield const SizedBox(height: 12.0);
+    yield const Divider(
+      style: DividerThemeData(horizontalMargin: EdgeInsets.all(0)),
+    );
+    yield const SizedBox(height: 12.0);
+
+    var novelContent = data!.split('\n');
+    for (var content in novelContent) {
+      if (content.isEmpty) continue;
+      if (content.startsWith('[uploadedimage:')) {
+        var imageId = content.nums;
+        yield GestureDetector(
+          onTap: () {
+            ImagePage.show(["novel:${widget.novel.id.toString()}/$imageId"]);
+          },
+          child: SizedBox(
+            height: 300,
+            width: double.infinity,
+            child: AnimatedImage(
+              image:
+                  CachedNovelImageProvider(widget.novel.id.toString(), imageId),
+              filterQuality: FilterQuality.medium,
+              fit: BoxFit.contain,
+              height: 300,
+              width: double.infinity,
+            ),
+          ),
+        );
+      } else {
+        yield Text(content);
+      }
+    }
+  }
 }