mirror of
https://github.com/kodjodevf/mangayomi.git
synced 2026-03-11 17:25:32 +00:00
Fix indexing and path for downloaded chapter images and update padding logic
This commit is contained in:
parent
0960a5b80a
commit
0f430f80d9
4 changed files with 11 additions and 9 deletions
|
|
@ -281,7 +281,7 @@ Future<void> downloadChapter(
|
||||||
|
|
||||||
if (itemType == ItemType.manga) {
|
if (itemType == ItemType.manga) {
|
||||||
final file = File(
|
final file = File(
|
||||||
p.join(chapterDirectory.path, "${padIndex(index + 1)}.jpg"),
|
p.join(chapterDirectory.path, "${padIndex(index)}.jpg"),
|
||||||
);
|
);
|
||||||
if (!file.existsSync()) {
|
if (!file.existsSync()) {
|
||||||
pages.add(
|
pages.add(
|
||||||
|
|
@ -290,7 +290,7 @@ Future<void> downloadChapter(
|
||||||
headers: pageHeaders,
|
headers: pageHeaders,
|
||||||
fileName: p.join(
|
fileName: p.join(
|
||||||
chapterDirectory.path,
|
chapterDirectory.path,
|
||||||
"${padIndex(index + 1)}.jpg",
|
"${padIndex(index)}.jpg",
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
import 'dart:typed_data';
|
import 'dart:typed_data';
|
||||||
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:mangayomi/eval/lib.dart';
|
import 'package:mangayomi/eval/lib.dart';
|
||||||
import 'package:mangayomi/eval/javascript/http.dart';
|
import 'package:mangayomi/eval/javascript/http.dart';
|
||||||
import 'package:mangayomi/main.dart';
|
import 'package:mangayomi/main.dart';
|
||||||
|
|
@ -93,10 +94,7 @@ Future<GetChapterPagesModel> getChapterPages(
|
||||||
} else {
|
} else {
|
||||||
for (var i = 0; i < pageUrls.length; i++) {
|
for (var i = 0; i < pageUrls.length; i++) {
|
||||||
archiveImages.add(null);
|
archiveImages.add(null);
|
||||||
if (await File(
|
if (await File(p.join(path!.path, '${padIndex(i)}.jpg')).exists()) {
|
||||||
"${path!.path}"
|
|
||||||
"${padIndex(i + 1)}.jpg",
|
|
||||||
).exists()) {
|
|
||||||
isLocaleList.add(true);
|
isLocaleList.add(true);
|
||||||
} else {
|
} else {
|
||||||
isLocaleList.add(false);
|
isLocaleList.add(false);
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import 'package:mangayomi/utils/headers.dart';
|
||||||
import 'package:mangayomi/utils/reg_exp_matcher.dart';
|
import 'package:mangayomi/utils/reg_exp_matcher.dart';
|
||||||
import 'package:path/path.dart';
|
import 'package:path/path.dart';
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
import 'package:path/path.dart' as p;
|
||||||
|
|
||||||
extension LetExtension<T> on T {
|
extension LetExtension<T> on T {
|
||||||
R let<R>(R Function(T) block) {
|
R let<R>(R Function(T) block) {
|
||||||
|
|
@ -49,7 +50,7 @@ extension UChapDataPreloadExtensions on UChapDataPreload {
|
||||||
imageBytes = archiveImage;
|
imageBytes = archiveImage;
|
||||||
} else if (isLocale!) {
|
} else if (isLocale!) {
|
||||||
imageBytes = File(
|
imageBytes = File(
|
||||||
'${directory!.path}${padIndex(index! + 1)}.jpg',
|
p.join(directory!.path, "${padIndex(index!)}.jpg"),
|
||||||
).readAsBytesSync();
|
).readAsBytesSync();
|
||||||
} else {
|
} else {
|
||||||
File? cachedImage;
|
File? cachedImage;
|
||||||
|
|
@ -86,7 +87,10 @@ extension UChapDataPreloadExtensions on UChapDataPreload {
|
||||||
? ExtendedMemoryImageProvider(archiveImage)
|
? ExtendedMemoryImageProvider(archiveImage)
|
||||||
: ExtendedFileImageProvider(
|
: ExtendedFileImageProvider(
|
||||||
File(
|
File(
|
||||||
'${data.directory!.path}${padIndex(data.index! + 1)}.jpg',
|
p.join(
|
||||||
|
data.directory!.path,
|
||||||
|
"${padIndex(data.index!)}.jpg",
|
||||||
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
: CustomExtendedNetworkImageProvider(
|
: CustomExtendedNetworkImageProvider(
|
||||||
|
|
|
||||||
|
|
@ -38,5 +38,5 @@ String regCustomMatcher(String input, String source, int group) {
|
||||||
}
|
}
|
||||||
|
|
||||||
String padIndex(int index) {
|
String padIndex(int index) {
|
||||||
return index.toString().padLeft(3, "0");
|
return (index + 1).toString().padLeft(3, "0");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue