Creepso/mangayomi
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

code refactor

Browse source
This commit is contained in:
kodjomoustapha 2023-06-08 18:40:18 +01:00
parent 2a45b1d993
commit e90cf9f736
5 changed files with 453 additions and 356 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lib/main.dart
View file

@ -1,5 +1,4 @@
// ignore_for_file: depend_on_referenced_packages
import 'dart:io';
import 'package:desktop_webview_window/desktop_webview_window.dart';
import 'package:flex_color_scheme/flex_color_scheme.dart';
import 'package:flutter/material.dart';
@ -7,21 +6,12 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:isar/isar.dart';
import 'package:mangayomi/models/category.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/download.dart';
import 'package:mangayomi/models/history.dart';
import 'package:mangayomi/models/settings.dart';
import 'package:mangayomi/models/source.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/providers/storage_provider.dart';
import 'package:mangayomi/router/router.dart';
import 'package:mangayomi/modules/more/settings/appearance/providers/blend_level_state_provider.dart';
import 'package:mangayomi/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.dart';
import 'package:mangayomi/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart';
import 'package:mangayomi/modules/more/settings/appearance/providers/theme_mode_state_provider.dart';
import 'package:path_provider/path_provider.dart';
import 'package:path/path.dart' as path;
late Isar isar;
void main(List<String> args) async {
@ -29,49 +19,11 @@ void main(List<String> args) async {
return;
}
WidgetsFlutterBinding.ensureInitialized();
await _initDB();
isar = await StorageProvider().initDB(null);
await StorageProvider().requestPermission();
runApp(const ProviderScope(child: MyApp()));
}
_initDB() async {
final dir = await getApplicationDocumentsDirectory();
if (Platform.isAndroid || Platform.isIOS || Platform.isMacOS) {
isar = Isar.openSync(
[
MangaSchema,
ChapterSchema,
CategorySchema,
HistorySchema,
DownloadSchema,
SourceSchema,
SettingsSchema
],
directory: dir.path,
);
} else {
String dbDir = path.join(dir.path, 'Mangayomi', 'databases');
await Directory(dbDir).create(recursive: true);
isar = await Isar.open([
MangaSchema,
ChapterSchema,
CategorySchema,
HistorySchema,
DownloadSchema,
SourceSchema,
SettingsSchema
], directory: dbDir, name: "mangayomiDb");
}
if (isar.settings.filter().idEqualTo(227).isEmptySync()) {
isar.writeTxnSync(
() {
isar.settings.putSync(Settings()
);
},
);
}
}
_iniDateFormatting() {
initializeDateFormatting("en", null);
initializeDateFormatting("fr", null);

7
lib/modules/manga/download/download_page_widget.dart
View file

@ -1,4 +1,6 @@
// ignore_for_file: implementation_imports, depend_on_referenced_packages
import 'dart:io';
import 'package:background_downloader/background_downloader.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
@ -40,11 +42,16 @@ class _ChapterPageDownloadState extends ConsumerState<ChapterPageDownload>
late final manga = widget.chapter.manga.value!;
_deleteFile(List pageUrl) async {
final mangaDir =
await _storageProvider.getMangaMainDirectory(widget.chapter);
final path = await _storageProvider.getMangaChapterDirectory(
widget.chapter,
);
try {
if (await File("${mangaDir!.path}${widget.chapter.name}.cbz").exists()) {
File("${mangaDir.path}${widget.chapter.name}.cbz").deleteSync();
}
path!.deleteSync(recursive: true);
} catch (_) {}
isar.writeTxnSync(() {

6
lib/modules/manga/download/providers/download_provider.dart
View file

@ -118,7 +118,8 @@ Future<List<String>> downloadChapter(
}
}
bool cbzFileExist =
await File("${mangaDir!.path}${chapter.name}.cbz").exists();
await File("${mangaDir!.path}${chapter.name}.cbz").exists() &&
ref.watch(saveAsCBZArchiveStateProvider);
if (tasks.isEmpty && pageUrls.isNotEmpty || cbzFileExist) {
final model = Download(
succeeded: 0,
@ -128,6 +129,7 @@ Future<List<String>> downloadChapter(
taskIds: pageUrls,
isStartDownload: false,
chapterId: chapter.id);
if (!cbzFileExist) {
await ref.watch(convertToCBZProvider(
path.path, mangaDir.path, chapter.name!, pageUrls)
@ -142,10 +144,12 @@ Future<List<String>> downloadChapter(
tasks,
batchProgressCallback: (succeeded, failed) async {
if (succeeded == tasks.length) {
if (ref.watch(saveAsCBZArchiveStateProvider)) {
await ref.watch(convertToCBZProvider(
path!.path, mangaDir.path, chapter.name!, pageUrls)
.future);
}
}
bool isEmpty = isar.downloads
.filter()
.chapterIdEqualTo(chapter.id!)

146
lib/modules/manga/reader/manga_reader_view.dart
View file

@ -1,15 +1,21 @@
import 'dart:async';
import 'dart:convert';
import 'dart:math';
import 'dart:io';
import 'package:draggable_menu/draggable_menu.dart';
import 'package:extended_image/extended_image.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:isar/isar.dart';
import 'package:mangayomi/main.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/history.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/models/settings.dart';
import 'package:mangayomi/providers/storage_provider.dart';
import 'package:mangayomi/sources/utils/utils.dart';
import 'package:mangayomi/modules/manga/reader/providers/push_router.dart';
import 'package:mangayomi/services/get_chapter_url.dart';
@ -206,15 +212,20 @@ class _MangaChapterPageGalleryState
ref.read(currentIndexProvider(widget.chapter).notifier).setCurrentIndex(
posIndex,
);
widget.readerController.setMangaHistoryUpdate();
widget.readerController.setPageIndex(posIndex);
widget.readerController.setChapterPageLastRead(posIndex);
final datas = {
"chapterId": widget.chapter.id,
"pageIndex": posIndex,
"path": _dir!.path,
};
compute(_isolateService, jsonEncode(datas));
_currentIndex = posIndex;
}
}
}
Directory? _dir;
_initCurrentIndex() async {
_dir = await StorageProvider().getDatabaseDirectory();
widget.readerController.setMangaHistoryUpdate();
await Future.delayed(const Duration(milliseconds: 1));
_selectedValue = widget.readerController.getReaderMode();
@ -225,9 +236,12 @@ class _MangaChapterPageGalleryState
ref.read(currentIndexProvider(widget.chapter).notifier).setCurrentIndex(
index,
);
widget.readerController.setMangaHistoryUpdate();
widget.readerController.setPageIndex(index);
widget.readerController.setChapterPageLastRead(index);
final datas = {
"chapterId": widget.chapter.id,
"pageIndex": index,
"path": _dir!.path,
};
compute(_isolateService, jsonEncode(datas));
_currentIndex = index;
if (_imageDetailY != 0) {
_imageDetailY = 0;
@ -414,11 +428,7 @@ class _MangaChapterPageGalleryState
Theme.of(context).scaffoldBackgroundColor.withOpacity(0.9);
Widget _showMore() {
return Consumer(
builder: (context, ref, child) {
final currentIndex = ref.watch(currentIndexProvider(widget.chapter));
bool isNotFirstChapter =
widget.readerController.getChapterIndex() + 1 !=
bool isNotFirstChapter = widget.readerController.getChapterIndex() + 1 !=
widget.readerController.getChaptersLength();
bool isNotLastChapter = widget.readerController.getChapterIndex() != 0;
return Column(
@ -549,18 +559,28 @@ class _MangaChapterPageGalleryState
scaleX: !_isReversHorizontal ? 1 : -1,
child: SizedBox(
width: 25,
child: Text(
child: Consumer(
builder: (context, ref, child) {
final currentIndex = ref.watch(
currentIndexProvider(
widget.chapter));
return Text(
"${currentIndex + 1} ",
style: const TextStyle(
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
),
);
}),
),
),
),
Flexible(
child: Slider(
child:
Consumer(builder: (context, ref, child) {
final currentIndex = ref.watch(
currentIndexProvider(widget.chapter));
return Slider(
onChanged: (newValue) {
_onBtnTapped(newValue.toInt(), true,
isSlide: true);
@ -571,7 +591,7 @@ class _MangaChapterPageGalleryState
1,
1),
value: min(
_currentIndex.toDouble(),
currentIndex.toDouble(),
widget.readerController
.getPageLength(widget.url)
.toDouble()),
@ -580,7 +600,8 @@ class _MangaChapterPageGalleryState
.getPageLength(widget.url) -
1)
.toDouble(),
),
);
}),
),
Padding(
padding: const EdgeInsets.only(right: 12),
@ -624,10 +645,7 @@ class _MangaChapterPageGalleryState
child: Icon(
Icons.skip_next_rounded,
color: isNotLastChapter
? Theme.of(context)
.textTheme
.bodyLarge!
.color
? Theme.of(context).textTheme.bodyLarge!.color
: Theme.of(context)
.textTheme
.bodyLarge!
@ -711,20 +729,18 @@ class _MangaChapterPageGalleryState
),
],
);
},
);
}
Widget _showPage() {
return Consumer(
builder: (context, ref, child) {
final currentIndex = ref.watch(currentIndexProvider(widget.chapter));
return _isView
? Container()
: _showPagesNumber
? Align(
alignment: Alignment.bottomCenter,
child: Text(
child: Consumer(builder: (context, ref, child) {
final currentIndex =
ref.watch(currentIndexProvider(widget.chapter));
return Text(
'${currentIndex + 1} / ${widget.readerController.getPageLength(widget.url)}',
style: const TextStyle(
color: Colors.white,
@ -734,11 +750,10 @@ class _MangaChapterPageGalleryState
],
),
textAlign: TextAlign.center,
),
);
}),
)
: Container();
},
);
}
_isViewFunction() {
@ -1184,3 +1199,76 @@ class _MangaChapterPageGalleryState
)));
}
}
_isolateService(String data) async {
late Isar isarIsolate;
isarIsolate = await StorageProvider().initDB(jsonDecode(data)["path"]);
Chapter? chapter =
isarIsolate.chapters.getSync(jsonDecode(data)["chapterId"]);
Manga? manga = chapter!.manga.value!;
Settings? isarIsolateSettings = isarIsolate.settings.getSync(227)!;
bool incognitoMode = isarIsolate.settings.getSync(227)!.incognitoMode!;
int pageIndex = jsonDecode(data)["pageIndex"];
//setMangaHistoryUpdate
if (!incognitoMode) {
isarIsolate.writeTxnSync(() {
Manga? manga = chapter.manga.value;
manga!.lastRead = DateTime.now().millisecondsSinceEpoch;
isarIsolate.mangas.putSync(manga);
});
History? history;
final empty =
isarIsolate.historys.filter().mangaIdEqualTo(manga.id).isEmptySync();
if (empty) {
history = History(
mangaId: manga.id,
date: DateTime.now().millisecondsSinceEpoch.toString())
..chapter.value = chapter;
} else {
history = (isarIsolate.historys
.filter()
.mangaIdEqualTo(manga.id)
.findFirstSync())!
..chapter.value = chapter
..date = DateTime.now().millisecondsSinceEpoch.toString();
}
isarIsolate.writeTxnSync(() {
isarIsolate.historys.putSync(history!);
history.chapter.saveSync();
});
}
//setPageIndex
if (!incognitoMode) {
List<ChapterPageIndex>? chapterPageIndexs = [];
for (var chapterPageIndex
in isarIsolateSettings.chapterPageIndexList ?? []) {
if (chapterPageIndex.chapterId != chapter.id) {
chapterPageIndexs.add(chapterPageIndex);
}
}
chapterPageIndexs.add(ChapterPageIndex()
..chapterId = chapter.id
..index = pageIndex);
isarIsolate.writeTxnSync(() => isarIsolate.settings.putSync(
isarIsolateSettings..chapterPageIndexList = chapterPageIndexs));
}
//setChapterPageLastRead
if (!incognitoMode) {
final chap = chapter;
isarIsolate.writeTxnSync(() {
chap.isRead = (pageIndex + 1) ==
isarIsolateSettings.chapterPageUrlsList!
.where((element) => element.chapterId == chapter.id)
.first
.urls!
.length;
chap.lastPageRead = (pageIndex + 1).toString();
isarIsolate.chapters.putSync(chap);
});
}
}

46
lib/providers/storage_provider.dart
View file

@ -1,10 +1,17 @@
// ignore_for_file: depend_on_referenced_packages
import 'dart:io';
import 'package:isar/isar.dart';
import 'package:mangayomi/main.dart';
import 'package:mangayomi/models/category.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/download.dart';
import 'package:mangayomi/models/history.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/models/settings.dart';
import 'package:mangayomi/models/source.dart';
import 'package:path_provider/path_provider.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:path/path.dart' as path;
class StorageProvider {
RegExp regExpChar = RegExp(r'[^a-zA-Z0-9 .()\-\s]');
@ -67,4 +74,43 @@ class StorageProvider {
return Directory(
"${dir!.path}/downloads/${manga.source} (${manga.lang!.toUpperCase()})/${manga.name!.replaceAll(regExpChar, '_')}/");
}
Future<Directory?> getDatabaseDirectory() async {
final dir = await getApplicationDocumentsDirectory();
if (Platform.isAndroid || Platform.isIOS || Platform.isMacOS) {
return dir;
} else {
String dbDir = path.join(dir.path, 'Mangayomi', 'databases');
await Directory(dbDir).create(recursive: true);
return Directory(dbDir);
}
}
Future<Isar> initDB(String? path) async {
Directory? dir;
if (path == null) {
dir = await getDatabaseDirectory();
} else {
dir = Directory(path);
}
final isar = Isar.openSync([
MangaSchema,
ChapterSchema,
CategorySchema,
HistorySchema,
DownloadSchema,
SourceSchema,
SettingsSchema
], directory: dir!.path, name: "mangayomiDb");
if (isar.settings.filter().idEqualTo(227).isEmptySync()) {
isar.writeTxnSync(
() {
isar.settings.putSync(Settings());
},
);
}
return isar;
}
}