mirror of
https://github.com/venera-app/venera.git
synced 2025-09-27 15:57:25 +00:00
1
android/.gitignore
vendored
1
android/.gitignore
vendored
@@ -11,3 +11,4 @@ GeneratedPluginRegistrant.java
|
|||||||
key.properties
|
key.properties
|
||||||
**/*.keystore
|
**/*.keystore
|
||||||
**/*.jks
|
**/*.jks
|
||||||
|
/app/.cxx/
|
||||||
|
@@ -34,6 +34,8 @@ android {
|
|||||||
|
|
||||||
splits{
|
splits{
|
||||||
abi {
|
abi {
|
||||||
|
reset()
|
||||||
|
include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
|
||||||
enable true
|
enable true
|
||||||
universalApk true
|
universalApk true
|
||||||
}
|
}
|
||||||
|
@@ -8,7 +8,6 @@ import android.content.pm.PackageManager
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Environment
|
import android.os.Environment
|
||||||
import android.provider.DocumentsContract
|
|
||||||
import android.provider.Settings
|
import android.provider.Settings
|
||||||
import android.view.KeyEvent
|
import android.view.KeyEvent
|
||||||
import androidx.activity.result.ActivityResultCallback
|
import androidx.activity.result.ActivityResultCallback
|
||||||
@@ -96,11 +95,7 @@ class MainActivity : FlutterFragmentActivity() {
|
|||||||
if (pickedDirectoryUri == null)
|
if (pickedDirectoryUri == null)
|
||||||
res.success(null)
|
res.success(null)
|
||||||
else
|
else
|
||||||
try {
|
onPickedDirectory(pickedDirectoryUri, res)
|
||||||
res.success(onPickedDirectory(pickedDirectoryUri))
|
|
||||||
} catch (e: Exception) {
|
|
||||||
res.error("Failed to Copy Files", e.toString(), null)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,8 +129,9 @@ class MainActivity : FlutterFragmentActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val selectFileChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "venera/select_file")
|
val selectFileChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "venera/select_file")
|
||||||
selectFileChannel.setMethodCallHandler { _, res ->
|
selectFileChannel.setMethodCallHandler { req, res ->
|
||||||
openFile(res)
|
val mimeType = req.arguments<String>()
|
||||||
|
openFile(res, mimeType!!)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -166,26 +162,40 @@ class MainActivity : FlutterFragmentActivity() {
|
|||||||
return super.onKeyDown(keyCode, event)
|
return super.onKeyDown(keyCode, event)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// copy the directory to tmp directory, return copied directory
|
/// Ensure that the directory is accessible by dart:io
|
||||||
private fun onPickedDirectory(uri: Uri): String {
|
private fun onPickedDirectory(uri: Uri, result: MethodChannel.Result) {
|
||||||
if (!hasStoragePermission()) {
|
if (hasStoragePermission()) {
|
||||||
|
var plain = uri.toString()
|
||||||
|
if(plain.contains("%3A")) {
|
||||||
|
plain = Uri.decode(plain)
|
||||||
|
}
|
||||||
|
val externalStoragePrefix = "content://com.android.externalstorage.documents/tree/primary:";
|
||||||
|
if(plain.startsWith(externalStoragePrefix)) {
|
||||||
|
val path = plain.substring(externalStoragePrefix.length)
|
||||||
|
result.success(Environment.getExternalStorageDirectory().absolutePath + "/" + path)
|
||||||
|
}
|
||||||
|
// The uri cannot be parsed to plain path, use copy method
|
||||||
|
}
|
||||||
// dart:io cannot access the directory without permission.
|
// dart:io cannot access the directory without permission.
|
||||||
// so we need to copy the directory to cache directory
|
// so we need to copy the directory to cache directory
|
||||||
val contentResolver = contentResolver
|
val contentResolver = contentResolver
|
||||||
var tmp = cacheDir
|
var tmp = cacheDir
|
||||||
tmp = File(tmp, "getDirectoryPathTemp")
|
var dirName = DocumentFile.fromTreeUri(this, uri)?.name
|
||||||
|
tmp = File(tmp, dirName!!)
|
||||||
|
if(tmp.exists()) {
|
||||||
|
tmp.deleteRecursively()
|
||||||
|
}
|
||||||
tmp.mkdir()
|
tmp.mkdir()
|
||||||
Thread {
|
Thread {
|
||||||
|
try {
|
||||||
copyDirectory(contentResolver, uri, tmp)
|
copyDirectory(contentResolver, uri, tmp)
|
||||||
|
result.success(tmp.absolutePath)
|
||||||
|
}
|
||||||
|
catch (e: Exception) {
|
||||||
|
result.error("copy error", e.message, null)
|
||||||
|
}
|
||||||
}.start()
|
}.start()
|
||||||
|
|
||||||
return tmp.absolutePath
|
|
||||||
} else {
|
|
||||||
val docId = DocumentsContract.getTreeDocumentId(uri)
|
|
||||||
val split: Array<String?> = docId.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
|
|
||||||
return if ((split.size >= 2) && (split[1] != null)) split[1]!!
|
|
||||||
else File.separator
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun copyDirectory(resolver: ContentResolver, srcUri: Uri, destDir: File) {
|
private fun copyDirectory(resolver: ContentResolver, srcUri: Uri, destDir: File) {
|
||||||
@@ -197,11 +207,12 @@ class MainActivity : FlutterFragmentActivity() {
|
|||||||
copyDirectory(resolver, file.uri, newDir)
|
copyDirectory(resolver, file.uri, newDir)
|
||||||
} else {
|
} else {
|
||||||
val newFile = File(destDir, file.name!!)
|
val newFile = File(destDir, file.name!!)
|
||||||
val inputStream = resolver.openInputStream(file.uri) ?: return
|
resolver.openInputStream(file.uri)?.use { input ->
|
||||||
val outputStream = FileOutputStream(newFile)
|
FileOutputStream(newFile).use { output ->
|
||||||
inputStream.copyTo(outputStream)
|
input.copyTo(output, bufferSize = DEFAULT_BUFFER_SIZE)
|
||||||
inputStream.close()
|
output.flush()
|
||||||
outputStream.close()
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -277,10 +288,10 @@ class MainActivity : FlutterFragmentActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun openFile(result: MethodChannel.Result) {
|
private fun openFile(result: MethodChannel.Result, mimeType: String) {
|
||||||
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
|
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
|
||||||
intent.addCategory(Intent.CATEGORY_OPENABLE)
|
intent.addCategory(Intent.CATEGORY_OPENABLE)
|
||||||
intent.type = "*/*"
|
intent.type = mimeType
|
||||||
startContractForResult(ActivityResultContracts.StartActivityForResult(), intent){ activityResult ->
|
startContractForResult(ActivityResultContracts.StartActivityForResult(), intent){ activityResult ->
|
||||||
if (activityResult.resultCode != Activity.RESULT_OK) {
|
if (activityResult.resultCode != Activity.RESULT_OK) {
|
||||||
result.success(null)
|
result.success(null)
|
||||||
@@ -312,20 +323,9 @@ class MainActivity : FlutterFragmentActivity() {
|
|||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// copy file to cache directory
|
// use copy method
|
||||||
val cacheDir = cacheDir
|
val filePath = FileUtils.getPathFromCopyOfFileFromUri(this, uri)
|
||||||
val newFile = File(cacheDir, fileName)
|
result.success(filePath)
|
||||||
val inputStream = contentResolver.openInputStream(uri)
|
|
||||||
if (inputStream == null) {
|
|
||||||
result.success(null)
|
|
||||||
return@startContractForResult
|
|
||||||
}
|
|
||||||
val outputStream = FileOutputStream(newFile)
|
|
||||||
inputStream.copyTo(outputStream)
|
|
||||||
inputStream.close()
|
|
||||||
outputStream.close()
|
|
||||||
// send file path to flutter
|
|
||||||
result.success(newFile.absolutePath)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -880,8 +880,8 @@ function Comic({id, title, subtitle, subTitle, cover, tags, description, maxPage
|
|||||||
* @param cover {string}
|
* @param cover {string}
|
||||||
* @param description {string?}
|
* @param description {string?}
|
||||||
* @param tags {Map<string, string[]> | {} | null | undefined}
|
* @param tags {Map<string, string[]> | {} | null | undefined}
|
||||||
* @param chapters {Map<string, string> | {} | null | undefined}} - key: chapter id, value: chapter title
|
* @param chapters {Map<string, string> | {} | null | undefined} - key: chapter id, value: chapter title
|
||||||
* @param isFavorite {boolean | null | undefined}} - favorite status. If the comic source supports multiple folders, this field should be null
|
* @param isFavorite {boolean | null | undefined} - favorite status. If the comic source supports multiple folders, this field should be null
|
||||||
* @param subId {string?} - a param which is passed to comments api
|
* @param subId {string?} - a param which is passed to comments api
|
||||||
* @param thumbnails {string[]?} - for multiple page thumbnails, set this to null, and use `loadThumbnails` api to load thumbnails
|
* @param thumbnails {string[]?} - for multiple page thumbnails, set this to null, and use `loadThumbnails` api to load thumbnails
|
||||||
* @param recommend {Comic[]?} - related comics
|
* @param recommend {Comic[]?} - related comics
|
||||||
@@ -894,9 +894,10 @@ function Comic({id, title, subtitle, subTitle, cover, tags, description, maxPage
|
|||||||
* @param url {string?}
|
* @param url {string?}
|
||||||
* @param stars {number?} - 0-5, double
|
* @param stars {number?} - 0-5, double
|
||||||
* @param maxPage {number?}
|
* @param maxPage {number?}
|
||||||
|
* @param comments {Comment[]?}- `since 1.0.7` App will display comments in the details page.
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
function ComicDetails({title, cover, description, tags, chapters, isFavorite, subId, thumbnails, recommend, commentCount, likesCount, isLiked, uploader, updateTime, uploadTime, url, stars, maxPage}) {
|
function ComicDetails({title, cover, description, tags, chapters, isFavorite, subId, thumbnails, recommend, commentCount, likesCount, isLiked, uploader, updateTime, uploadTime, url, stars, maxPage, comments}) {
|
||||||
this.title = title;
|
this.title = title;
|
||||||
this.cover = cover;
|
this.cover = cover;
|
||||||
this.description = description;
|
this.description = description;
|
||||||
@@ -915,6 +916,7 @@ function ComicDetails({title, cover, description, tags, chapters, isFavorite, su
|
|||||||
this.url = url;
|
this.url = url;
|
||||||
this.stars = stars;
|
this.stars = stars;
|
||||||
this.maxPage = maxPage;
|
this.maxPage = maxPage;
|
||||||
|
this.comments = comments;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -41,9 +41,14 @@
|
|||||||
"Select a folder": "选择一个文件夹",
|
"Select a folder": "选择一个文件夹",
|
||||||
"Folder": "文件夹",
|
"Folder": "文件夹",
|
||||||
"Confirm": "确认",
|
"Confirm": "确认",
|
||||||
"Are you sure you want to delete this comic?": "您确定要删除这部漫画吗?",
|
"Remove comic from favorite?": "从收藏中移除漫画?",
|
||||||
"Are you sure you want to delete @a selected comics?": "您确定要删除 @a 部漫画吗?",
|
"Move": "移动",
|
||||||
|
"Move to folder": "移动到文件夹",
|
||||||
|
"Copy to folder": "复制到文件夹",
|
||||||
|
"Delete Comic": "删除漫画",
|
||||||
|
"Delete @c comics?": "删除 @c 本漫画?",
|
||||||
"Add comic source": "添加漫画源",
|
"Add comic source": "添加漫画源",
|
||||||
|
"Delete comic source '@n' ?": "删除漫画源 '@n' ?",
|
||||||
"Select file": "选择文件",
|
"Select file": "选择文件",
|
||||||
"View list": "查看列表",
|
"View list": "查看列表",
|
||||||
"Open help": "打开帮助",
|
"Open help": "打开帮助",
|
||||||
@@ -132,7 +137,8 @@
|
|||||||
"Block": "屏蔽",
|
"Block": "屏蔽",
|
||||||
"Add new favorite to": "添加新收藏到",
|
"Add new favorite to": "添加新收藏到",
|
||||||
"Move favorite after reading": "阅读后移动收藏",
|
"Move favorite after reading": "阅读后移动收藏",
|
||||||
"Are you sure you want to delete this folder?" : "确定要删除这个收藏夹吗?",
|
"Delete folder?" : "刪除文件夾?",
|
||||||
|
"Delete folder '@f' ?" : "删除文件夹 '@f' ?",
|
||||||
"Import from file": "从文件导入",
|
"Import from file": "从文件导入",
|
||||||
"Failed to import": "导入失败",
|
"Failed to import": "导入失败",
|
||||||
"Cache Limit": "缓存限制",
|
"Cache Limit": "缓存限制",
|
||||||
@@ -215,7 +221,7 @@
|
|||||||
"Authorization Required": "需要身份验证",
|
"Authorization Required": "需要身份验证",
|
||||||
"Sync": "同步",
|
"Sync": "同步",
|
||||||
"The folder is Linked to @source": "文件夹已关联到 @source",
|
"The folder is Linked to @source": "文件夹已关联到 @source",
|
||||||
"Source Folder": "源收藏夹",
|
"Source Folder": "源文件夹",
|
||||||
"Use a config file": "使用配置文件",
|
"Use a config file": "使用配置文件",
|
||||||
"Comic Source list": "漫画源列表",
|
"Comic Source list": "漫画源列表",
|
||||||
"View": "查看",
|
"View": "查看",
|
||||||
@@ -229,7 +235,16 @@
|
|||||||
"No Explore Pages": "没有探索页面",
|
"No Explore Pages": "没有探索页面",
|
||||||
"Add a comic source in home page": "在主页添加一个漫画源",
|
"Add a comic source in home page": "在主页添加一个漫画源",
|
||||||
"Please check your settings": "请检查您的设置",
|
"Please check your settings": "请检查您的设置",
|
||||||
"No Category Pages": "没有分类页面"
|
"No Category Pages": "没有分类页面",
|
||||||
|
"Chapter @ep": "第 @ep 章",
|
||||||
|
"Page @page": "第 @page 页",
|
||||||
|
"Also remove files on disk": "同时删除磁盘上的文件",
|
||||||
|
"Copy to app local path": "将漫画复制到本地存储目录中",
|
||||||
|
"Delete all unavailable local favorite items": "删除所有无效的本地收藏",
|
||||||
|
"Deleted @a favorite items.": "已删除 @a 条无效收藏",
|
||||||
|
"New version available": "有新版本可用",
|
||||||
|
"A new version is available. Do you want to update now?" : "有新版本可用。您要现在更新吗?",
|
||||||
|
"No new version available": "没有新版本可用"
|
||||||
},
|
},
|
||||||
"zh_TW": {
|
"zh_TW": {
|
||||||
"Home": "首頁",
|
"Home": "首頁",
|
||||||
@@ -275,9 +290,14 @@
|
|||||||
"Select a folder": "選擇一個文件夾",
|
"Select a folder": "選擇一個文件夾",
|
||||||
"Folder": "文件夾",
|
"Folder": "文件夾",
|
||||||
"Confirm": "確認",
|
"Confirm": "確認",
|
||||||
"Are you sure you want to delete this comic?": "您確定要刪除這部漫畫嗎?",
|
"Remove comic from favorite?": "從收藏中移除漫畫?",
|
||||||
"Are you sure you want to delete @a selected comics?": "您確定要刪除 @a 部漫畫嗎?",
|
"Move": "移動",
|
||||||
|
"Move to folder": "移動到文件夾",
|
||||||
|
"Copy to folder": "複製到文件夾",
|
||||||
|
"Delete Comic": "刪除漫畫",
|
||||||
|
"Delete @c comics?": "刪除 @c 本漫畫?",
|
||||||
"Add comic source": "添加漫畫源",
|
"Add comic source": "添加漫畫源",
|
||||||
|
"Delete comic source '@n' ?": "刪除漫畫源 '@n' ?",
|
||||||
"Select file": "選擇文件",
|
"Select file": "選擇文件",
|
||||||
"View list": "查看列表",
|
"View list": "查看列表",
|
||||||
"Open help": "打開幫助",
|
"Open help": "打開幫助",
|
||||||
@@ -364,7 +384,8 @@
|
|||||||
"Block": "屏蔽",
|
"Block": "屏蔽",
|
||||||
"Add new favorite to": "添加新收藏到",
|
"Add new favorite to": "添加新收藏到",
|
||||||
"Move favorite after reading": "閱讀後移動收藏",
|
"Move favorite after reading": "閱讀後移動收藏",
|
||||||
"Are you sure you want to delete this folder?" : "確定要刪除這個收藏夾嗎?",
|
"Delete folder?" : "刪除文件夾?",
|
||||||
|
"Delete folder '@f' ?" : "刪除文件夾 '@f' ?",
|
||||||
"Import from file": "從文件匯入",
|
"Import from file": "從文件匯入",
|
||||||
"Failed to import": "匯入失敗",
|
"Failed to import": "匯入失敗",
|
||||||
"Cache Limit": "緩存限制",
|
"Cache Limit": "緩存限制",
|
||||||
@@ -447,7 +468,7 @@
|
|||||||
"Authorization Required": "需要身份驗證",
|
"Authorization Required": "需要身份驗證",
|
||||||
"Sync": "同步",
|
"Sync": "同步",
|
||||||
"The folder is Linked to @source": "文件夾已關聯到 @source",
|
"The folder is Linked to @source": "文件夾已關聯到 @source",
|
||||||
"Source Folder": "源收藏夾",
|
"Source Folder": "源文件夾",
|
||||||
"Use a config file": "使用配置文件",
|
"Use a config file": "使用配置文件",
|
||||||
"Comic Source list": "漫畫源列表",
|
"Comic Source list": "漫畫源列表",
|
||||||
"View": "查看",
|
"View": "查看",
|
||||||
@@ -461,6 +482,15 @@
|
|||||||
"No Explore Pages": "沒有探索頁面",
|
"No Explore Pages": "沒有探索頁面",
|
||||||
"Add a comic source in home page": "在主頁添加一個漫畫源",
|
"Add a comic source in home page": "在主頁添加一個漫畫源",
|
||||||
"Please check your settings": "請檢查您的設定",
|
"Please check your settings": "請檢查您的設定",
|
||||||
"No Category Pages": "沒有分類頁面"
|
"No Category Pages": "沒有分類頁面",
|
||||||
|
"Chapter @ep": "第 @ep 章",
|
||||||
|
"Page @page": "第 @page 頁",
|
||||||
|
"Also remove files on disk": "同時刪除磁盤上的文件",
|
||||||
|
"Copy to app local path": "將漫畫複製到本地儲存目錄中",
|
||||||
|
"Delete all unavailable local favorite items": "刪除所有無效的本地收藏",
|
||||||
|
"Deleted @a favorite items.": "已刪除 @a 條無效收藏",
|
||||||
|
"New version available": "有新版本可用",
|
||||||
|
"A new version is available. Do you want to update now?" : "有新版本可用。您要現在更新嗎?",
|
||||||
|
"No new version available": "沒有新版本可用"
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -115,6 +115,11 @@ class _AppbarState extends State<Appbar> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum AppbarStyle {
|
||||||
|
blur,
|
||||||
|
shadow,
|
||||||
|
}
|
||||||
|
|
||||||
class SliverAppbar extends StatelessWidget {
|
class SliverAppbar extends StatelessWidget {
|
||||||
const SliverAppbar({
|
const SliverAppbar({
|
||||||
super.key,
|
super.key,
|
||||||
@@ -122,6 +127,7 @@ class SliverAppbar extends StatelessWidget {
|
|||||||
this.leading,
|
this.leading,
|
||||||
this.actions,
|
this.actions,
|
||||||
this.radius = 0,
|
this.radius = 0,
|
||||||
|
this.style = AppbarStyle.blur,
|
||||||
});
|
});
|
||||||
|
|
||||||
final Widget? leading;
|
final Widget? leading;
|
||||||
@@ -132,6 +138,8 @@ class SliverAppbar extends StatelessWidget {
|
|||||||
|
|
||||||
final double radius;
|
final double radius;
|
||||||
|
|
||||||
|
final AppbarStyle style;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return SliverPersistentHeader(
|
return SliverPersistentHeader(
|
||||||
@@ -142,6 +150,7 @@ class SliverAppbar extends StatelessWidget {
|
|||||||
actions: actions,
|
actions: actions,
|
||||||
topPadding: MediaQuery.of(context).padding.top,
|
topPadding: MediaQuery.of(context).padding.top,
|
||||||
radius: radius,
|
radius: radius,
|
||||||
|
style: style,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -160,24 +169,21 @@ class _MySliverAppBarDelegate extends SliverPersistentHeaderDelegate {
|
|||||||
|
|
||||||
final double radius;
|
final double radius;
|
||||||
|
|
||||||
_MySliverAppBarDelegate(
|
final AppbarStyle style;
|
||||||
{this.leading,
|
|
||||||
|
_MySliverAppBarDelegate({
|
||||||
|
this.leading,
|
||||||
required this.title,
|
required this.title,
|
||||||
this.actions,
|
this.actions,
|
||||||
required this.topPadding,
|
required this.topPadding,
|
||||||
this.radius = 0});
|
this.radius = 0,
|
||||||
|
this.style = AppbarStyle.blur,
|
||||||
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(
|
Widget build(
|
||||||
BuildContext context, double shrinkOffset, bool overlapsContent) {
|
BuildContext context, double shrinkOffset, bool overlapsContent) {
|
||||||
return SizedBox.expand(
|
var body = Row(
|
||||||
child: BlurEffect(
|
|
||||||
blur: 15,
|
|
||||||
child: Material(
|
|
||||||
color: context.colorScheme.surface.withOpacity(0.72),
|
|
||||||
elevation: 0,
|
|
||||||
borderRadius: BorderRadius.circular(radius),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
children: [
|
||||||
const SizedBox(width: 8),
|
const SizedBox(width: 8),
|
||||||
leading ??
|
leading ??
|
||||||
@@ -207,10 +213,30 @@ class _MySliverAppBarDelegate extends SliverPersistentHeaderDelegate {
|
|||||||
width: 8,
|
width: 8,
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
).paddingTop(topPadding),
|
).paddingTop(topPadding);
|
||||||
|
|
||||||
|
if(style == AppbarStyle.blur) {
|
||||||
|
return SizedBox.expand(
|
||||||
|
child: BlurEffect(
|
||||||
|
blur: 15,
|
||||||
|
child: Material(
|
||||||
|
color: context.colorScheme.surface.withOpacity(0.72),
|
||||||
|
elevation: 0,
|
||||||
|
borderRadius: BorderRadius.circular(radius),
|
||||||
|
child: body,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
return SizedBox.expand(
|
||||||
|
child: Material(
|
||||||
|
color: context.colorScheme.surface,
|
||||||
|
elevation: shrinkOffset == 0 ? 0 : 2,
|
||||||
|
borderRadius: BorderRadius.circular(radius),
|
||||||
|
child: body,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -224,7 +250,10 @@ class _MySliverAppBarDelegate extends SliverPersistentHeaderDelegate {
|
|||||||
return oldDelegate is! _MySliverAppBarDelegate ||
|
return oldDelegate is! _MySliverAppBarDelegate ||
|
||||||
leading != oldDelegate.leading ||
|
leading != oldDelegate.leading ||
|
||||||
title != oldDelegate.title ||
|
title != oldDelegate.title ||
|
||||||
actions != oldDelegate.actions;
|
actions != oldDelegate.actions ||
|
||||||
|
topPadding != oldDelegate.topPadding ||
|
||||||
|
radius != oldDelegate.radius ||
|
||||||
|
style != oldDelegate.style;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,14 +1,14 @@
|
|||||||
part of 'components.dart';
|
part of 'components.dart';
|
||||||
|
|
||||||
class ComicTile extends StatelessWidget {
|
class ComicTile extends StatelessWidget {
|
||||||
const ComicTile({
|
const ComicTile(
|
||||||
super.key,
|
{super.key,
|
||||||
required this.comic,
|
required this.comic,
|
||||||
this.enableLongPressed = true,
|
this.enableLongPressed = true,
|
||||||
this.badge,
|
this.badge,
|
||||||
this.menuOptions,
|
this.menuOptions,
|
||||||
this.onTap,
|
this.onTap,
|
||||||
});
|
this.onLongPressed});
|
||||||
|
|
||||||
final Comic comic;
|
final Comic comic;
|
||||||
|
|
||||||
@@ -20,6 +20,8 @@ class ComicTile extends StatelessWidget {
|
|||||||
|
|
||||||
final VoidCallback? onTap;
|
final VoidCallback? onTap;
|
||||||
|
|
||||||
|
final VoidCallback? onLongPressed;
|
||||||
|
|
||||||
void _onTap() {
|
void _onTap() {
|
||||||
if (onTap != null) {
|
if (onTap != null) {
|
||||||
onTap!();
|
onTap!();
|
||||||
@@ -29,6 +31,14 @@ class ComicTile extends StatelessWidget {
|
|||||||
?.to(() => ComicPage(id: comic.id, sourceKey: comic.sourceKey));
|
?.to(() => ComicPage(id: comic.id, sourceKey: comic.sourceKey));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onLongPressed(context) {
|
||||||
|
if (onLongPressed != null) {
|
||||||
|
onLongPressed!();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
onLongPress(context);
|
||||||
|
}
|
||||||
|
|
||||||
void onLongPress(BuildContext context) {
|
void onLongPress(BuildContext context) {
|
||||||
var renderBox = context.findRenderObject() as RenderBox;
|
var renderBox = context.findRenderObject() as RenderBox;
|
||||||
var size = renderBox.size;
|
var size = renderBox.size;
|
||||||
@@ -154,8 +164,6 @@ class ComicTile extends StatelessWidget {
|
|||||||
ImageProvider image;
|
ImageProvider image;
|
||||||
if (comic is LocalComic) {
|
if (comic is LocalComic) {
|
||||||
image = FileImage((comic as LocalComic).coverFile);
|
image = FileImage((comic as LocalComic).coverFile);
|
||||||
} else if (comic.cover.startsWith('file://')) {
|
|
||||||
image = FileImage(File(comic.cover.substring(7)));
|
|
||||||
} else if (comic.sourceKey == 'local') {
|
} else if (comic.sourceKey == 'local') {
|
||||||
var localComic = LocalManager().find(comic.id, ComicType.local);
|
var localComic = LocalManager().find(comic.id, ComicType.local);
|
||||||
if (localComic == null) {
|
if (localComic == null) {
|
||||||
@@ -183,7 +191,7 @@ class ComicTile extends StatelessWidget {
|
|||||||
return InkWell(
|
return InkWell(
|
||||||
borderRadius: BorderRadius.circular(12),
|
borderRadius: BorderRadius.circular(12),
|
||||||
onTap: _onTap,
|
onTap: _onTap,
|
||||||
onLongPress: enableLongPressed ? () => onLongPress(context) : null,
|
onLongPress: enableLongPressed ? () => _onLongPressed(context) : null,
|
||||||
onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
|
onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.fromLTRB(16, 8, 24, 8),
|
padding: const EdgeInsets.fromLTRB(16, 8, 24, 8),
|
||||||
@@ -233,7 +241,7 @@ class ComicTile extends StatelessWidget {
|
|||||||
borderRadius: BorderRadius.circular(8),
|
borderRadius: BorderRadius.circular(8),
|
||||||
onTap: _onTap,
|
onTap: _onTap,
|
||||||
onLongPress:
|
onLongPress:
|
||||||
enableLongPressed ? () => onLongPress(context) : null,
|
enableLongPressed ? () => _onLongPressed(context) : null,
|
||||||
onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
|
onSecondaryTapDown: (detail) => onSecondaryTap(detail, context),
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
@@ -253,18 +261,34 @@ class ComicTile extends StatelessWidget {
|
|||||||
child: buildImage(context),
|
child: buildImage(context),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Positioned(
|
Align(
|
||||||
bottom: 0,
|
alignment: Alignment.bottomRight,
|
||||||
right: 0,
|
child: (() {
|
||||||
child: Padding(
|
final subtitle =
|
||||||
|
comic.subtitle?.replaceAll('\n', '').trim();
|
||||||
|
final text = comic.description.isNotEmpty
|
||||||
|
? comic.description.split('|').join('\n')
|
||||||
|
: (subtitle?.isNotEmpty == true
|
||||||
|
? subtitle
|
||||||
|
: null);
|
||||||
|
final scale =
|
||||||
|
(appdata.settings['comicTileScale'] as num)
|
||||||
|
.toDouble();
|
||||||
|
final fortSize = scale < 0.85
|
||||||
|
? 8.0 // 小尺寸
|
||||||
|
: (scale < 1.0 ? 10.0 : 12.0);
|
||||||
|
|
||||||
|
if (text == null) {
|
||||||
|
return const SizedBox
|
||||||
|
.shrink(); // 如果没有文本,则不显示任何内容
|
||||||
|
}
|
||||||
|
|
||||||
|
return Padding(
|
||||||
padding: const EdgeInsets.symmetric(
|
padding: const EdgeInsets.symmetric(
|
||||||
horizontal: 4, vertical: 4),
|
horizontal: 2, vertical: 2),
|
||||||
child: ClipRRect(
|
child: ClipRRect(
|
||||||
borderRadius: const BorderRadius.only(
|
borderRadius: const BorderRadius.all(
|
||||||
topLeft: Radius.circular(10.0),
|
Radius.circular(10.0),
|
||||||
topRight: Radius.circular(10.0),
|
|
||||||
bottomRight: Radius.circular(10.0),
|
|
||||||
bottomLeft: Radius.circular(10.0),
|
|
||||||
),
|
),
|
||||||
child: Container(
|
child: Container(
|
||||||
color: Colors.black.withOpacity(0.5),
|
color: Colors.black.withOpacity(0.5),
|
||||||
@@ -273,19 +297,13 @@ class ComicTile extends StatelessWidget {
|
|||||||
const EdgeInsets.fromLTRB(8, 6, 8, 6),
|
const EdgeInsets.fromLTRB(8, 6, 8, 6),
|
||||||
child: ConstrainedBox(
|
child: ConstrainedBox(
|
||||||
constraints: BoxConstraints(
|
constraints: BoxConstraints(
|
||||||
maxWidth: constraints.maxWidth * 0.88,
|
maxWidth: constraints.maxWidth,
|
||||||
),
|
),
|
||||||
child: Text(
|
child: Text(
|
||||||
comic.description.isEmpty
|
text,
|
||||||
? comic.subtitle
|
style: TextStyle(
|
||||||
?.replaceAll('\n', '') ??
|
|
||||||
''
|
|
||||||
: comic.description
|
|
||||||
.split('|')
|
|
||||||
.join('\n'),
|
|
||||||
style: const TextStyle(
|
|
||||||
fontWeight: FontWeight.w500,
|
fontWeight: FontWeight.w500,
|
||||||
fontSize: 12,
|
fontSize: fortSize,
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
),
|
),
|
||||||
textAlign: TextAlign.right,
|
textAlign: TextAlign.right,
|
||||||
@@ -296,7 +314,9 @@ class ComicTile extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)),
|
);
|
||||||
|
})(),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -307,7 +327,6 @@ class ComicTile extends StatelessWidget {
|
|||||||
comic.title.replaceAll('\n', ''),
|
comic.title.replaceAll('\n', ''),
|
||||||
style: const TextStyle(
|
style: const TextStyle(
|
||||||
fontWeight: FontWeight.w500,
|
fontWeight: FontWeight.w500,
|
||||||
fontSize: 14.0,
|
|
||||||
),
|
),
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
@@ -635,6 +654,7 @@ class SliverGridComics extends StatefulWidget {
|
|||||||
this.badgeBuilder,
|
this.badgeBuilder,
|
||||||
this.menuBuilder,
|
this.menuBuilder,
|
||||||
this.onTap,
|
this.onTap,
|
||||||
|
this.onLongPressed,
|
||||||
this.selections});
|
this.selections});
|
||||||
|
|
||||||
final List<Comic> comics;
|
final List<Comic> comics;
|
||||||
@@ -649,6 +669,8 @@ class SliverGridComics extends StatefulWidget {
|
|||||||
|
|
||||||
final void Function(Comic)? onTap;
|
final void Function(Comic)? onTap;
|
||||||
|
|
||||||
|
final void Function(Comic)? onLongPressed;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<SliverGridComics> createState() => _SliverGridComicsState();
|
State<SliverGridComics> createState() => _SliverGridComicsState();
|
||||||
}
|
}
|
||||||
@@ -699,6 +721,7 @@ class _SliverGridComicsState extends State<SliverGridComics> {
|
|||||||
badgeBuilder: widget.badgeBuilder,
|
badgeBuilder: widget.badgeBuilder,
|
||||||
menuBuilder: widget.menuBuilder,
|
menuBuilder: widget.menuBuilder,
|
||||||
onTap: widget.onTap,
|
onTap: widget.onTap,
|
||||||
|
onLongPressed: widget.onLongPressed,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -710,6 +733,7 @@ class _SliverGridComics extends StatelessWidget {
|
|||||||
this.badgeBuilder,
|
this.badgeBuilder,
|
||||||
this.menuBuilder,
|
this.menuBuilder,
|
||||||
this.onTap,
|
this.onTap,
|
||||||
|
this.onLongPressed,
|
||||||
this.selection,
|
this.selection,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -725,6 +749,8 @@ class _SliverGridComics extends StatelessWidget {
|
|||||||
|
|
||||||
final void Function(Comic)? onTap;
|
final void Function(Comic)? onTap;
|
||||||
|
|
||||||
|
final void Function(Comic)? onLongPressed;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return SliverGrid(
|
return SliverGrid(
|
||||||
@@ -741,14 +767,18 @@ class _SliverGridComics extends StatelessWidget {
|
|||||||
badge: badge,
|
badge: badge,
|
||||||
menuOptions: menuBuilder?.call(comics[index]),
|
menuOptions: menuBuilder?.call(comics[index]),
|
||||||
onTap: onTap != null ? () => onTap!(comics[index]) : null,
|
onTap: onTap != null ? () => onTap!(comics[index]) : null,
|
||||||
|
onLongPressed: onLongPressed != null
|
||||||
|
? () => onLongPressed!(comics[index])
|
||||||
|
: null,
|
||||||
);
|
);
|
||||||
if(selection == null) {
|
if (selection == null) {
|
||||||
return comic;
|
return comic;
|
||||||
}
|
}
|
||||||
return Container(
|
return AnimatedContainer(
|
||||||
|
duration: const Duration(milliseconds: 150),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: isSelected
|
color: isSelected
|
||||||
? Theme.of(context).colorScheme.surfaceContainer
|
? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.72)
|
||||||
: null,
|
: null,
|
||||||
borderRadius: BorderRadius.circular(12),
|
borderRadius: BorderRadius.circular(12),
|
||||||
),
|
),
|
||||||
|
@@ -92,9 +92,13 @@ class _MenuRoute<T> extends PopupRoute<T> {
|
|||||||
Icon(
|
Icon(
|
||||||
entry.icon,
|
entry.icon,
|
||||||
size: 18,
|
size: 18,
|
||||||
|
color: entry.color
|
||||||
),
|
),
|
||||||
const SizedBox(width: 12),
|
const SizedBox(width: 12),
|
||||||
Text(entry.text),
|
Text(
|
||||||
|
entry.text,
|
||||||
|
style: TextStyle(color: entry.color)
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -119,7 +123,8 @@ class _MenuRoute<T> extends PopupRoute<T> {
|
|||||||
class MenuEntry {
|
class MenuEntry {
|
||||||
final String text;
|
final String text;
|
||||||
final IconData? icon;
|
final IconData? icon;
|
||||||
|
final Color? color;
|
||||||
final void Function() onClick;
|
final void Function() onClick;
|
||||||
|
|
||||||
MenuEntry({required this.text, this.icon, required this.onClick});
|
MenuEntry({required this.text, this.icon, this.color, required this.onClick});
|
||||||
}
|
}
|
||||||
|
@@ -135,6 +135,7 @@ Future<void> showConfirmDialog({
|
|||||||
required String content,
|
required String content,
|
||||||
required void Function() onConfirm,
|
required void Function() onConfirm,
|
||||||
String confirmText = "Confirm",
|
String confirmText = "Confirm",
|
||||||
|
Color? btnColor,
|
||||||
}) {
|
}) {
|
||||||
return showDialog(
|
return showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
@@ -147,6 +148,9 @@ Future<void> showConfirmDialog({
|
|||||||
context.pop();
|
context.pop();
|
||||||
onConfirm();
|
onConfirm();
|
||||||
},
|
},
|
||||||
|
style: FilledButton.styleFrom(
|
||||||
|
backgroundColor: btnColor,
|
||||||
|
),
|
||||||
child: Text(confirmText.tl),
|
child: Text(confirmText.tl),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
@@ -10,7 +10,7 @@ export "widget_utils.dart";
|
|||||||
export "context.dart";
|
export "context.dart";
|
||||||
|
|
||||||
class _App {
|
class _App {
|
||||||
final version = "1.0.6";
|
final version = "1.0.7";
|
||||||
|
|
||||||
bool get isAndroid => Platform.isAndroid;
|
bool get isAndroid => Platform.isAndroid;
|
||||||
|
|
||||||
|
@@ -215,6 +215,8 @@ class ComicSource {
|
|||||||
|
|
||||||
final StarRatingFunc? starRatingFunc;
|
final StarRatingFunc? starRatingFunc;
|
||||||
|
|
||||||
|
final ArchiveDownloader? archiveDownloader;
|
||||||
|
|
||||||
Future<void> loadData() async {
|
Future<void> loadData() async {
|
||||||
var file = File("${App.dataPath}/comic_source/$key.data");
|
var file = File("${App.dataPath}/comic_source/$key.data");
|
||||||
if (await file.exists()) {
|
if (await file.exists()) {
|
||||||
@@ -284,6 +286,7 @@ class ComicSource {
|
|||||||
this.enableTagsSuggestions,
|
this.enableTagsSuggestions,
|
||||||
this.enableTagsTranslate,
|
this.enableTagsTranslate,
|
||||||
this.starRatingFunc,
|
this.starRatingFunc,
|
||||||
|
this.archiveDownloader,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -465,3 +468,11 @@ class LinkHandler {
|
|||||||
|
|
||||||
const LinkHandler(this.domains, this.linkToId);
|
const LinkHandler(this.domains, this.linkToId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ArchiveDownloader {
|
||||||
|
final Future<Res<List<ArchiveInfo>>> Function(String cid) getArchives;
|
||||||
|
|
||||||
|
final Future<Res<String>> Function(String cid, String aid) getDownloadUrl;
|
||||||
|
|
||||||
|
const ArchiveDownloader(this.getArchives, this.getDownloadUrl);
|
||||||
|
}
|
@@ -160,6 +160,8 @@ class ComicDetails with HistoryMixin {
|
|||||||
@override
|
@override
|
||||||
final int? maxPage;
|
final int? maxPage;
|
||||||
|
|
||||||
|
final List<Comment>? comments;
|
||||||
|
|
||||||
static Map<String, List<String>> _generateMap(Map<dynamic, dynamic> map) {
|
static Map<String, List<String>> _generateMap(Map<dynamic, dynamic> map) {
|
||||||
var res = <String, List<String>>{};
|
var res = <String, List<String>>{};
|
||||||
map.forEach((key, value) {
|
map.forEach((key, value) {
|
||||||
@@ -193,7 +195,10 @@ class ComicDetails with HistoryMixin {
|
|||||||
updateTime = json["updateTime"],
|
updateTime = json["updateTime"],
|
||||||
url = json["url"],
|
url = json["url"],
|
||||||
stars = (json["stars"] as num?)?.toDouble(),
|
stars = (json["stars"] as num?)?.toDouble(),
|
||||||
maxPage = json["maxPage"];
|
maxPage = json["maxPage"],
|
||||||
|
comments = (json["comments"] as List?)
|
||||||
|
?.map((e) => Comment.fromJson(e))
|
||||||
|
.toList();
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
return {
|
return {
|
||||||
@@ -227,3 +232,14 @@ class ComicDetails with HistoryMixin {
|
|||||||
|
|
||||||
ComicType get comicType => ComicType(sourceKey.hashCode);
|
ComicType get comicType => ComicType(sourceKey.hashCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ArchiveInfo {
|
||||||
|
final String title;
|
||||||
|
final String description;
|
||||||
|
final String id;
|
||||||
|
|
||||||
|
ArchiveInfo.fromJson(Map<String, dynamic> json)
|
||||||
|
: title = json["title"],
|
||||||
|
description = json["description"],
|
||||||
|
id = json["id"];
|
||||||
|
}
|
@@ -153,11 +153,12 @@ class ComicSourceParser {
|
|||||||
_getValue("search.enableTagsSuggestions") ?? false,
|
_getValue("search.enableTagsSuggestions") ?? false,
|
||||||
_getValue("comic.enableTagsTranslate") ?? false,
|
_getValue("comic.enableTagsTranslate") ?? false,
|
||||||
_parseStarRatingFunc(),
|
_parseStarRatingFunc(),
|
||||||
|
_parseArchiveDownloader(),
|
||||||
);
|
);
|
||||||
|
|
||||||
await source.loadData();
|
await source.loadData();
|
||||||
|
|
||||||
if(_checkExists("init")) {
|
if (_checkExists("init")) {
|
||||||
Future.delayed(const Duration(milliseconds: 50), () {
|
Future.delayed(const Duration(milliseconds: 50), () {
|
||||||
JsEngine().runCode("ComicSource.sources.$_key.init()");
|
JsEngine().runCode("ComicSource.sources.$_key.init()");
|
||||||
});
|
});
|
||||||
@@ -988,4 +989,35 @@ class ComicSourceParser {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ArchiveDownloader? _parseArchiveDownloader() {
|
||||||
|
if (!_checkExists("comic.archive")) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return ArchiveDownloader(
|
||||||
|
(cid) async {
|
||||||
|
try {
|
||||||
|
var res = await JsEngine().runCode("""
|
||||||
|
ComicSource.sources.$_key.comic.archive.getArchives(${jsonEncode(cid)})
|
||||||
|
""");
|
||||||
|
return Res(
|
||||||
|
(res as List).map((e) => ArchiveInfo.fromJson(e)).toList());
|
||||||
|
} catch (e, s) {
|
||||||
|
Log.error("Network", "$e\n$s");
|
||||||
|
return Res.error(e.toString());
|
||||||
|
}
|
||||||
|
},
|
||||||
|
(cid, aid) async {
|
||||||
|
try {
|
||||||
|
var res = await JsEngine().runCode("""
|
||||||
|
ComicSource.sources.$_key.comic.archive.getDownloadUrl(${jsonEncode(cid)}, ${jsonEncode(aid)})
|
||||||
|
""");
|
||||||
|
return Res(res as String);
|
||||||
|
} catch (e, s) {
|
||||||
|
Log.error("Network", "$e\n$s");
|
||||||
|
return Res.error(e.toString());
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
|
|||||||
import 'package:sqlite3/sqlite3.dart';
|
import 'package:sqlite3/sqlite3.dart';
|
||||||
import 'package:venera/foundation/appdata.dart';
|
import 'package:venera/foundation/appdata.dart';
|
||||||
import 'package:venera/foundation/image_provider/local_favorite_image.dart';
|
import 'package:venera/foundation/image_provider/local_favorite_image.dart';
|
||||||
|
import 'package:venera/foundation/local.dart';
|
||||||
import 'package:venera/foundation/log.dart';
|
import 'package:venera/foundation/log.dart';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
@@ -12,10 +13,7 @@ import 'comic_source/comic_source.dart';
|
|||||||
import 'comic_type.dart';
|
import 'comic_type.dart';
|
||||||
|
|
||||||
String _getTimeString(DateTime time) {
|
String _getTimeString(DateTime time) {
|
||||||
return time
|
return time.toIso8601String().replaceFirst("T", " ").substring(0, 19);
|
||||||
.toIso8601String()
|
|
||||||
.replaceFirst("T", " ")
|
|
||||||
.substring(0, 19);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class FavoriteItem implements Comic {
|
class FavoriteItem implements Comic {
|
||||||
@@ -29,15 +27,14 @@ class FavoriteItem implements Comic {
|
|||||||
String coverPath;
|
String coverPath;
|
||||||
late String time;
|
late String time;
|
||||||
|
|
||||||
FavoriteItem({
|
FavoriteItem(
|
||||||
required this.id,
|
{required this.id,
|
||||||
required this.name,
|
required this.name,
|
||||||
required this.coverPath,
|
required this.coverPath,
|
||||||
required this.author,
|
required this.author,
|
||||||
required this.type,
|
required this.type,
|
||||||
required this.tags,
|
required this.tags,
|
||||||
DateTime? favoriteTime
|
DateTime? favoriteTime}) {
|
||||||
}) {
|
|
||||||
var t = favoriteTime ?? DateTime.now();
|
var t = favoriteTime ?? DateTime.now();
|
||||||
time = _getTimeString(t);
|
time = _getTimeString(t);
|
||||||
}
|
}
|
||||||
@@ -75,7 +72,9 @@ class FavoriteItem implements Comic {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
String get description {
|
String get description {
|
||||||
return "$time | ${type == ComicType.local ? 'local' : type.comicSource?.name ?? "Unknown"}";
|
return appdata.settings['comicDisplayMode'] == 'detailed'
|
||||||
|
? "$time | ${type == ComicType.local ? 'local' : type.comicSource?.name ?? "Unknown"}"
|
||||||
|
: "${type.comicSource?.name ?? "Unknown"} | $time";
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -353,7 +352,8 @@ class LocalFavoritesManager with ChangeNotifier {
|
|||||||
""", [folder, source, networkFolder]);
|
""", [folder, source, networkFolder]);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isLinkedToNetworkFolder(String folder, String source, String networkFolder) {
|
bool isLinkedToNetworkFolder(
|
||||||
|
String folder, String source, String networkFolder) {
|
||||||
var res = _db.select("""
|
var res = _db.select("""
|
||||||
select * from folder_sync
|
select * from folder_sync
|
||||||
where folder_name == ? and source_key == ? and source_folder == ?;
|
where folder_name == ? and source_key == ? and source_folder == ?;
|
||||||
@@ -434,6 +434,41 @@ class LocalFavoritesManager with ChangeNotifier {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void moveFavorite(
|
||||||
|
String sourceFolder, String targetFolder, String id, ComicType type) {
|
||||||
|
_modifiedAfterLastCache = true;
|
||||||
|
|
||||||
|
if (!existsFolder(sourceFolder)) {
|
||||||
|
throw Exception("Source folder does not exist");
|
||||||
|
}
|
||||||
|
if (!existsFolder(targetFolder)) {
|
||||||
|
throw Exception("Target folder does not exist");
|
||||||
|
}
|
||||||
|
|
||||||
|
var res = _db.select("""
|
||||||
|
select * from "$targetFolder"
|
||||||
|
where id == ? and type == ?;
|
||||||
|
""", [id, type.value]);
|
||||||
|
|
||||||
|
if (res.isNotEmpty) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_db.execute("""
|
||||||
|
insert into "$targetFolder" (id, name, author, type, tags, cover_path, time, display_order)
|
||||||
|
select id, name, author, type, tags, cover_path, time, ?
|
||||||
|
from "$sourceFolder"
|
||||||
|
where id == ? and type == ?;
|
||||||
|
""", [minValue(targetFolder) - 1, id, type.value]);
|
||||||
|
|
||||||
|
_db.execute("""
|
||||||
|
delete from "$sourceFolder"
|
||||||
|
where id == ? and type == ?;
|
||||||
|
""", [id, type.value]);
|
||||||
|
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
/// delete a folder
|
/// delete a folder
|
||||||
void deleteFolder(String name) {
|
void deleteFolder(String name) {
|
||||||
_modifiedAfterLastCache = true;
|
_modifiedAfterLastCache = true;
|
||||||
@@ -462,6 +497,22 @@ class LocalFavoritesManager with ChangeNotifier {
|
|||||||
notifyListeners();
|
notifyListeners();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<int> removeInvalid() async {
|
||||||
|
int count = 0;
|
||||||
|
await Future.microtask(() {
|
||||||
|
var all = allComics();
|
||||||
|
for(var c in all) {
|
||||||
|
var comicSource = c.type.comicSource;
|
||||||
|
if ((c.type == ComicType.local && LocalManager().find(c.id, c.type) == null)
|
||||||
|
|| (c.type != ComicType.local && comicSource == null)) {
|
||||||
|
deleteComicWithId(c.folder, c.id, c.type);
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> clearAll() async {
|
Future<void> clearAll() async {
|
||||||
_db.dispose();
|
_db.dispose();
|
||||||
File("${App.dataPath}/local_favorite.db").deleteSync();
|
File("${App.dataPath}/local_favorite.db").deleteSync();
|
||||||
|
@@ -1,13 +1,17 @@
|
|||||||
import 'dart:async' show Future, StreamController;
|
import 'dart:async' show Future, StreamController;
|
||||||
|
import 'dart:io';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:venera/network/images.dart';
|
import 'package:venera/network/images.dart';
|
||||||
|
import 'package:venera/utils/io.dart';
|
||||||
import 'base_image_provider.dart';
|
import 'base_image_provider.dart';
|
||||||
import 'cached_image.dart' as image_provider;
|
import 'cached_image.dart' as image_provider;
|
||||||
|
|
||||||
class CachedImageProvider
|
class CachedImageProvider
|
||||||
extends BaseImageProvider<image_provider.CachedImageProvider> {
|
extends BaseImageProvider<image_provider.CachedImageProvider> {
|
||||||
/// Image provider for normal image.
|
/// Image provider for normal image.
|
||||||
|
///
|
||||||
|
/// [url] is the url of the image. Local file path is also supported.
|
||||||
const CachedImageProvider(this.url, {this.headers, this.sourceKey, this.cid});
|
const CachedImageProvider(this.url, {this.headers, this.sourceKey, this.cid});
|
||||||
|
|
||||||
final String url;
|
final String url;
|
||||||
@@ -20,6 +24,10 @@ class CachedImageProvider
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
|
Future<Uint8List> load(StreamController<ImageChunkEvent> chunkEvents) async {
|
||||||
|
if(url.startsWith("file://")) {
|
||||||
|
var file = openFilePlatform(url.substring(7));
|
||||||
|
return file.readAsBytes();
|
||||||
|
}
|
||||||
await for (var progress in ImageDownloader.loadThumbnail(url, sourceKey, cid)) {
|
await for (var progress in ImageDownloader.loadThumbnail(url, sourceKey, cid)) {
|
||||||
chunkEvents.add(ImageChunkEvent(
|
chunkEvents.add(ImageChunkEvent(
|
||||||
cumulativeBytesLoaded: progress.currentBytes,
|
cumulativeBytesLoaded: progress.currentBytes,
|
||||||
|
@@ -2,6 +2,7 @@ import 'dart:convert';
|
|||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
import 'dart:math' as math;
|
import 'dart:math' as math;
|
||||||
import 'package:crypto/crypto.dart';
|
import 'package:crypto/crypto.dart';
|
||||||
|
import 'package:dio/io.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:html/parser.dart' as html;
|
import 'package:html/parser.dart' as html;
|
||||||
import 'package:html/dom.dart' as dom;
|
import 'package:html/dom.dart' as dom;
|
||||||
@@ -184,7 +185,23 @@ class JsEngine with _JSEngineApi {
|
|||||||
if (headers["user-agent"] == null && headers["User-Agent"] == null) {
|
if (headers["user-agent"] == null && headers["User-Agent"] == null) {
|
||||||
headers["User-Agent"] = webUA;
|
headers["User-Agent"] = webUA;
|
||||||
}
|
}
|
||||||
response = await _dio!.request(req["url"],
|
var dio = _dio;
|
||||||
|
if (headers['http_client'] == "dart:io") {
|
||||||
|
dio = Dio(BaseOptions(
|
||||||
|
responseType: ResponseType.plain,
|
||||||
|
validateStatus: (status) => true,
|
||||||
|
));
|
||||||
|
var proxy = await AppDio.getProxy();
|
||||||
|
dio.httpClientAdapter = IOHttpClientAdapter(
|
||||||
|
createHttpClient: () {
|
||||||
|
return HttpClient()
|
||||||
|
..findProxy = (uri) => proxy == null ? "DIRECT" : "PROXY $proxy";
|
||||||
|
},
|
||||||
|
);
|
||||||
|
dio.interceptors.add(CookieManagerSql(SingleInstanceCookieJar.instance!));
|
||||||
|
dio.interceptors.add(LogInterceptor());
|
||||||
|
}
|
||||||
|
response = await dio!.request(req["url"],
|
||||||
data: req["data"],
|
data: req["data"],
|
||||||
options: Options(
|
options: Options(
|
||||||
method: req['http_method'],
|
method: req['http_method'],
|
||||||
|
@@ -71,12 +71,13 @@ class LocalComic with HistoryMixin implements Comic {
|
|||||||
downloadedChapters = List.from(jsonDecode(row[8] as String)),
|
downloadedChapters = List.from(jsonDecode(row[8] as String)),
|
||||||
createdAt = DateTime.fromMillisecondsSinceEpoch(row[9] as int);
|
createdAt = DateTime.fromMillisecondsSinceEpoch(row[9] as int);
|
||||||
|
|
||||||
File get coverFile => File(FilePath.join(
|
File get coverFile => openFilePlatform(FilePath.join(
|
||||||
LocalManager().path,
|
baseDir,
|
||||||
directory,
|
|
||||||
cover,
|
cover,
|
||||||
));
|
));
|
||||||
|
|
||||||
|
String get baseDir => directory.contains("/") ? directory : FilePath.join(LocalManager().path, directory);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get description => "";
|
String get description => "";
|
||||||
|
|
||||||
@@ -174,6 +175,27 @@ class LocalManager with ChangeNotifier {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<String> findDefaultPath() async {
|
||||||
|
if (App.isAndroid) {
|
||||||
|
var external = await getExternalStorageDirectories();
|
||||||
|
if (external != null && external.isNotEmpty) {
|
||||||
|
return FilePath.join(external.first.path, 'local');
|
||||||
|
} else {
|
||||||
|
return FilePath.join(App.dataPath, 'local');
|
||||||
|
}
|
||||||
|
} else if (App.isIOS) {
|
||||||
|
var oldPath = FilePath.join(App.dataPath, 'local');
|
||||||
|
if (Directory(oldPath).existsSync() && Directory(oldPath).listSync().isNotEmpty) {
|
||||||
|
return oldPath;
|
||||||
|
} else {
|
||||||
|
var directory = await getApplicationDocumentsDirectory();
|
||||||
|
return FilePath.join(directory.path, 'local');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return FilePath.join(App.dataPath, 'local');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> init() async {
|
Future<void> init() async {
|
||||||
_db = sqlite3.open(
|
_db = sqlite3.open(
|
||||||
'${App.dataPath}/local.db',
|
'${App.dataPath}/local.db',
|
||||||
@@ -195,21 +217,20 @@ class LocalManager with ChangeNotifier {
|
|||||||
''');
|
''');
|
||||||
if (File(FilePath.join(App.dataPath, 'local_path')).existsSync()) {
|
if (File(FilePath.join(App.dataPath, 'local_path')).existsSync()) {
|
||||||
path = File(FilePath.join(App.dataPath, 'local_path')).readAsStringSync();
|
path = File(FilePath.join(App.dataPath, 'local_path')).readAsStringSync();
|
||||||
} else {
|
if (!Directory(path).existsSync()) {
|
||||||
if (App.isAndroid) {
|
path = await findDefaultPath();
|
||||||
var external = await getExternalStorageDirectories();
|
|
||||||
if (external != null && external.isNotEmpty) {
|
|
||||||
path = FilePath.join(external.first.path, 'local');
|
|
||||||
} else {
|
|
||||||
path = FilePath.join(App.dataPath, 'local');
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
path = FilePath.join(App.dataPath, 'local');
|
path = await findDefaultPath();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
if (!Directory(path).existsSync()) {
|
if (!Directory(path).existsSync()) {
|
||||||
await Directory(path).create();
|
await Directory(path).create();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
catch(e, s) {
|
||||||
|
Log.error("IO", "Failed to create local folder: $e", s);
|
||||||
|
}
|
||||||
restoreDownloadingTasks();
|
restoreDownloadingTasks();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -333,18 +354,19 @@ class LocalManager with ChangeNotifier {
|
|||||||
throw "Invalid ep";
|
throw "Invalid ep";
|
||||||
}
|
}
|
||||||
var comic = find(id, type) ?? (throw "Comic Not Found");
|
var comic = find(id, type) ?? (throw "Comic Not Found");
|
||||||
var directory = Directory(FilePath.join(path, comic.directory));
|
var directory = openDirectoryPlatform(comic.baseDir);
|
||||||
if (comic.chapters != null) {
|
if (comic.chapters != null) {
|
||||||
var cid = ep is int
|
var cid = ep is int
|
||||||
? comic.chapters!.keys.elementAt(ep - 1)
|
? comic.chapters!.keys.elementAt(ep - 1)
|
||||||
: (ep as String);
|
: (ep as String);
|
||||||
directory = Directory(FilePath.join(directory.path, cid));
|
directory = openDirectoryPlatform(FilePath.join(directory.path, cid));
|
||||||
}
|
}
|
||||||
var files = <File>[];
|
var files = <File>[];
|
||||||
await for (var entity in directory.list()) {
|
await for (var entity in directory.list()) {
|
||||||
if (entity is File) {
|
if (entity is File) {
|
||||||
if (entity.absolute.path.replaceFirst(path, '').substring(1) ==
|
// Do not exclude comic.cover, since it may be the first page of the chapter.
|
||||||
comic.cover) {
|
// A file with name starting with 'cover.' is not a comic page.
|
||||||
|
if (entity.name.startsWith('cover.')) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//Hidden file in some file system
|
//Hidden file in some file system
|
||||||
@@ -384,10 +406,10 @@ class LocalManager with ChangeNotifier {
|
|||||||
String id, ComicType type, String name) async {
|
String id, ComicType type, String name) async {
|
||||||
var comic = find(id, type);
|
var comic = find(id, type);
|
||||||
if (comic != null) {
|
if (comic != null) {
|
||||||
return Directory(FilePath.join(path, comic.directory));
|
return openDirectoryPlatform(FilePath.join(path, comic.directory));
|
||||||
}
|
}
|
||||||
var dir = findValidDirectoryName(path, name);
|
var dir = findValidDirectoryName(path, name);
|
||||||
return Directory(FilePath.join(path, dir)).create().then((value) => value);
|
return openDirectoryPlatform(FilePath.join(path, dir)).create().then((value) => value);
|
||||||
}
|
}
|
||||||
|
|
||||||
void completeTask(DownloadTask task) {
|
void completeTask(DownloadTask task) {
|
||||||
@@ -446,14 +468,13 @@ class LocalManager with ChangeNotifier {
|
|||||||
|
|
||||||
void deleteComic(LocalComic c, [bool removeFileOnDisk = true]) {
|
void deleteComic(LocalComic c, [bool removeFileOnDisk = true]) {
|
||||||
if(removeFileOnDisk) {
|
if(removeFileOnDisk) {
|
||||||
var dir = Directory(FilePath.join(path, c.directory));
|
var dir = openDirectoryPlatform(FilePath.join(path, c.directory));
|
||||||
dir.deleteIgnoreError(recursive: true);
|
dir.deleteIgnoreError(recursive: true);
|
||||||
}
|
}
|
||||||
//Deleting a local comic means that it's nolonger available, thus both favorite and history should be deleted.
|
//Deleting a local comic means that it's nolonger available, thus both favorite and history should be deleted.
|
||||||
if(HistoryManager().findSync(c.id, c.comicType) != null) {
|
if(HistoryManager().findSync(c.id, c.comicType) != null) {
|
||||||
HistoryManager().remove(c.id, c.comicType);
|
HistoryManager().remove(c.id, c.comicType);
|
||||||
}
|
}
|
||||||
assert(c.comicType == ComicType.local);
|
|
||||||
var folders = LocalFavoritesManager().find(c.id, c.comicType);
|
var folders = LocalFavoritesManager().find(c.id, c.comicType);
|
||||||
for (var f in folders) {
|
for (var f in folders) {
|
||||||
LocalFavoritesManager().deleteComicWithId(f, c.id, c.comicType);
|
LocalFavoritesManager().deleteComicWithId(f, c.id, c.comicType);
|
||||||
|
@@ -32,11 +32,11 @@ class Log {
|
|||||||
static const String? logFile = null;
|
static const String? logFile = null;
|
||||||
|
|
||||||
static void printWarning(String text) {
|
static void printWarning(String text) {
|
||||||
print('\x1B[33m$text\x1B[0m');
|
debugPrint('\x1B[33m$text\x1B[0m');
|
||||||
}
|
}
|
||||||
|
|
||||||
static void printError(String text) {
|
static void printError(String text) {
|
||||||
print('\x1B[31m$text\x1B[0m');
|
debugPrint('\x1B[31m$text\x1B[0m');
|
||||||
}
|
}
|
||||||
|
|
||||||
static void addLog(LogLevel level, String title, String content) {
|
static void addLog(LogLevel level, String title, String content) {
|
||||||
@@ -44,14 +44,14 @@ class Log {
|
|||||||
content = "${content.substring(0, maxLogLength)}...";
|
content = "${content.substring(0, maxLogLength)}...";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (kDebugMode) {
|
|
||||||
switch (level) {
|
switch (level) {
|
||||||
case LogLevel.error:
|
case LogLevel.error:
|
||||||
printError(content);
|
printError(content);
|
||||||
case LogLevel.warning:
|
case LogLevel.warning:
|
||||||
printWarning(content);
|
printWarning(content);
|
||||||
case LogLevel.info:
|
case LogLevel.info:
|
||||||
print(content);
|
if(kDebugMode) {
|
||||||
|
debugPrint(content);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
import 'package:flutter_saf/flutter_saf.dart';
|
||||||
import 'package:venera/foundation/app.dart';
|
import 'package:venera/foundation/app.dart';
|
||||||
import 'package:venera/foundation/cache_manager.dart';
|
import 'package:venera/foundation/cache_manager.dart';
|
||||||
import 'package:venera/foundation/comic_source/comic_source.dart';
|
import 'package:venera/foundation/comic_source/comic_source.dart';
|
||||||
@@ -12,6 +13,7 @@ import 'package:venera/utils/translations.dart';
|
|||||||
import 'foundation/appdata.dart';
|
import 'foundation/appdata.dart';
|
||||||
|
|
||||||
Future<void> init() async {
|
Future<void> init() async {
|
||||||
|
await SAFTaskWorker().init();
|
||||||
await AppTranslation.init();
|
await AppTranslation.init();
|
||||||
await appdata.init();
|
await appdata.init();
|
||||||
await App.init();
|
await App.init();
|
||||||
|
@@ -6,10 +6,9 @@ import 'package:flutter_localizations/flutter_localizations.dart';
|
|||||||
import 'package:rhttp/rhttp.dart';
|
import 'package:rhttp/rhttp.dart';
|
||||||
import 'package:venera/foundation/log.dart';
|
import 'package:venera/foundation/log.dart';
|
||||||
import 'package:venera/pages/auth_page.dart';
|
import 'package:venera/pages/auth_page.dart';
|
||||||
import 'package:venera/pages/comic_source_page.dart';
|
|
||||||
import 'package:venera/pages/main_page.dart';
|
import 'package:venera/pages/main_page.dart';
|
||||||
import 'package:venera/pages/settings/settings_page.dart';
|
|
||||||
import 'package:venera/utils/app_links.dart';
|
import 'package:venera/utils/app_links.dart';
|
||||||
|
import 'package:venera/utils/io.dart';
|
||||||
import 'package:window_manager/window_manager.dart';
|
import 'package:window_manager/window_manager.dart';
|
||||||
import 'components/components.dart';
|
import 'components/components.dart';
|
||||||
import 'components/window_frame.dart';
|
import 'components/window_frame.dart';
|
||||||
@@ -68,7 +67,6 @@ class MyApp extends StatefulWidget {
|
|||||||
class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
|
class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
checkUpdates();
|
|
||||||
App.registerForceRebuild(forceRebuild);
|
App.registerForceRebuild(forceRebuild);
|
||||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||||
WidgetsBinding.instance.addObserver(this);
|
WidgetsBinding.instance.addObserver(this);
|
||||||
@@ -81,7 +79,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||||
if(!App.isMobile) {
|
if (!App.isMobile || !appdata.settings['authorizationRequired']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (state == AppLifecycleState.inactive && hideContentOverlay == null) {
|
if (state == AppLifecycleState.inactive && hideContentOverlay == null) {
|
||||||
@@ -103,8 +101,8 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
|
|||||||
hideContentOverlay = null;
|
hideContentOverlay = null;
|
||||||
}
|
}
|
||||||
if (state == AppLifecycleState.hidden &&
|
if (state == AppLifecycleState.hidden &&
|
||||||
appdata.settings['authorizationRequired'] &&
|
!isAuthPageActive &&
|
||||||
!isAuthPageActive) {
|
!IO.isSelectingFiles) {
|
||||||
isAuthPageActive = true;
|
isAuthPageActive = true;
|
||||||
App.rootContext.to(
|
App.rootContext.to(
|
||||||
() => AuthPage(
|
() => AuthPage(
|
||||||
@@ -225,22 +223,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void checkUpdates() async {
|
|
||||||
if (!appdata.settings['checkUpdateOnStart']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var lastCheck = appdata.implicitData['lastCheckUpdate'] ?? 0;
|
|
||||||
var now = DateTime.now().millisecondsSinceEpoch;
|
|
||||||
if (now - lastCheck < 24 * 60 * 60 * 1000) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
appdata.implicitData['lastCheckUpdate'] = now;
|
|
||||||
appdata.writeImplicitData();
|
|
||||||
await Future.delayed(const Duration(milliseconds: 300));
|
|
||||||
await checkUpdateUi(false);
|
|
||||||
await ComicSourcePage.checkComicSourceUpdate(true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class _SystemUiProvider extends StatelessWidget {
|
class _SystemUiProvider extends StatelessWidget {
|
||||||
|
@@ -97,6 +97,9 @@ class MyLogInterceptor implements Interceptor {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
|
void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
|
||||||
|
Log.info("Network", "${options.method} ${options.uri}\n"
|
||||||
|
"headers:\n${options.headers}\n"
|
||||||
|
"data:\n${options.data}");
|
||||||
options.connectTimeout = const Duration(seconds: 15);
|
options.connectTimeout = const Duration(seconds: 15);
|
||||||
options.receiveTimeout = const Duration(seconds: 15);
|
options.receiveTimeout = const Duration(seconds: 15);
|
||||||
options.sendTimeout = const Duration(seconds: 15);
|
options.sendTimeout = const Duration(seconds: 15);
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
import 'dart:isolate';
|
||||||
|
|
||||||
import 'package:flutter/widgets.dart' show ChangeNotifier;
|
import 'package:flutter/widgets.dart' show ChangeNotifier;
|
||||||
import 'package:venera/foundation/appdata.dart';
|
import 'package:venera/foundation/appdata.dart';
|
||||||
@@ -11,13 +12,14 @@ import 'package:venera/network/images.dart';
|
|||||||
import 'package:venera/utils/ext.dart';
|
import 'package:venera/utils/ext.dart';
|
||||||
import 'package:venera/utils/file_type.dart';
|
import 'package:venera/utils/file_type.dart';
|
||||||
import 'package:venera/utils/io.dart';
|
import 'package:venera/utils/io.dart';
|
||||||
|
import 'package:zip_flutter/zip_flutter.dart';
|
||||||
|
|
||||||
|
import 'file_downloader.dart';
|
||||||
|
|
||||||
abstract class DownloadTask with ChangeNotifier {
|
abstract class DownloadTask with ChangeNotifier {
|
||||||
/// 0-1
|
/// 0-1
|
||||||
double get progress;
|
double get progress;
|
||||||
|
|
||||||
bool get isComplete;
|
|
||||||
|
|
||||||
bool get isError;
|
bool get isError;
|
||||||
|
|
||||||
bool get isPaused;
|
bool get isPaused;
|
||||||
@@ -106,10 +108,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String? get cover => _cover;
|
String? get cover => _cover ?? comic?.cover;
|
||||||
|
|
||||||
@override
|
|
||||||
bool get isComplete => _totalCount == _downloadedCount;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get message => _message;
|
String get message => _message;
|
||||||
@@ -159,7 +158,8 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
|
|||||||
|
|
||||||
var tasks = <int, _ImageDownloadWrapper>{};
|
var tasks = <int, _ImageDownloadWrapper>{};
|
||||||
|
|
||||||
int get _maxConcurrentTasks => (appdata.settings["downloadThreads"] as num).toInt();
|
int get _maxConcurrentTasks =>
|
||||||
|
(appdata.settings["downloadThreads"] as num).toInt();
|
||||||
|
|
||||||
void _scheduleTasks() {
|
void _scheduleTasks() {
|
||||||
var images = _images![_images!.keys.elementAt(_chapter)]!;
|
var images = _images![_images!.keys.elementAt(_chapter)]!;
|
||||||
@@ -253,7 +253,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
|
|||||||
|
|
||||||
await LocalManager().saveCurrentDownloadingTasks();
|
await LocalManager().saveCurrentDownloadingTasks();
|
||||||
|
|
||||||
if (cover == null) {
|
if (_cover == null) {
|
||||||
var res = await runWithRetry(() async {
|
var res = await runWithRetry(() async {
|
||||||
Uint8List? data;
|
Uint8List? data;
|
||||||
await for (var progress
|
await for (var progress
|
||||||
@@ -268,7 +268,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
|
|||||||
var fileType = detectFileType(data);
|
var fileType = detectFileType(data);
|
||||||
var file = File(FilePath.join(path!, "cover${fileType.ext}"));
|
var file = File(FilePath.join(path!, "cover${fileType.ext}"));
|
||||||
file.writeAsBytesSync(data);
|
file.writeAsBytesSync(data);
|
||||||
return file.path;
|
return "file://${file.path}";
|
||||||
});
|
});
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
_setError("Error: ${res.errorMessage}");
|
_setError("Error: ${res.errorMessage}");
|
||||||
@@ -448,7 +448,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
|
|||||||
}).toList(),
|
}).toList(),
|
||||||
directory: Directory(path!).name,
|
directory: Directory(path!).name,
|
||||||
chapters: comic!.chapters,
|
chapters: comic!.chapters,
|
||||||
cover: File(_cover!).uri.pathSegments.last,
|
cover: File(_cover!.split("file://").last).uri.pathSegments.last,
|
||||||
comicType: ComicType(source.key.hashCode),
|
comicType: ComicType(source.key.hashCode),
|
||||||
downloadedChapters: chapters ?? [],
|
downloadedChapters: chapters ?? [],
|
||||||
createdAt: DateTime.now(),
|
createdAt: DateTime.now(),
|
||||||
@@ -577,7 +577,7 @@ abstract mixin class _TransferSpeedMixin {
|
|||||||
|
|
||||||
void onData(int length) {
|
void onData(int length) {
|
||||||
if (timer == null) return;
|
if (timer == null) return;
|
||||||
if(length < 0) {
|
if (length < 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_bytesSinceLastSecond += length;
|
_bytesSinceLastSecond += length;
|
||||||
@@ -603,3 +603,217 @@ abstract mixin class _TransferSpeedMixin {
|
|||||||
_bytesSinceLastSecond = 0;
|
_bytesSinceLastSecond = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ArchiveDownloadTask extends DownloadTask {
|
||||||
|
final String archiveUrl;
|
||||||
|
|
||||||
|
final ComicDetails comic;
|
||||||
|
|
||||||
|
late ComicSource source;
|
||||||
|
|
||||||
|
/// Download comic by archive url
|
||||||
|
///
|
||||||
|
/// Currently only support zip file and comics without chapters
|
||||||
|
ArchiveDownloadTask(this.archiveUrl, this.comic) {
|
||||||
|
source = ComicSource.find(comic.sourceKey)!;
|
||||||
|
}
|
||||||
|
|
||||||
|
FileDownloader? _downloader;
|
||||||
|
|
||||||
|
String _message = "Fetching comic info...";
|
||||||
|
|
||||||
|
bool _isRunning = false;
|
||||||
|
|
||||||
|
bool _isError = false;
|
||||||
|
|
||||||
|
void _setError(String message) {
|
||||||
|
_isRunning = false;
|
||||||
|
_isError = true;
|
||||||
|
_message = message;
|
||||||
|
notifyListeners();
|
||||||
|
Log.error("Download", message);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void cancel() async {
|
||||||
|
_isRunning = false;
|
||||||
|
await _downloader?.stop();
|
||||||
|
if (path != null) {
|
||||||
|
Directory(path!).deleteIgnoreError(recursive: true);
|
||||||
|
}
|
||||||
|
path = null;
|
||||||
|
LocalManager().removeTask(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
ComicType get comicType => ComicType(source.key.hashCode);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String? get cover => comic.cover;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get id => comic.id;
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool get isError => _isError;
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool get isPaused => !_isRunning;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get message => _message;
|
||||||
|
|
||||||
|
int _currentBytes = 0;
|
||||||
|
|
||||||
|
int _expectedBytes = 0;
|
||||||
|
|
||||||
|
int _speed = 0;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void pause() {
|
||||||
|
_isRunning = false;
|
||||||
|
_message = "Paused";
|
||||||
|
_downloader?.stop();
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
double get progress =>
|
||||||
|
_expectedBytes == 0 ? 0 : _currentBytes / _expectedBytes;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void resume() async {
|
||||||
|
if (_isRunning) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_isError = false;
|
||||||
|
_isRunning = true;
|
||||||
|
notifyListeners();
|
||||||
|
_message = "Downloading...";
|
||||||
|
|
||||||
|
if (path == null) {
|
||||||
|
var dir = await LocalManager().findValidDirectory(
|
||||||
|
comic.id,
|
||||||
|
comicType,
|
||||||
|
comic.title,
|
||||||
|
);
|
||||||
|
if (!(await dir.exists())) {
|
||||||
|
try {
|
||||||
|
await dir.create();
|
||||||
|
} catch (e) {
|
||||||
|
_setError("Error: $e");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
path = dir.path;
|
||||||
|
}
|
||||||
|
|
||||||
|
var resultFile = File(FilePath.join(path!, "archive.zip"));
|
||||||
|
|
||||||
|
Log.info("Download", "Downloading $archiveUrl");
|
||||||
|
|
||||||
|
_downloader = FileDownloader(archiveUrl, resultFile.path);
|
||||||
|
|
||||||
|
bool isDownloaded = false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await for (var status in _downloader!.start()) {
|
||||||
|
_currentBytes = status.downloadedBytes;
|
||||||
|
_expectedBytes = status.totalBytes;
|
||||||
|
_message =
|
||||||
|
"${bytesToReadableString(_currentBytes)}/${bytesToReadableString(_expectedBytes)}";
|
||||||
|
_speed = status.bytesPerSecond;
|
||||||
|
isDownloaded = status.isFinished;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch(e) {
|
||||||
|
_setError("Error: $e");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_isRunning) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isDownloaded) {
|
||||||
|
_setError("Error: Download failed");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await extractArchive(path!);
|
||||||
|
} catch (e) {
|
||||||
|
_setError("Failed to extract archive: $e");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await resultFile.deleteIgnoreError();
|
||||||
|
|
||||||
|
LocalManager().completeTask(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<void> extractArchive(String path) async {
|
||||||
|
var resultFile = FilePath.join(path, "archive.zip");
|
||||||
|
await Isolate.run(() {
|
||||||
|
ZipFile.openAndExtract(resultFile, path);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
int get speed => _speed;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get title => comic.title;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
return {
|
||||||
|
"type": "ArchiveDownloadTask",
|
||||||
|
"archiveUrl": archiveUrl,
|
||||||
|
"comic": comic.toJson(),
|
||||||
|
"path": path,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
static ArchiveDownloadTask? fromJson(Map<String, dynamic> json) {
|
||||||
|
if (json["type"] != "ArchiveDownloadTask") {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return ArchiveDownloadTask(
|
||||||
|
json["archiveUrl"],
|
||||||
|
ComicDetails.fromJson(json["comic"]),
|
||||||
|
)..path = json["path"];
|
||||||
|
}
|
||||||
|
|
||||||
|
String _findCover() {
|
||||||
|
var files = Directory(path!).listSync();
|
||||||
|
for (var f in files) {
|
||||||
|
if (f.name.startsWith('cover')) {
|
||||||
|
return f.name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
files.sort((a, b) {
|
||||||
|
return a.name.compareTo(b.name);
|
||||||
|
});
|
||||||
|
return files.first.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
LocalComic toLocalComic() {
|
||||||
|
return LocalComic(
|
||||||
|
id: comic.id,
|
||||||
|
title: title,
|
||||||
|
subtitle: comic.subTitle ?? '',
|
||||||
|
tags: comic.tags.entries.expand((e) {
|
||||||
|
return e.value.map((v) => "${e.key}:$v");
|
||||||
|
}).toList(),
|
||||||
|
directory: Directory(path!).name,
|
||||||
|
chapters: null,
|
||||||
|
cover: _findCover(),
|
||||||
|
comicType: ComicType(source.key.hashCode),
|
||||||
|
downloadedChapters: [],
|
||||||
|
createdAt: DateTime.now(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
298
lib/network/file_downloader.dart
Normal file
298
lib/network/file_downloader.dart
Normal file
@@ -0,0 +1,298 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:dio/io.dart';
|
||||||
|
import 'package:venera/network/app_dio.dart';
|
||||||
|
import 'package:venera/utils/ext.dart';
|
||||||
|
|
||||||
|
class FileDownloader {
|
||||||
|
final String url;
|
||||||
|
final String savePath;
|
||||||
|
final int maxConcurrent;
|
||||||
|
|
||||||
|
FileDownloader(this.url, this.savePath, {this.maxConcurrent = 4});
|
||||||
|
|
||||||
|
int _currentBytes = 0;
|
||||||
|
|
||||||
|
int _lastBytes = 0;
|
||||||
|
|
||||||
|
late int _fileSize;
|
||||||
|
|
||||||
|
final _dio = Dio();
|
||||||
|
|
||||||
|
RandomAccessFile? _file;
|
||||||
|
|
||||||
|
bool _isWriting = false;
|
||||||
|
|
||||||
|
int _kChunkSize = 16 * 1024 * 1024;
|
||||||
|
|
||||||
|
bool _canceled = false;
|
||||||
|
|
||||||
|
late List<_DownloadBlock> _blocks;
|
||||||
|
|
||||||
|
Future<void> _writeStatus() async {
|
||||||
|
var file = File("$savePath.download");
|
||||||
|
await file.writeAsString(_blocks.map((e) => e.toString()).join("\n"));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _readStatus() async {
|
||||||
|
var file = File("$savePath.download");
|
||||||
|
if (!await file.exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var lines = await file.readAsLines();
|
||||||
|
_blocks = lines.map((e) => _DownloadBlock.fromString(e)).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// create file and write empty bytes
|
||||||
|
Future<void> _prepareFile() async {
|
||||||
|
var file = File(savePath);
|
||||||
|
if (await file.exists()) {
|
||||||
|
if (file.lengthSync() == _fileSize &&
|
||||||
|
File("$savePath.download").existsSync()) {
|
||||||
|
_file = await file.open(mode: FileMode.append);
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
await file.delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await file.create(recursive: true);
|
||||||
|
_file = await file.open(mode: FileMode.append);
|
||||||
|
await _file!.truncate(_fileSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _createTasks() async {
|
||||||
|
var res = await _dio.head(url);
|
||||||
|
var length = res.headers["content-length"]?.first;
|
||||||
|
_fileSize = length == null ? 0 : int.parse(length);
|
||||||
|
|
||||||
|
await _prepareFile();
|
||||||
|
|
||||||
|
if (File("$savePath.download").existsSync()) {
|
||||||
|
await _readStatus();
|
||||||
|
_currentBytes = _blocks.fold<int>(0,
|
||||||
|
(previousValue, element) => previousValue + element.downloadedBytes);
|
||||||
|
} else {
|
||||||
|
if (_fileSize > 1024 * 1024 * 1024) {
|
||||||
|
_kChunkSize = 64 * 1024 * 1024;
|
||||||
|
} else if (_fileSize > 512 * 1024 * 1024) {
|
||||||
|
_kChunkSize = 32 * 1024 * 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
_blocks = [];
|
||||||
|
for (var i = 0; i < _fileSize; i += _kChunkSize) {
|
||||||
|
var end = i + _kChunkSize;
|
||||||
|
if (end > _fileSize) {
|
||||||
|
_blocks.add(_DownloadBlock(i, _fileSize, 0, false));
|
||||||
|
} else {
|
||||||
|
_blocks.add(_DownloadBlock(i, i + _kChunkSize, 0, false));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Stream<DownloadingStatus> start() {
|
||||||
|
var stream = StreamController<DownloadingStatus>();
|
||||||
|
_download(stream);
|
||||||
|
return stream.stream;
|
||||||
|
}
|
||||||
|
|
||||||
|
void _reportStatus(StreamController<DownloadingStatus> stream) {
|
||||||
|
stream.add(DownloadingStatus(_currentBytes, _fileSize, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
void _download(StreamController<DownloadingStatus> resultStream) async {
|
||||||
|
try {
|
||||||
|
var proxy = await AppDio.getProxy();
|
||||||
|
_dio.httpClientAdapter = IOHttpClientAdapter(
|
||||||
|
createHttpClient: () {
|
||||||
|
return HttpClient()
|
||||||
|
..findProxy = (uri) => proxy == null ? "DIRECT" : "PROXY $proxy";
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// get file size
|
||||||
|
await _createTasks();
|
||||||
|
|
||||||
|
if (_canceled) return;
|
||||||
|
|
||||||
|
// check if file is downloaded
|
||||||
|
if (_currentBytes >= _fileSize) {
|
||||||
|
await _file!.close();
|
||||||
|
_file = null;
|
||||||
|
_reportStatus(resultStream);
|
||||||
|
resultStream.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_reportStatus(resultStream);
|
||||||
|
|
||||||
|
Timer.periodic(const Duration(seconds: 1), (timer) {
|
||||||
|
if (_canceled || _currentBytes >= _fileSize) {
|
||||||
|
timer.cancel();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resultStream.add(DownloadingStatus(
|
||||||
|
_currentBytes, _fileSize, _currentBytes - _lastBytes));
|
||||||
|
_lastBytes = _currentBytes;
|
||||||
|
});
|
||||||
|
|
||||||
|
// start downloading
|
||||||
|
await _scheduleDownload();
|
||||||
|
if (_canceled) {
|
||||||
|
resultStream.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await _file!.close();
|
||||||
|
_file = null;
|
||||||
|
await File("$savePath.download").delete();
|
||||||
|
|
||||||
|
// check if download is finished
|
||||||
|
if (_currentBytes < _fileSize) {
|
||||||
|
resultStream
|
||||||
|
.addError(Exception("Download failed: Expected $_fileSize bytes, "
|
||||||
|
"but only $_currentBytes bytes downloaded."));
|
||||||
|
resultStream.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
resultStream.add(DownloadingStatus(_currentBytes, _fileSize, 0, true));
|
||||||
|
resultStream.close();
|
||||||
|
} catch (e, s) {
|
||||||
|
await _file?.close();
|
||||||
|
_file = null;
|
||||||
|
resultStream.addError(e, s);
|
||||||
|
resultStream.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _scheduleDownload() async {
|
||||||
|
var tasks = <Future>[];
|
||||||
|
while (true) {
|
||||||
|
if (_canceled) return;
|
||||||
|
if (tasks.length >= maxConcurrent) {
|
||||||
|
await Future.any(tasks);
|
||||||
|
}
|
||||||
|
final block = _blocks.firstWhereOrNull((element) =>
|
||||||
|
!element.downloading &&
|
||||||
|
element.end - element.start > element.downloadedBytes);
|
||||||
|
if (block == null) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
block.downloading = true;
|
||||||
|
var task = _fetchBlock(block);
|
||||||
|
task.then((value) => tasks.remove(task), onError: (e) {
|
||||||
|
if(_canceled) return;
|
||||||
|
throw e;
|
||||||
|
});
|
||||||
|
tasks.add(task);
|
||||||
|
}
|
||||||
|
await Future.wait(tasks);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _fetchBlock(_DownloadBlock block) async {
|
||||||
|
final start = block.start;
|
||||||
|
final end = block.end;
|
||||||
|
|
||||||
|
if (start > _fileSize) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var options = Options(
|
||||||
|
responseType: ResponseType.stream,
|
||||||
|
headers: {
|
||||||
|
"Range": "bytes=${start + block.downloadedBytes}-${end - 1}",
|
||||||
|
"Accept": "*/*",
|
||||||
|
"Accept-Encoding": "deflate, gzip",
|
||||||
|
},
|
||||||
|
preserveHeaderCase: true,
|
||||||
|
);
|
||||||
|
var res = await _dio.get<ResponseBody>(url, options: options);
|
||||||
|
if (_canceled) return;
|
||||||
|
if (res.data == null) {
|
||||||
|
throw Exception("Failed to block $start-$end");
|
||||||
|
}
|
||||||
|
|
||||||
|
var buffer = <int>[];
|
||||||
|
await for (var data in res.data!.stream) {
|
||||||
|
if (_canceled) return;
|
||||||
|
buffer.addAll(data);
|
||||||
|
if (buffer.length > 16 * 1024) {
|
||||||
|
if (_isWriting) continue;
|
||||||
|
_currentBytes += buffer.length;
|
||||||
|
_isWriting = true;
|
||||||
|
await _file!.setPosition(start + block.downloadedBytes);
|
||||||
|
await _file!.writeFrom(buffer);
|
||||||
|
block.downloadedBytes += buffer.length;
|
||||||
|
buffer.clear();
|
||||||
|
await _writeStatus();
|
||||||
|
_isWriting = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (buffer.isNotEmpty) {
|
||||||
|
while (_isWriting) {
|
||||||
|
await Future.delayed(const Duration(milliseconds: 10));
|
||||||
|
}
|
||||||
|
_isWriting = true;
|
||||||
|
_currentBytes += buffer.length;
|
||||||
|
await _file!.setPosition(start + block.downloadedBytes);
|
||||||
|
await _file!.writeFrom(buffer);
|
||||||
|
block.downloadedBytes += buffer.length;
|
||||||
|
await _writeStatus();
|
||||||
|
_isWriting = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
block.downloading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> stop() async {
|
||||||
|
_canceled = true;
|
||||||
|
await _file?.close();
|
||||||
|
_file = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class DownloadingStatus {
|
||||||
|
/// The current downloaded bytes
|
||||||
|
final int downloadedBytes;
|
||||||
|
|
||||||
|
/// The total bytes of the file
|
||||||
|
final int totalBytes;
|
||||||
|
|
||||||
|
/// Whether the download is finished
|
||||||
|
final bool isFinished;
|
||||||
|
|
||||||
|
/// The download speed in bytes per second
|
||||||
|
final int bytesPerSecond;
|
||||||
|
|
||||||
|
const DownloadingStatus(
|
||||||
|
this.downloadedBytes, this.totalBytes, this.bytesPerSecond,
|
||||||
|
[this.isFinished = false]);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() {
|
||||||
|
return "Downloaded: $downloadedBytes/$totalBytes ${isFinished ? "Finished" : ""}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _DownloadBlock {
|
||||||
|
final int start;
|
||||||
|
final int end;
|
||||||
|
int downloadedBytes;
|
||||||
|
bool downloading;
|
||||||
|
|
||||||
|
_DownloadBlock(this.start, this.end, this.downloadedBytes, this.downloading);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() {
|
||||||
|
return "$start-$end-$downloadedBytes";
|
||||||
|
}
|
||||||
|
|
||||||
|
_DownloadBlock.fromString(String str)
|
||||||
|
: start = int.parse(str.split("-")[0]),
|
||||||
|
end = int.parse(str.split("-")[1]),
|
||||||
|
downloadedBytes = int.parse(str.split("-")[2]),
|
||||||
|
downloading = false;
|
||||||
|
}
|
@@ -1,4 +1,5 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/scheduler.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:local_auth/local_auth.dart';
|
import 'package:local_auth/local_auth.dart';
|
||||||
import 'package:venera/utils/translations.dart';
|
import 'package:venera/utils/translations.dart';
|
||||||
@@ -14,6 +15,16 @@ class AuthPage extends StatefulWidget {
|
|||||||
|
|
||||||
class _AuthPageState extends State<AuthPage> {
|
class _AuthPageState extends State<AuthPage> {
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if(SchedulerBinding.instance.lifecycleState != AppLifecycleState.paused) {
|
||||||
|
auth();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
super.initState();
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return PopScope(
|
return PopScope(
|
||||||
|
@@ -115,6 +115,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
|
|||||||
buildDescription(),
|
buildDescription(),
|
||||||
buildInfo(),
|
buildInfo(),
|
||||||
buildChapters(),
|
buildChapters(),
|
||||||
|
buildComments(),
|
||||||
buildThumbnails(),
|
buildThumbnails(),
|
||||||
buildRecommend(),
|
buildRecommend(),
|
||||||
SliverPadding(padding: EdgeInsets.only(bottom: context.padding.bottom)),
|
SliverPadding(padding: EdgeInsets.only(bottom: context.padding.bottom)),
|
||||||
@@ -287,7 +288,8 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
|
|||||||
onLongPressed: quickFavorite,
|
onLongPressed: quickFavorite,
|
||||||
iconColor: context.useTextColor(Colors.purple),
|
iconColor: context.useTextColor(Colors.purple),
|
||||||
),
|
),
|
||||||
if (comicSource.commentsLoader != null)
|
if (comicSource.commentsLoader != null &&
|
||||||
|
(comic.comments == null || comic.comments!.isEmpty))
|
||||||
_ActionButton(
|
_ActionButton(
|
||||||
icon: const Icon(Icons.comment),
|
icon: const Icon(Icons.comment),
|
||||||
text: (comic.commentsCount ?? 'Comments'.tl).toString(),
|
text: (comic.commentsCount ?? 'Comments'.tl).toString(),
|
||||||
@@ -549,6 +551,16 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
|
|||||||
SliverGridComics(comics: comic.recommend!),
|
SliverGridComics(comics: comic.recommend!),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget buildComments() {
|
||||||
|
if (comic.comments == null || comic.comments!.isEmpty) {
|
||||||
|
return const SliverPadding(padding: EdgeInsets.zero);
|
||||||
|
}
|
||||||
|
return _CommentsPart(
|
||||||
|
comments: comic.comments!,
|
||||||
|
showMore: showComments,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract mixin class _ComicPageActions {
|
abstract mixin class _ComicPageActions {
|
||||||
@@ -671,6 +683,122 @@ abstract mixin class _ComicPageActions {
|
|||||||
App.rootContext.showMessage(message: "The comic is downloaded".tl);
|
App.rootContext.showMessage(message: "The comic is downloaded".tl);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (comicSource.archiveDownloader != null) {
|
||||||
|
bool useNormalDownload = false;
|
||||||
|
List<ArchiveInfo>? archives;
|
||||||
|
int selected = -1;
|
||||||
|
bool isLoading = false;
|
||||||
|
bool isGettingLink = false;
|
||||||
|
await showDialog(
|
||||||
|
context: App.rootContext,
|
||||||
|
builder: (context) {
|
||||||
|
return StatefulBuilder(
|
||||||
|
builder: (context, setState) {
|
||||||
|
return ContentDialog(
|
||||||
|
title: "Download".tl,
|
||||||
|
content: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
RadioListTile<int>(
|
||||||
|
value: -1,
|
||||||
|
groupValue: selected,
|
||||||
|
title: Text("Normal".tl),
|
||||||
|
onChanged: (v) {
|
||||||
|
setState(() {
|
||||||
|
selected = v!;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
ExpansionTile(
|
||||||
|
title: Text("Archive".tl),
|
||||||
|
shape: const RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.zero,
|
||||||
|
),
|
||||||
|
collapsedShape: const RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.zero,
|
||||||
|
),
|
||||||
|
onExpansionChanged: (b) {
|
||||||
|
if (!isLoading && b && archives == null) {
|
||||||
|
isLoading = true;
|
||||||
|
comicSource.archiveDownloader!
|
||||||
|
.getArchives(comic.id)
|
||||||
|
.then((value) {
|
||||||
|
if (value.success) {
|
||||||
|
archives = value.data;
|
||||||
|
} else {
|
||||||
|
App.rootContext
|
||||||
|
.showMessage(message: value.errorMessage!);
|
||||||
|
}
|
||||||
|
setState(() {
|
||||||
|
isLoading = false;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
children: [
|
||||||
|
if (archives == null)
|
||||||
|
const ListLoadingIndicator().toCenter()
|
||||||
|
else
|
||||||
|
for (int i = 0; i < archives!.length; i++)
|
||||||
|
RadioListTile<int>(
|
||||||
|
value: i,
|
||||||
|
groupValue: selected,
|
||||||
|
onChanged: (v) {
|
||||||
|
setState(() {
|
||||||
|
selected = v!;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
title: Text(archives![i].title),
|
||||||
|
subtitle: Text(archives![i].description),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
Button.filled(
|
||||||
|
isLoading: isGettingLink,
|
||||||
|
onPressed: () async {
|
||||||
|
if (selected == -1) {
|
||||||
|
useNormalDownload = true;
|
||||||
|
context.pop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setState(() {
|
||||||
|
isGettingLink = true;
|
||||||
|
});
|
||||||
|
var res =
|
||||||
|
await comicSource.archiveDownloader!.getDownloadUrl(
|
||||||
|
comic.id,
|
||||||
|
archives![selected].id,
|
||||||
|
);
|
||||||
|
if (res.error) {
|
||||||
|
App.rootContext.showMessage(message: res.errorMessage!);
|
||||||
|
setState(() {
|
||||||
|
isGettingLink = false;
|
||||||
|
});
|
||||||
|
} else if (context.mounted) {
|
||||||
|
LocalManager()
|
||||||
|
.addTask(ArchiveDownloadTask(res.data, comic));
|
||||||
|
App.rootContext
|
||||||
|
.showMessage(message: "Download started".tl);
|
||||||
|
context.pop();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: Text("Confirm".tl),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if (!useNormalDownload) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (comic.chapters == null) {
|
if (comic.chapters == null) {
|
||||||
LocalManager().addTask(ImagesDownloadTask(
|
LocalManager().addTask(ImagesDownloadTask(
|
||||||
source: comicSource,
|
source: comicSource,
|
||||||
@@ -1670,3 +1798,152 @@ class _SelectDownloadChapterState extends State<_SelectDownloadChapter> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class _CommentsPart extends StatefulWidget {
|
||||||
|
const _CommentsPart({
|
||||||
|
required this.comments,
|
||||||
|
required this.showMore,
|
||||||
|
});
|
||||||
|
|
||||||
|
final List<Comment> comments;
|
||||||
|
|
||||||
|
final void Function() showMore;
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<_CommentsPart> createState() => _CommentsPartState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CommentsPartState extends State<_CommentsPart> {
|
||||||
|
final scrollController = ScrollController();
|
||||||
|
|
||||||
|
late List<Comment> comments;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
comments = widget.comments;
|
||||||
|
super.initState();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return MultiSliver(
|
||||||
|
children: [
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: ListTile(
|
||||||
|
title: Text("Comments".tl),
|
||||||
|
trailing: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.chevron_left),
|
||||||
|
onPressed: () {
|
||||||
|
scrollController.animateTo(
|
||||||
|
scrollController.position.pixels - 340,
|
||||||
|
duration: const Duration(milliseconds: 200),
|
||||||
|
curve: Curves.ease,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.chevron_right),
|
||||||
|
onPressed: () {
|
||||||
|
scrollController.animateTo(
|
||||||
|
scrollController.position.pixels + 340,
|
||||||
|
duration: const Duration(milliseconds: 200),
|
||||||
|
curve: Curves.ease,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 184,
|
||||||
|
child: MediaQuery.removePadding(
|
||||||
|
removeTop: true,
|
||||||
|
context: context,
|
||||||
|
child: ListView.builder(
|
||||||
|
controller: scrollController,
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
itemCount: comments.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
return _CommentWidget(comment: comments[index]);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
_ActionButton(
|
||||||
|
icon: const Icon(Icons.comment),
|
||||||
|
text: "View more".tl,
|
||||||
|
onPressed: widget.showMore,
|
||||||
|
iconColor: context.useTextColor(Colors.green),
|
||||||
|
).fixHeight(48).paddingRight(8).toAlign(Alignment.centerRight),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SliverToBoxAdapter(
|
||||||
|
child: Divider(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CommentWidget extends StatelessWidget {
|
||||||
|
const _CommentWidget({required this.comment});
|
||||||
|
|
||||||
|
final Comment comment;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Container(
|
||||||
|
height: double.infinity,
|
||||||
|
margin: const EdgeInsets.fromLTRB(16, 8, 0, 8),
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||||
|
width: 324,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: context.colorScheme.surfaceContainerLow,
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
if (comment.avatar != null)
|
||||||
|
Container(
|
||||||
|
width: 36,
|
||||||
|
height: 36,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(18),
|
||||||
|
color: context.colorScheme.surfaceContainer,
|
||||||
|
),
|
||||||
|
clipBehavior: Clip.antiAlias,
|
||||||
|
child: Image(
|
||||||
|
image: CachedImageProvider(comment.avatar!),
|
||||||
|
width: 36,
|
||||||
|
height: 36,
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
),
|
||||||
|
).paddingRight(8),
|
||||||
|
Text(comment.userName, style: ts.bold),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Expanded(
|
||||||
|
child: RichCommentContent(text: comment.content).fixWidth(324),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
if (comment.time != null)
|
||||||
|
Text(comment.time!, style: ts.s12).toAlign(Alignment.centerLeft),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -231,7 +231,10 @@ class _BodyState extends State<_Body> {
|
|||||||
showConfirmDialog(
|
showConfirmDialog(
|
||||||
context: App.rootContext,
|
context: App.rootContext,
|
||||||
title: "Delete".tl,
|
title: "Delete".tl,
|
||||||
content: "Are you sure you want to delete it?".tl,
|
content: "Delete comic source '@n' ?".tlParams({
|
||||||
|
"n": source.name,
|
||||||
|
}),
|
||||||
|
btnColor: context.colorScheme.error,
|
||||||
onConfirm: () {
|
onConfirm: () {
|
||||||
var file = File(source.filePath);
|
var file = File(source.filePath);
|
||||||
file.delete();
|
file.delete();
|
||||||
|
@@ -510,7 +510,7 @@ class _CommentContent extends StatelessWidget {
|
|||||||
if (!text.contains('<') && !text.contains('http')) {
|
if (!text.contains('<') && !text.contains('http')) {
|
||||||
return SelectableText(text);
|
return SelectableText(text);
|
||||||
} else {
|
} else {
|
||||||
return _RichCommentContent(text: text);
|
return RichCommentContent(text: text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -595,7 +595,7 @@ class _Tag {
|
|||||||
static void handleLink(String link) async {
|
static void handleLink(String link) async {
|
||||||
if (link.isURL) {
|
if (link.isURL) {
|
||||||
if (await handleAppLink(Uri.parse(link))) {
|
if (await handleAppLink(Uri.parse(link))) {
|
||||||
App.rootContext.pop();
|
Navigator.of(App.rootContext).maybePop();
|
||||||
} else {
|
} else {
|
||||||
launchUrlString(link);
|
launchUrlString(link);
|
||||||
}
|
}
|
||||||
@@ -610,16 +610,16 @@ class _CommentImage {
|
|||||||
const _CommentImage(this.url, this.link);
|
const _CommentImage(this.url, this.link);
|
||||||
}
|
}
|
||||||
|
|
||||||
class _RichCommentContent extends StatefulWidget {
|
class RichCommentContent extends StatefulWidget {
|
||||||
const _RichCommentContent({required this.text});
|
const RichCommentContent({super.key, required this.text});
|
||||||
|
|
||||||
final String text;
|
final String text;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<_RichCommentContent> createState() => _RichCommentContentState();
|
State<RichCommentContent> createState() => _RichCommentContentState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _RichCommentContentState extends State<_RichCommentContent> {
|
class _RichCommentContentState extends State<RichCommentContent> {
|
||||||
var textSpan = <InlineSpan>[];
|
var textSpan = <InlineSpan>[];
|
||||||
var images = <_CommentImage>[];
|
var images = <_CommentImage>[];
|
||||||
|
|
||||||
@@ -639,6 +639,8 @@ class _RichCommentContentState extends State<_RichCommentContent> {
|
|||||||
int i = 0;
|
int i = 0;
|
||||||
var buffer = StringBuffer();
|
var buffer = StringBuffer();
|
||||||
var text = widget.text;
|
var text = widget.text;
|
||||||
|
text = text.replaceAll('\r\n', '\n');
|
||||||
|
text = text.replaceAll('&', '&');
|
||||||
|
|
||||||
void writeBuffer() {
|
void writeBuffer() {
|
||||||
if (buffer.isEmpty) return;
|
if (buffer.isEmpty) return;
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:venera/components/components.dart';
|
import 'package:venera/components/components.dart';
|
||||||
import 'package:venera/foundation/app.dart';
|
import 'package:venera/foundation/app.dart';
|
||||||
|
import 'package:venera/foundation/image_provider/cached_image.dart';
|
||||||
import 'package:venera/foundation/local.dart';
|
import 'package:venera/foundation/local.dart';
|
||||||
import 'package:venera/network/download.dart';
|
import 'package:venera/network/download.dart';
|
||||||
import 'package:venera/utils/io.dart';
|
import 'package:venera/utils/io.dart';
|
||||||
@@ -161,8 +162,8 @@ class _DownloadTaskTileState extends State<_DownloadTaskTile> {
|
|||||||
clipBehavior: Clip.antiAlias,
|
clipBehavior: Clip.antiAlias,
|
||||||
child: widget.task.cover == null
|
child: widget.task.cover == null
|
||||||
? null
|
? null
|
||||||
: Image.file(
|
: Image(
|
||||||
File(widget.task.cover!),
|
image: CachedImageProvider(widget.task.cover!),
|
||||||
filterQuality: FilterQuality.medium,
|
filterQuality: FilterQuality.medium,
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
),
|
),
|
||||||
@@ -206,6 +207,7 @@ class _DownloadTaskTileState extends State<_DownloadTaskTile> {
|
|||||||
Text(
|
Text(
|
||||||
widget.task.message,
|
widget.task.message,
|
||||||
style: ts.s12,
|
style: ts.s12,
|
||||||
|
maxLines: 3,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 4),
|
const SizedBox(height: 4),
|
||||||
LinearProgressIndicator(
|
LinearProgressIndicator(
|
||||||
|
@@ -9,10 +9,12 @@ import 'package:venera/foundation/app.dart';
|
|||||||
import 'package:venera/foundation/appdata.dart';
|
import 'package:venera/foundation/appdata.dart';
|
||||||
import 'package:venera/foundation/comic_source/comic_source.dart';
|
import 'package:venera/foundation/comic_source/comic_source.dart';
|
||||||
import 'package:venera/foundation/comic_type.dart';
|
import 'package:venera/foundation/comic_type.dart';
|
||||||
|
import 'package:venera/foundation/consts.dart';
|
||||||
import 'package:venera/foundation/favorites.dart';
|
import 'package:venera/foundation/favorites.dart';
|
||||||
import 'package:venera/foundation/local.dart';
|
import 'package:venera/foundation/local.dart';
|
||||||
import 'package:venera/foundation/res.dart';
|
import 'package:venera/foundation/res.dart';
|
||||||
import 'package:venera/network/download.dart';
|
import 'package:venera/network/download.dart';
|
||||||
|
import 'package:venera/pages/comic_page.dart';
|
||||||
import 'package:venera/utils/io.dart';
|
import 'package:venera/utils/io.dart';
|
||||||
import 'package:venera/utils/translations.dart';
|
import 'package:venera/utils/translations.dart';
|
||||||
|
|
||||||
|
@@ -17,10 +17,30 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
|||||||
String? networkSource;
|
String? networkSource;
|
||||||
String? networkFolder;
|
String? networkFolder;
|
||||||
|
|
||||||
|
Map<Comic, bool> selectedComics = {};
|
||||||
|
|
||||||
|
var selectedLocalFolders = <String>{};
|
||||||
|
|
||||||
|
late List<String> added = [];
|
||||||
|
|
||||||
|
String keyword = "";
|
||||||
|
|
||||||
|
bool searchMode = false;
|
||||||
|
|
||||||
|
bool multiSelectMode = false;
|
||||||
|
|
||||||
|
int? lastSelectedIndex;
|
||||||
|
|
||||||
void updateComics() {
|
void updateComics() {
|
||||||
|
if (keyword.isEmpty) {
|
||||||
setState(() {
|
setState(() {
|
||||||
comics = LocalFavoritesManager().getAllComics(widget.folder);
|
comics = LocalFavoritesManager().getAllComics(widget.folder);
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
setState(() {
|
||||||
|
comics = LocalFavoritesManager().search(keyword);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -35,9 +55,28 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return SmoothCustomScrollView(
|
void selectAll() {
|
||||||
slivers: [
|
setState(() {
|
||||||
|
selectedComics = comics.asMap().map((k, v) => MapEntry(v, true));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void invertSelection() {
|
||||||
|
setState(() {
|
||||||
|
comics.asMap().forEach((k, v) {
|
||||||
|
selectedComics[v] = !selectedComics.putIfAbsent(v, () => false);
|
||||||
|
});
|
||||||
|
selectedComics.removeWhere((k, v) => !v);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
var body = Scaffold(
|
||||||
|
body: SmoothCustomScrollView(slivers: [
|
||||||
|
if (!searchMode && !multiSelectMode)
|
||||||
SliverAppbar(
|
SliverAppbar(
|
||||||
|
style: context.width < changePoint
|
||||||
|
? AppbarStyle.shadow
|
||||||
|
: AppbarStyle.blur,
|
||||||
leading: Tooltip(
|
leading: Tooltip(
|
||||||
message: "Folders".tl,
|
message: "Folders".tl,
|
||||||
child: context.width <= _kTwoPanelChangeWidth
|
child: context.width <= _kTwoPanelChangeWidth
|
||||||
@@ -65,7 +104,7 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
|||||||
var text = "The folder is Linked to @source".tlParams({
|
var text = "The folder is Linked to @source".tlParams({
|
||||||
"source": sourceName,
|
"source": sourceName,
|
||||||
});
|
});
|
||||||
if(networkFolder != null && networkFolder!.isNotEmpty) {
|
if (networkFolder != null && networkFolder!.isNotEmpty) {
|
||||||
text += "\n${"Source Folder".tl}: $networkFolder";
|
text += "\n${"Source Folder".tl}: $networkFolder";
|
||||||
}
|
}
|
||||||
return FlyoutContent(
|
return FlyoutContent(
|
||||||
@@ -100,24 +139,19 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
|||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
Tooltip(
|
||||||
|
message: "Search".tl,
|
||||||
|
child: IconButton(
|
||||||
|
icon: const Icon(Icons.search),
|
||||||
|
onPressed: () {
|
||||||
|
setState(() {
|
||||||
|
searchMode = true;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
MenuButton(
|
MenuButton(
|
||||||
entries: [
|
entries: [
|
||||||
MenuEntry(
|
|
||||||
icon: Icons.delete_outline,
|
|
||||||
text: "Delete Folder".tl,
|
|
||||||
onClick: () {
|
|
||||||
showConfirmDialog(
|
|
||||||
context: App.rootContext,
|
|
||||||
title: "Delete".tl,
|
|
||||||
content:
|
|
||||||
"Are you sure you want to delete this folder?".tl,
|
|
||||||
onConfirm: () {
|
|
||||||
favPage.setFolder(false, null);
|
|
||||||
LocalFavoritesManager().deleteFolder(widget.folder);
|
|
||||||
favPage.folderList?.updateFolders();
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
MenuEntry(
|
MenuEntry(
|
||||||
icon: Icons.edit_outlined,
|
icon: Icons.edit_outlined,
|
||||||
text: "Rename".tl,
|
text: "Rename".tl,
|
||||||
@@ -187,64 +221,356 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
|||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
MenuEntry(
|
MenuEntry(
|
||||||
icon: Icons.download,
|
icon: Icons.delete_outline,
|
||||||
text: "Download All".tl,
|
text: "Delete Folder".tl,
|
||||||
onClick: () async {
|
color: context.colorScheme.error,
|
||||||
int count = 0;
|
onClick: () {
|
||||||
for (var c in comics) {
|
showConfirmDialog(
|
||||||
if (await LocalManager().isDownloaded(c.id, c.type)) {
|
context: App.rootContext,
|
||||||
continue;
|
title: "Delete".tl,
|
||||||
}
|
content: "Delete folder '@f' ?".tlParams({
|
||||||
var comicSource = c.type.comicSource;
|
"f": widget.folder,
|
||||||
if (comicSource == null) {
|
}),
|
||||||
continue;
|
btnColor: context.colorScheme.error,
|
||||||
}
|
onConfirm: () {
|
||||||
LocalManager().addTask(ImagesDownloadTask(
|
favPage.setFolder(false, null);
|
||||||
source: comicSource,
|
LocalFavoritesManager().deleteFolder(widget.folder);
|
||||||
comicId: c.id,
|
favPage.folderList?.updateFolders();
|
||||||
comic: null,
|
},
|
||||||
comicTitle: c.name,
|
);
|
||||||
));
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
context.showMessage(
|
|
||||||
message: "Added @count comics to download queue."
|
|
||||||
.tlParams({
|
|
||||||
"count": count.toString(),
|
|
||||||
}));
|
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
)
|
||||||
|
else if (multiSelectMode)
|
||||||
|
SliverAppbar(
|
||||||
|
style: context.width < changePoint
|
||||||
|
? AppbarStyle.shadow
|
||||||
|
: AppbarStyle.blur,
|
||||||
|
leading: Tooltip(
|
||||||
|
message: "Cancel".tl,
|
||||||
|
child: IconButton(
|
||||||
|
icon: const Icon(Icons.close),
|
||||||
|
onPressed: () {
|
||||||
|
setState(() {
|
||||||
|
multiSelectMode = false;
|
||||||
|
selectedComics.clear();
|
||||||
|
});
|
||||||
|
},
|
||||||
),
|
),
|
||||||
SliverGridComics(
|
),
|
||||||
comics: comics,
|
title: Text(
|
||||||
menuBuilder: (c) {
|
"Selected @c comics".tlParams({"c": selectedComics.length})),
|
||||||
return [
|
actions: [
|
||||||
|
MenuButton(entries: [
|
||||||
|
MenuEntry(
|
||||||
|
icon: Icons.drive_file_move,
|
||||||
|
text: "Move to folder".tl,
|
||||||
|
onClick: () => favoriteOption('move')),
|
||||||
|
MenuEntry(
|
||||||
|
icon: Icons.copy,
|
||||||
|
text: "Copy to folder".tl,
|
||||||
|
onClick: () => favoriteOption('add')),
|
||||||
|
MenuEntry(
|
||||||
|
icon: Icons.select_all,
|
||||||
|
text: "Select All".tl,
|
||||||
|
onClick: selectAll),
|
||||||
|
MenuEntry(
|
||||||
|
icon: Icons.deselect,
|
||||||
|
text: "Deselect".tl,
|
||||||
|
onClick: _cancel),
|
||||||
|
MenuEntry(
|
||||||
|
icon: Icons.flip,
|
||||||
|
text: "Invert Selection".tl,
|
||||||
|
onClick: invertSelection),
|
||||||
MenuEntry(
|
MenuEntry(
|
||||||
icon: Icons.delete_outline,
|
icon: Icons.delete_outline,
|
||||||
text: "Delete".tl,
|
text: "Delete Comic".tl,
|
||||||
|
color: context.colorScheme.error,
|
||||||
onClick: () {
|
onClick: () {
|
||||||
showConfirmDialog(
|
showConfirmDialog(
|
||||||
context: context,
|
context: context,
|
||||||
title: "Delete".tl,
|
title: "Delete".tl,
|
||||||
content: "Are you sure you want to delete this comic?".tl,
|
content: "Delete @c comics?"
|
||||||
|
.tlParams({"c": selectedComics.length}),
|
||||||
|
btnColor: context.colorScheme.error,
|
||||||
onConfirm: () {
|
onConfirm: () {
|
||||||
|
_deleteComicWithId();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
else if (searchMode)
|
||||||
|
SliverAppbar(
|
||||||
|
style: context.width < changePoint
|
||||||
|
? AppbarStyle.shadow
|
||||||
|
: AppbarStyle.blur,
|
||||||
|
leading: Tooltip(
|
||||||
|
message: "Cancel".tl,
|
||||||
|
child: IconButton(
|
||||||
|
icon: const Icon(Icons.close),
|
||||||
|
onPressed: () {
|
||||||
|
setState(() {
|
||||||
|
searchMode = false;
|
||||||
|
keyword = "";
|
||||||
|
updateComics();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
title: TextField(
|
||||||
|
autofocus: true,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: "Search".tl,
|
||||||
|
border: InputBorder.none,
|
||||||
|
),
|
||||||
|
onChanged: (v) {
|
||||||
|
keyword = v;
|
||||||
|
updateComics();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SliverGridComics(
|
||||||
|
comics: comics,
|
||||||
|
selections: selectedComics,
|
||||||
|
onTap: multiSelectMode
|
||||||
|
? (c) {
|
||||||
|
setState(() {
|
||||||
|
if (selectedComics.containsKey(c as FavoriteItem)) {
|
||||||
|
selectedComics.remove(c);
|
||||||
|
_checkExitSelectMode();
|
||||||
|
} else {
|
||||||
|
selectedComics[c] = true;
|
||||||
|
}
|
||||||
|
lastSelectedIndex = comics.indexOf(c);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
: (c) {
|
||||||
|
App.mainNavigatorKey?.currentContext
|
||||||
|
?.to(() => ComicPage(id: c.id, sourceKey: c.sourceKey));
|
||||||
|
},
|
||||||
|
onLongPressed: (c) {
|
||||||
|
setState(() {
|
||||||
|
if (!multiSelectMode) {
|
||||||
|
multiSelectMode = true;
|
||||||
|
if (!selectedComics.containsKey(c as FavoriteItem)) {
|
||||||
|
selectedComics[c] = true;
|
||||||
|
}
|
||||||
|
lastSelectedIndex = comics.indexOf(c);
|
||||||
|
} else {
|
||||||
|
if (lastSelectedIndex != null) {
|
||||||
|
int start = lastSelectedIndex!;
|
||||||
|
int end = comics.indexOf(c as FavoriteItem);
|
||||||
|
if (start > end) {
|
||||||
|
int temp = start;
|
||||||
|
start = end;
|
||||||
|
end = temp;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = start; i <= end; i++) {
|
||||||
|
if (i == lastSelectedIndex) continue;
|
||||||
|
|
||||||
|
var comic = comics[i];
|
||||||
|
if (selectedComics.containsKey(comic)) {
|
||||||
|
selectedComics.remove(comic);
|
||||||
|
} else {
|
||||||
|
selectedComics[comic] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastSelectedIndex = comics.indexOf(c as FavoriteItem);
|
||||||
|
}
|
||||||
|
_checkExitSelectMode();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
);
|
||||||
|
return PopScope(
|
||||||
|
canPop: !multiSelectMode && !searchMode,
|
||||||
|
onPopInvokedWithResult: (didPop, result) {
|
||||||
|
if (multiSelectMode) {
|
||||||
|
setState(() {
|
||||||
|
multiSelectMode = false;
|
||||||
|
selectedComics.clear();
|
||||||
|
});
|
||||||
|
} else if (searchMode) {
|
||||||
|
setState(() {
|
||||||
|
searchMode = false;
|
||||||
|
keyword = "";
|
||||||
|
updateComics();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: body,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void favoriteOption(String option) {
|
||||||
|
var targetFolders = LocalFavoritesManager()
|
||||||
|
.folderNames
|
||||||
|
.where((folder) => folder != favPage.folder)
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
showPopUpWidget(
|
||||||
|
App.rootContext,
|
||||||
|
StatefulBuilder(
|
||||||
|
builder: (context, setState) {
|
||||||
|
return PopUpWidgetScaffold(
|
||||||
|
title: favPage.folder ?? "Unselected".tl,
|
||||||
|
body: Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: context.padding.bottom + 16),
|
||||||
|
child: Container(
|
||||||
|
constraints:
|
||||||
|
const BoxConstraints(maxHeight: 700, maxWidth: 500),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: ListView.builder(
|
||||||
|
itemCount: targetFolders.length + 1,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
if (index == targetFolders.length) {
|
||||||
|
return SizedBox(
|
||||||
|
height: 36,
|
||||||
|
child: Center(
|
||||||
|
child: TextButton(
|
||||||
|
onPressed: () {
|
||||||
|
newFolder().then((v) {
|
||||||
|
setState(() {
|
||||||
|
targetFolders = LocalFavoritesManager()
|
||||||
|
.folderNames
|
||||||
|
.where((folder) =>
|
||||||
|
folder != favPage.folder)
|
||||||
|
.toList();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
const Icon(Icons.add, size: 20),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
Text("New Folder".tl),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
var folder = targetFolders[index];
|
||||||
|
var disabled = false;
|
||||||
|
if (selectedLocalFolders.isNotEmpty) {
|
||||||
|
if (added.contains(folder) &&
|
||||||
|
!added.contains(selectedLocalFolders.first)) {
|
||||||
|
disabled = true;
|
||||||
|
} else if (!added.contains(folder) &&
|
||||||
|
added.contains(selectedLocalFolders.first)) {
|
||||||
|
disabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return CheckboxListTile(
|
||||||
|
title: Row(
|
||||||
|
children: [
|
||||||
|
Text(folder),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
value: selectedLocalFolders.contains(folder),
|
||||||
|
onChanged: disabled
|
||||||
|
? null
|
||||||
|
: (v) {
|
||||||
|
setState(() {
|
||||||
|
if (v!) {
|
||||||
|
selectedLocalFolders.add(folder);
|
||||||
|
} else {
|
||||||
|
selectedLocalFolders.remove(folder);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Center(
|
||||||
|
child: FilledButton(
|
||||||
|
onPressed: () {
|
||||||
|
if (selectedLocalFolders.isEmpty) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (option == 'move') {
|
||||||
|
for (var c in selectedComics.keys) {
|
||||||
|
for (var s in selectedLocalFolders) {
|
||||||
|
LocalFavoritesManager().moveFavorite(
|
||||||
|
favPage.folder as String,
|
||||||
|
s,
|
||||||
|
c.id,
|
||||||
|
(c as FavoriteItem).type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for (var c in selectedComics.keys) {
|
||||||
|
for (var s in selectedLocalFolders) {
|
||||||
|
LocalFavoritesManager().addComic(
|
||||||
|
s,
|
||||||
|
FavoriteItem(
|
||||||
|
id: c.id,
|
||||||
|
name: c.title,
|
||||||
|
coverPath: c.cover,
|
||||||
|
author: c.subtitle ?? '',
|
||||||
|
type: ComicType((c.sourceKey == 'local'
|
||||||
|
? 0
|
||||||
|
: c.sourceKey.hashCode)),
|
||||||
|
tags: c.tags ?? [],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
App.rootContext.pop();
|
||||||
|
updateComics();
|
||||||
|
_cancel();
|
||||||
|
},
|
||||||
|
child: Text(option == 'move' ? "Move".tl : "Add".tl),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _checkExitSelectMode() {
|
||||||
|
if (selectedComics.isEmpty) {
|
||||||
|
setState(() {
|
||||||
|
multiSelectMode = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _cancel() {
|
||||||
|
setState(() {
|
||||||
|
selectedComics.clear();
|
||||||
|
multiSelectMode = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void _deleteComicWithId() {
|
||||||
|
for (var c in selectedComics.keys) {
|
||||||
LocalFavoritesManager().deleteComicWithId(
|
LocalFavoritesManager().deleteComicWithId(
|
||||||
widget.folder,
|
widget.folder,
|
||||||
c.id,
|
c.id,
|
||||||
(c as FavoriteItem).type,
|
(c as FavoriteItem).type,
|
||||||
);
|
);
|
||||||
|
}
|
||||||
updateComics();
|
updateComics();
|
||||||
},
|
_cancel();
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
];
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -284,6 +610,7 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
var type = appdata.settings['comicDisplayMode'];
|
||||||
var tiles = comics.map(
|
var tiles = comics.map(
|
||||||
(e) {
|
(e) {
|
||||||
var comicSource = e.type.comicSource;
|
var comicSource = e.type.comicSource;
|
||||||
@@ -296,7 +623,9 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
|
|||||||
e.id,
|
e.id,
|
||||||
e.author,
|
e.author,
|
||||||
e.tags,
|
e.tags,
|
||||||
"${e.time} | ${comicSource?.name ?? "Unknown"}",
|
type == 'detailed'
|
||||||
|
? "${e.time} | ${comicSource?.name ?? "Unknown"}"
|
||||||
|
: "${e.type.comicSource?.name ?? "Unknown"} | ${e.time}",
|
||||||
comicSource?.key ??
|
comicSource?.key ??
|
||||||
(e.type == ComicType.local ? "local" : "Unknown"),
|
(e.type == ComicType.local ? "local" : "Unknown"),
|
||||||
null,
|
null,
|
||||||
|
@@ -19,8 +19,8 @@ Future<bool> _deleteComic(
|
|||||||
bool loading = false;
|
bool loading = false;
|
||||||
return StatefulBuilder(builder: (context, setState) {
|
return StatefulBuilder(builder: (context, setState) {
|
||||||
return ContentDialog(
|
return ContentDialog(
|
||||||
title: "Delete".tl,
|
title: "Remove".tl,
|
||||||
content: Text("Are you sure you want to delete this comic?".tl)
|
content: Text("Remove comic from favorite?".tl)
|
||||||
.paddingHorizontal(16),
|
.paddingHorizontal(16),
|
||||||
actions: [
|
actions: [
|
||||||
Button.filled(
|
Button.filled(
|
||||||
@@ -94,6 +94,9 @@ class _NormalFavoritePageState extends State<_NormalFavoritePage> {
|
|||||||
return ComicList(
|
return ComicList(
|
||||||
key: comicListKey,
|
key: comicListKey,
|
||||||
leadingSliver: SliverAppbar(
|
leadingSliver: SliverAppbar(
|
||||||
|
style: context.width < changePoint
|
||||||
|
? AppbarStyle.shadow
|
||||||
|
: AppbarStyle.blur,
|
||||||
leading: Tooltip(
|
leading: Tooltip(
|
||||||
message: "Folders".tl,
|
message: "Folders".tl,
|
||||||
child: context.width <= _kTwoPanelChangeWidth
|
child: context.width <= _kTwoPanelChangeWidth
|
||||||
@@ -211,6 +214,9 @@ class _MultiFolderFavoritesPageState extends State<_MultiFolderFavoritesPage> {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
var sliverAppBar = SliverAppbar(
|
var sliverAppBar = SliverAppbar(
|
||||||
|
style: context.width < changePoint
|
||||||
|
? AppbarStyle.shadow
|
||||||
|
: AppbarStyle.blur,
|
||||||
leading: Tooltip(
|
leading: Tooltip(
|
||||||
message: "Folders".tl,
|
message: "Folders".tl,
|
||||||
child: context.width <= _kTwoPanelChangeWidth
|
child: context.width <= _kTwoPanelChangeWidth
|
||||||
@@ -424,7 +430,7 @@ class _FolderTile extends StatelessWidget {
|
|||||||
return StatefulBuilder(builder: (context, setState) {
|
return StatefulBuilder(builder: (context, setState) {
|
||||||
return ContentDialog(
|
return ContentDialog(
|
||||||
title: "Delete".tl,
|
title: "Delete".tl,
|
||||||
content: Text("Are you sure you want to delete this folder?".tl)
|
content: Text("Delete folder?".tl)
|
||||||
.paddingHorizontal(16),
|
.paddingHorizontal(16),
|
||||||
actions: [
|
actions: [
|
||||||
Button.filled(
|
Button.filled(
|
||||||
|
@@ -97,7 +97,9 @@ class _HistoryPageState extends State<HistoryPage> {
|
|||||||
e.subtitle,
|
e.subtitle,
|
||||||
null,
|
null,
|
||||||
getDescription(e),
|
getDescription(e),
|
||||||
e.type.comicSource?.key ?? "Invalid:${e.type.value}",
|
e.type == ComicType.local
|
||||||
|
? 'local'
|
||||||
|
: e.type.comicSource?.key ?? "Unknown:${e.type.value}",
|
||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
);
|
);
|
||||||
@@ -111,12 +113,18 @@ class _HistoryPageState extends State<HistoryPage> {
|
|||||||
MenuEntry(
|
MenuEntry(
|
||||||
icon: Icons.remove,
|
icon: Icons.remove,
|
||||||
text: 'Remove'.tl,
|
text: 'Remove'.tl,
|
||||||
|
color: context.colorScheme.error,
|
||||||
onClick: () {
|
onClick: () {
|
||||||
if (c.sourceKey.startsWith("Invalid")) {
|
if (c.sourceKey.startsWith("Unknown")) {
|
||||||
HistoryManager().remove(
|
HistoryManager().remove(
|
||||||
c.id,
|
c.id,
|
||||||
ComicType(int.parse(c.sourceKey.split(':')[1])),
|
ComicType(int.parse(c.sourceKey.split(':')[1])),
|
||||||
);
|
);
|
||||||
|
} else if (c.sourceKey == 'local') {
|
||||||
|
HistoryManager().remove(
|
||||||
|
c.id,
|
||||||
|
ComicType.local,
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
HistoryManager().remove(
|
HistoryManager().remove(
|
||||||
c.id,
|
c.id,
|
||||||
|
@@ -1,29 +1,23 @@
|
|||||||
import 'package:flutter/foundation.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:sliver_tools/sliver_tools.dart';
|
import 'package:sliver_tools/sliver_tools.dart';
|
||||||
import 'package:venera/components/components.dart';
|
import 'package:venera/components/components.dart';
|
||||||
import 'package:venera/foundation/app.dart';
|
import 'package:venera/foundation/app.dart';
|
||||||
import 'package:venera/foundation/comic_source/comic_source.dart';
|
import 'package:venera/foundation/comic_source/comic_source.dart';
|
||||||
import 'package:venera/foundation/comic_type.dart';
|
|
||||||
import 'package:venera/foundation/consts.dart';
|
import 'package:venera/foundation/consts.dart';
|
||||||
import 'package:venera/foundation/favorites.dart';
|
import 'package:venera/foundation/favorites.dart';
|
||||||
import 'package:venera/foundation/history.dart';
|
import 'package:venera/foundation/history.dart';
|
||||||
import 'package:venera/foundation/image_provider/cached_image.dart';
|
import 'package:venera/foundation/image_provider/cached_image.dart';
|
||||||
import 'package:venera/foundation/local.dart';
|
import 'package:venera/foundation/local.dart';
|
||||||
import 'package:venera/foundation/log.dart';
|
|
||||||
import 'package:venera/pages/accounts_page.dart';
|
import 'package:venera/pages/accounts_page.dart';
|
||||||
import 'package:venera/pages/comic_page.dart';
|
import 'package:venera/pages/comic_page.dart';
|
||||||
import 'package:venera/pages/comic_source_page.dart';
|
import 'package:venera/pages/comic_source_page.dart';
|
||||||
import 'package:venera/pages/downloading_page.dart';
|
import 'package:venera/pages/downloading_page.dart';
|
||||||
import 'package:venera/pages/history_page.dart';
|
import 'package:venera/pages/history_page.dart';
|
||||||
import 'package:venera/pages/search_page.dart';
|
import 'package:venera/pages/search_page.dart';
|
||||||
import 'package:venera/utils/cbz.dart';
|
|
||||||
import 'package:venera/utils/data_sync.dart';
|
import 'package:venera/utils/data_sync.dart';
|
||||||
import 'package:venera/utils/ext.dart';
|
import 'package:venera/utils/ext.dart';
|
||||||
import 'package:venera/utils/io.dart';
|
import 'package:venera/utils/import_comic.dart';
|
||||||
import 'package:venera/utils/translations.dart';
|
import 'package:venera/utils/translations.dart';
|
||||||
import 'package:sqlite3/sqlite3.dart' as sql;
|
|
||||||
import 'dart:math';
|
|
||||||
|
|
||||||
import 'local_comics_page.dart';
|
import 'local_comics_page.dart';
|
||||||
|
|
||||||
@@ -502,6 +496,10 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
|
|||||||
|
|
||||||
String? selectedFolder;
|
String? selectedFolder;
|
||||||
|
|
||||||
|
bool copyToLocalFolder = true;
|
||||||
|
|
||||||
|
bool cancelled = false;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
loading = false;
|
loading = false;
|
||||||
@@ -551,6 +549,7 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
|
if(type != 3)
|
||||||
ListTile(
|
ListTile(
|
||||||
title: Text("Add to favorites".tl),
|
title: Text("Add to favorites".tl),
|
||||||
trailing: Select(
|
trailing: Select(
|
||||||
@@ -564,6 +563,16 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
).paddingHorizontal(8),
|
).paddingHorizontal(8),
|
||||||
|
if(!App.isIOS && !App.isMacOS)
|
||||||
|
CheckboxListTile(
|
||||||
|
enabled: true,
|
||||||
|
title: Text("Copy to app local path".tl),
|
||||||
|
value: copyToLocalFolder,
|
||||||
|
onChanged:(v) {
|
||||||
|
setState(() {
|
||||||
|
copyToLocalFolder = !copyToLocalFolder;
|
||||||
|
});
|
||||||
|
}).paddingHorizontal(8),
|
||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
Text(info).paddingHorizontal(24),
|
Text(info).paddingHorizontal(24),
|
||||||
],
|
],
|
||||||
@@ -624,323 +633,28 @@ class _ImportComicsWidgetState extends State<_ImportComicsWidget> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void selectAndImport() async {
|
void selectAndImport() async {
|
||||||
if (type == 2) {
|
|
||||||
var xFile = await selectFile(ext: ['cbz']);
|
|
||||||
var controller = showLoadingDialog(context, allowCancel: false);
|
|
||||||
try {
|
|
||||||
var cache = FilePath.join(App.cachePath, xFile?.name ?? 'temp.cbz');
|
|
||||||
await xFile!.saveTo(cache);
|
|
||||||
var comic = await CBZ.import(File(cache));
|
|
||||||
if (selectedFolder != null) {
|
|
||||||
LocalFavoritesManager().addComic(
|
|
||||||
selectedFolder!,
|
|
||||||
FavoriteItem(
|
|
||||||
id: comic.id,
|
|
||||||
name: comic.title,
|
|
||||||
coverPath: comic.cover,
|
|
||||||
author: comic.subtitle,
|
|
||||||
type: comic.comicType,
|
|
||||||
tags: comic.tags,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
await File(cache).deleteIgnoreError();
|
|
||||||
} catch (e, s) {
|
|
||||||
Log.error("Import Comic", e.toString(), s);
|
|
||||||
context.showMessage(message: e.toString());
|
|
||||||
}
|
|
||||||
controller.close();
|
|
||||||
return;
|
|
||||||
} else if (type == 3) {
|
|
||||||
var dbFile = await selectFile(ext: ['db']);
|
|
||||||
final picker = DirectoryPicker();
|
|
||||||
final comicSrc = await picker.pickDirectory();
|
|
||||||
if (dbFile == null || comicSrc == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool cancelled = false;
|
|
||||||
var controller = showLoadingDialog(context, onCancel: () { cancelled = true; });
|
|
||||||
|
|
||||||
try {
|
|
||||||
var cache = FilePath.join(App.cachePath, dbFile.name);
|
|
||||||
await dbFile.saveTo(cache);
|
|
||||||
var db = sql.sqlite3.open(cache);
|
|
||||||
|
|
||||||
Future<void> addTagComics(String destFolder, List<sql.Row> comics) async {
|
|
||||||
for(var comic in comics) {
|
|
||||||
if(cancelled) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var comicDir = Directory(FilePath.join(comicSrc.path, comic['DIRNAME'] as String));
|
|
||||||
if(!(await comicDir.exists())) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
String titleJP = comic['TITLE_JPN'] == null ? "" : comic['TITLE_JPN'] as String;
|
|
||||||
String title = titleJP == "" ? comic['TITLE'] as String : titleJP;
|
|
||||||
if (LocalManager().findByName(title) != null) {
|
|
||||||
Log.info("Import Comic", "Comic already exists: $title");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
String coverURL = await comicDir.joinFile(".thumb").exists() ?
|
|
||||||
comicDir.joinFile(".thumb").path :
|
|
||||||
(comic['THUMB'] as String).replaceAll('s.exhentai.org', 'ehgt.org');
|
|
||||||
int downloadedTimeStamp = comic['TIME'] as int;
|
|
||||||
DateTime downloadedTime =
|
|
||||||
downloadedTimeStamp != 0 ?
|
|
||||||
DateTime.fromMillisecondsSinceEpoch(downloadedTimeStamp) : DateTime.now();
|
|
||||||
var comicObj = LocalComic(
|
|
||||||
id: LocalManager().findValidId(ComicType.local),
|
|
||||||
title: title,
|
|
||||||
subtitle: '',
|
|
||||||
tags: [
|
|
||||||
//1 >> x
|
|
||||||
[
|
|
||||||
"MISC",
|
|
||||||
"DOUJINSHI",
|
|
||||||
"MANGA",
|
|
||||||
"ARTISTCG",
|
|
||||||
"GAMECG",
|
|
||||||
"IMAGE SET",
|
|
||||||
"COSPLAY",
|
|
||||||
"ASIAN PORN",
|
|
||||||
"NON-H",
|
|
||||||
"WESTERN",
|
|
||||||
][(log(comic['CATEGORY'] as int) / ln2).floor()]
|
|
||||||
],
|
|
||||||
directory: comicDir.path,
|
|
||||||
chapters: null,
|
|
||||||
cover: coverURL,
|
|
||||||
comicType: ComicType.local,
|
|
||||||
downloadedChapters: [],
|
|
||||||
createdAt: downloadedTime,
|
|
||||||
);
|
|
||||||
LocalManager().add(comicObj, comicObj.id);
|
|
||||||
LocalFavoritesManager().addComic(
|
|
||||||
destFolder,
|
|
||||||
FavoriteItem(
|
|
||||||
id: comicObj.id,
|
|
||||||
name: comicObj.title,
|
|
||||||
coverPath: comicObj.cover,
|
|
||||||
author: comicObj.subtitle,
|
|
||||||
type: comicObj.comicType,
|
|
||||||
tags: comicObj.tags,
|
|
||||||
favoriteTime: downloadedTime
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//default folder
|
|
||||||
{
|
|
||||||
var defaultFolderName = '(EhViewer)Default'.tl;
|
|
||||||
if(!LocalFavoritesManager().existsFolder(defaultFolderName)) {
|
|
||||||
LocalFavoritesManager().createFolder(defaultFolderName);
|
|
||||||
}
|
|
||||||
var comicList = db.select("""
|
|
||||||
SELECT *
|
|
||||||
FROM DOWNLOAD_DIRNAME DN
|
|
||||||
LEFT JOIN DOWNLOADS DL
|
|
||||||
ON DL.GID = DN.GID
|
|
||||||
WHERE DL.LABEL IS NULL AND DL.STATE = 3
|
|
||||||
ORDER BY DL.TIME DESC
|
|
||||||
""").toList();
|
|
||||||
await addTagComics(defaultFolderName, comicList);
|
|
||||||
}
|
|
||||||
|
|
||||||
var folders = db.select("""
|
|
||||||
SELECT * FROM DOWNLOAD_LABELS;
|
|
||||||
""");
|
|
||||||
|
|
||||||
for (var folder in folders) {
|
|
||||||
if(cancelled) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
var label = folder["LABEL"] as String;
|
|
||||||
var folderName = '(EhViewer)$label';
|
|
||||||
if(!LocalFavoritesManager().existsFolder(folderName)) {
|
|
||||||
LocalFavoritesManager().createFolder(folderName);
|
|
||||||
}
|
|
||||||
var comicList = db.select("""
|
|
||||||
SELECT *
|
|
||||||
FROM DOWNLOAD_DIRNAME DN
|
|
||||||
LEFT JOIN DOWNLOADS DL
|
|
||||||
ON DL.GID = DN.GID
|
|
||||||
WHERE DL.LABEL = ? AND DL.STATE = 3
|
|
||||||
ORDER BY DL.TIME DESC
|
|
||||||
""", [label]).toList();
|
|
||||||
await addTagComics(folderName, comicList);
|
|
||||||
}
|
|
||||||
db.dispose();
|
|
||||||
await File(cache).deleteIgnoreError();
|
|
||||||
} catch (e, s) {
|
|
||||||
Log.error("Import Comic", e.toString(), s);
|
|
||||||
context.showMessage(message: e.toString());
|
|
||||||
}
|
|
||||||
controller.close();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
height = key.currentContext!.size!.height;
|
height = key.currentContext!.size!.height;
|
||||||
|
|
||||||
setState(() {
|
setState(() {
|
||||||
loading = true;
|
loading = true;
|
||||||
});
|
});
|
||||||
final picker = DirectoryPicker();
|
var importer = ImportComic(
|
||||||
final path = await picker.pickDirectory();
|
selectedFolder: selectedFolder,
|
||||||
if (!loading) {
|
copyToLocal: copyToLocalFolder);
|
||||||
picker.dispose();
|
var result = switch(type) {
|
||||||
return;
|
0 => await importer.directory(true),
|
||||||
}
|
1 => await importer.directory(false),
|
||||||
if (path == null) {
|
2 => await importer.cbz(),
|
||||||
setState(() {
|
3 => await importer.ehViewer(),
|
||||||
loading = false;
|
int() => true,
|
||||||
});
|
};
|
||||||
return;
|
if(result) {
|
||||||
}
|
|
||||||
Map<Directory, LocalComic> comics = {};
|
|
||||||
if (type == 0) {
|
|
||||||
var result = await checkSingleComic(path);
|
|
||||||
if (result != null) {
|
|
||||||
comics[path] = result;
|
|
||||||
} else {
|
|
||||||
context.showMessage(message: "Invalid Comic".tl);
|
|
||||||
setState(() {
|
|
||||||
loading = false;
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
await for (var entry in path.list()) {
|
|
||||||
if (entry is Directory) {
|
|
||||||
var result = await checkSingleComic(entry);
|
|
||||||
if (result != null) {
|
|
||||||
comics[entry] = result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
bool shouldCopy = true;
|
|
||||||
for (var comic in comics.keys) {
|
|
||||||
if (comic.parent.path == LocalManager().path) {
|
|
||||||
shouldCopy = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (shouldCopy && comics.isNotEmpty) {
|
|
||||||
try {
|
|
||||||
// copy the comics to the local directory
|
|
||||||
await compute<Map<String, dynamic>, void>(_copyDirectories, {
|
|
||||||
'toBeCopied': comics.keys.map((e) => e.path).toList(),
|
|
||||||
'destination': LocalManager().path,
|
|
||||||
});
|
|
||||||
} catch (e) {
|
|
||||||
context.showMessage(message: "Failed to import comics".tl);
|
|
||||||
Log.error("Import Comic", e.toString());
|
|
||||||
setState(() {
|
|
||||||
loading = false;
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (var comic in comics.values) {
|
|
||||||
LocalManager().add(comic, LocalManager().findValidId(ComicType.local));
|
|
||||||
if (selectedFolder != null) {
|
|
||||||
LocalFavoritesManager().addComic(
|
|
||||||
selectedFolder!,
|
|
||||||
FavoriteItem(
|
|
||||||
id: comic.id,
|
|
||||||
name: comic.title,
|
|
||||||
coverPath: comic.cover,
|
|
||||||
author: comic.subtitle,
|
|
||||||
type: comic.comicType,
|
|
||||||
tags: comic.tags,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
context.pop();
|
context.pop();
|
||||||
context.showMessage(
|
} else {
|
||||||
message: "Imported @a comics".tlParams({
|
setState(() {
|
||||||
'a': comics.length,
|
loading = false;
|
||||||
}));
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
static _copyDirectories(Map<String, dynamic> data) {
|
|
||||||
var toBeCopied = data['toBeCopied'] as List<String>;
|
|
||||||
var destination = data['destination'] as String;
|
|
||||||
for (var dir in toBeCopied) {
|
|
||||||
var source = Directory(dir);
|
|
||||||
var dest = Directory("$destination/${source.name}");
|
|
||||||
if (dest.existsSync()) {
|
|
||||||
// The destination directory already exists, and it is not managed by the app.
|
|
||||||
// Rename the old directory to avoid conflicts.
|
|
||||||
Log.info("Import Comic",
|
|
||||||
"Directory already exists: ${source.name}\nRenaming the old directory.");
|
|
||||||
dest.rename(
|
|
||||||
findValidDirectoryName(dest.parent.path, "${dest.path}_old"));
|
|
||||||
}
|
|
||||||
dest.createSync();
|
|
||||||
copyDirectory(source, dest);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<LocalComic?> checkSingleComic(Directory directory) async {
|
|
||||||
if (!(await directory.exists())) return null;
|
|
||||||
var name = directory.name;
|
|
||||||
if (LocalManager().findByName(name) != null) {
|
|
||||||
Log.info("Import Comic", "Comic already exists: $name");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
bool hasChapters = false;
|
|
||||||
var chapters = <String>[];
|
|
||||||
var coverPath = ''; // relative path to the cover image
|
|
||||||
await for (var entry in directory.list()) {
|
|
||||||
if (entry is Directory) {
|
|
||||||
hasChapters = true;
|
|
||||||
chapters.add(entry.name);
|
|
||||||
await for (var file in entry.list()) {
|
|
||||||
if (file is Directory) {
|
|
||||||
Log.info("Import Comic",
|
|
||||||
"Invalid Chapter: ${entry.name}\nA directory is found in the chapter directory.");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (entry is File) {
|
|
||||||
if (entry.name.startsWith('cover')) {
|
|
||||||
coverPath = entry.name;
|
|
||||||
}
|
|
||||||
const imageExtensions = ['jpg', 'jpeg', 'png', 'webp', 'gif', 'jpe'];
|
|
||||||
if (!coverPath.startsWith('cover') &&
|
|
||||||
imageExtensions.contains(entry.extension)) {
|
|
||||||
coverPath = entry.name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
chapters.sort();
|
|
||||||
if (hasChapters && coverPath == '') {
|
|
||||||
// use the first image in the first chapter as the cover
|
|
||||||
var firstChapter = Directory('${directory.path}/${chapters.first}');
|
|
||||||
await for (var entry in firstChapter.list()) {
|
|
||||||
if (entry is File) {
|
|
||||||
coverPath = entry.name;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (coverPath == '') {
|
|
||||||
Log.info("Import Comic", "Invalid Comic: $name\nNo cover image found.");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return LocalComic(
|
|
||||||
id: '0',
|
|
||||||
title: name,
|
|
||||||
subtitle: '',
|
|
||||||
tags: [],
|
|
||||||
directory: directory.name,
|
|
||||||
chapters: hasChapters ? Map.fromIterables(chapters, chapters) : null,
|
|
||||||
cover: coverPath,
|
|
||||||
comicType: ComicType.local,
|
|
||||||
downloadedChapters: chapters,
|
|
||||||
createdAt: DateTime.now(),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -298,24 +298,16 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
|
|||||||
return StatefulBuilder(builder: (context, state) {
|
return StatefulBuilder(builder: (context, state) {
|
||||||
return ContentDialog(
|
return ContentDialog(
|
||||||
title: "Delete".tl,
|
title: "Delete".tl,
|
||||||
content: Column(
|
content: CheckboxListTile(
|
||||||
children: [
|
title:
|
||||||
Text("Delete selected comics?".tl)
|
Text("Also remove files on disk".tl),
|
||||||
.paddingVertical(8),
|
|
||||||
Transform.scale(
|
|
||||||
scale: 0.9,
|
|
||||||
child: CheckboxListTile(
|
|
||||||
title: Text(
|
|
||||||
"Also remove files on disk".tl),
|
|
||||||
value: removeComicFile,
|
value: removeComicFile,
|
||||||
onChanged: (v) {
|
onChanged: (v) {
|
||||||
state(() {
|
state(() {
|
||||||
removeComicFile =
|
removeComicFile = !removeComicFile;
|
||||||
!removeComicFile;
|
|
||||||
});
|
});
|
||||||
})),
|
},
|
||||||
],
|
),
|
||||||
).paddingHorizontal(16).paddingVertical(8),
|
|
||||||
actions: [
|
actions: [
|
||||||
FilledButton(
|
FilledButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
@@ -379,12 +371,12 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
|
|||||||
return PopScope(
|
return PopScope(
|
||||||
canPop: !multiSelectMode && !searchMode,
|
canPop: !multiSelectMode && !searchMode,
|
||||||
onPopInvokedWithResult: (didPop, result) {
|
onPopInvokedWithResult: (didPop, result) {
|
||||||
if(multiSelectMode) {
|
if (multiSelectMode) {
|
||||||
setState(() {
|
setState(() {
|
||||||
multiSelectMode = false;
|
multiSelectMode = false;
|
||||||
selectedComics.clear();
|
selectedComics.clear();
|
||||||
});
|
});
|
||||||
} else if(searchMode) {
|
} else if (searchMode) {
|
||||||
setState(() {
|
setState(() {
|
||||||
searchMode = false;
|
searchMode = false;
|
||||||
keyword = "";
|
keyword = "";
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:venera/foundation/appdata.dart';
|
||||||
import 'package:venera/pages/categories_page.dart';
|
import 'package:venera/pages/categories_page.dart';
|
||||||
import 'package:venera/pages/search_page.dart';
|
import 'package:venera/pages/search_page.dart';
|
||||||
import 'package:venera/pages/settings/settings_page.dart';
|
import 'package:venera/pages/settings/settings_page.dart';
|
||||||
@@ -6,6 +7,7 @@ import 'package:venera/utils/translations.dart';
|
|||||||
|
|
||||||
import '../components/components.dart';
|
import '../components/components.dart';
|
||||||
import '../foundation/app.dart';
|
import '../foundation/app.dart';
|
||||||
|
import 'comic_source_page.dart';
|
||||||
import 'explore_page.dart';
|
import 'explore_page.dart';
|
||||||
import 'favorites/favorites_page.dart';
|
import 'favorites/favorites_page.dart';
|
||||||
import 'home_page.dart';
|
import 'home_page.dart';
|
||||||
@@ -34,8 +36,25 @@ class _MainPageState extends State<MainPage> {
|
|||||||
_navigatorKey!.currentContext!.pop();
|
_navigatorKey!.currentContext!.pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void checkUpdates() async {
|
||||||
|
if (!appdata.settings['checkUpdateOnStart']) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var lastCheck = appdata.implicitData['lastCheckUpdate'] ?? 0;
|
||||||
|
var now = DateTime.now().millisecondsSinceEpoch;
|
||||||
|
if (now - lastCheck < 24 * 60 * 60 * 1000) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
appdata.implicitData['lastCheckUpdate'] = now;
|
||||||
|
appdata.writeImplicitData();
|
||||||
|
await Future.delayed(const Duration(milliseconds: 300));
|
||||||
|
await checkUpdateUi(false);
|
||||||
|
await ComicSourcePage.checkComicSourceUpdate(true);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
|
checkUpdates();
|
||||||
_observer = NaviObserver();
|
_observer = NaviObserver();
|
||||||
_navigatorKey = GlobalKey();
|
_navigatorKey = GlobalKey();
|
||||||
App.mainNavigatorKey = _navigatorKey;
|
App.mainNavigatorKey = _navigatorKey;
|
||||||
|
@@ -223,7 +223,7 @@ class _GalleryModeState extends State<_GalleryMode>
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void handleLongPressDown(Offset location) {
|
void handleLongPressDown(Offset location) {
|
||||||
if(!appdata.settings['enableLongPressToZoom']) {
|
if (!appdata.settings['enableLongPressToZoom']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var photoViewController = photoViewControllers[reader.page]!;
|
var photoViewController = photoViewControllers[reader.page]!;
|
||||||
@@ -237,7 +237,7 @@ class _GalleryModeState extends State<_GalleryMode>
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void handleLongPressUp(Offset location) {
|
void handleLongPressUp(Offset location) {
|
||||||
if(!appdata.settings['enableLongPressToZoom']) {
|
if (!appdata.settings['enableLongPressToZoom']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var photoViewController = photoViewControllers[reader.page]!;
|
var photoViewController = photoViewControllers[reader.page]!;
|
||||||
@@ -473,7 +473,9 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
|||||||
);
|
);
|
||||||
var width = MediaQuery.of(context).size.width;
|
var width = MediaQuery.of(context).size.width;
|
||||||
var height = MediaQuery.of(context).size.height;
|
var height = MediaQuery.of(context).size.height;
|
||||||
if(appdata.settings['limitImageWidth'] && width / height > 0.7) {
|
if (appdata.settings['limitImageWidth'] &&
|
||||||
|
width / height > 0.7 &&
|
||||||
|
reader.mode == ReaderMode.continuousTopToBottom) {
|
||||||
width = height * 0.7;
|
width = height * 0.7;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -521,7 +523,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void handleLongPressDown(Offset location) {
|
void handleLongPressDown(Offset location) {
|
||||||
if(!appdata.settings['enableLongPressToZoom']) {
|
if (!appdata.settings['enableLongPressToZoom']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
double target = photoViewController.getInitialScale!.call()! * 1.75;
|
double target = photoViewController.getInitialScale!.call()! * 1.75;
|
||||||
@@ -534,7 +536,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void handleLongPressUp(Offset location) {
|
void handleLongPressUp(Offset location) {
|
||||||
if(!appdata.settings['enableLongPressToZoom']) {
|
if (!appdata.settings['enableLongPressToZoom']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
double target = photoViewController.getInitialScale!.call()!;
|
double target = photoViewController.getInitialScale!.call()!;
|
||||||
@@ -602,7 +604,7 @@ ImageProvider _createImageProvider(int page, BuildContext context) {
|
|||||||
var reader = context.reader;
|
var reader = context.reader;
|
||||||
var imageKey = reader.images![page - 1];
|
var imageKey = reader.images![page - 1];
|
||||||
if (imageKey.startsWith('file://')) {
|
if (imageKey.startsWith('file://')) {
|
||||||
return FileImage(File(imageKey.replaceFirst("file://", '')));
|
return FileImage(openFilePlatform(imageKey.replaceFirst("file://", '')));
|
||||||
} else {
|
} else {
|
||||||
return ReaderImageProvider(
|
return ReaderImageProvider(
|
||||||
imageKey,
|
imageKey,
|
||||||
|
@@ -469,7 +469,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
|||||||
ImageProvider image;
|
ImageProvider image;
|
||||||
var imageKey = images[index];
|
var imageKey = images[index];
|
||||||
if (imageKey.startsWith('file://')) {
|
if (imageKey.startsWith('file://')) {
|
||||||
image = FileImage(File(imageKey.replaceFirst("file://", '')));
|
image = FileImage(openFilePlatform(imageKey.replaceFirst("file://", '')));
|
||||||
} else {
|
} else {
|
||||||
image = ReaderImageProvider(
|
image = ReaderImageProvider(
|
||||||
imageKey,
|
imageKey,
|
||||||
@@ -515,7 +515,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (imageKey.startsWith("file://")) {
|
if (imageKey.startsWith("file://")) {
|
||||||
return await File(imageKey.substring(7)).readAsBytes();
|
return await openFilePlatform(imageKey.substring(7)).readAsBytes();
|
||||||
} else {
|
} else {
|
||||||
return (await CacheManager().findCache(
|
return (await CacheManager().findCache(
|
||||||
"$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}"))!
|
"$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}"))!
|
||||||
|
@@ -86,6 +86,7 @@ Future<bool> checkUpdate() async {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true]) async {
|
Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true]) async {
|
||||||
|
try {
|
||||||
var value = await checkUpdate();
|
var value = await checkUpdate();
|
||||||
if (value) {
|
if (value) {
|
||||||
showDialog(
|
showDialog(
|
||||||
@@ -110,6 +111,9 @@ Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true]) async {
|
|||||||
} else if (showMessageIfNoUpdate) {
|
} else if (showMessageIfNoUpdate) {
|
||||||
App.rootContext.showMessage(message: "No new version available".tl);
|
App.rootContext.showMessage(message: "No new version available".tl);
|
||||||
}
|
}
|
||||||
|
} catch (e, s) {
|
||||||
|
Log.error("Check Update", e.toString(), s);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// return true if version1 > version2
|
/// return true if version1 > version2
|
||||||
|
@@ -38,6 +38,16 @@ class _LocalFavoritesSettingsState extends State<LocalFavoritesSettings> {
|
|||||||
for (var e in LocalFavoritesManager().folderNames) e: e
|
for (var e in LocalFavoritesManager().folderNames) e: e
|
||||||
},
|
},
|
||||||
).toSliver(),
|
).toSliver(),
|
||||||
|
_CallbackSetting(
|
||||||
|
title: "Delete all unavailable local favorite items".tl,
|
||||||
|
callback: () async {
|
||||||
|
var controller = showLoadingDialog(context);
|
||||||
|
var count = await LocalFavoritesManager().removeInvalid();
|
||||||
|
controller.close();
|
||||||
|
context.showMessage(message: "Deleted @a favorite items".tlParams({'a': count}));
|
||||||
|
},
|
||||||
|
actionTitle: 'Delete'.tl,
|
||||||
|
).toSliver(),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@@ -70,6 +70,8 @@ class AppWebview extends StatefulWidget {
|
|||||||
|
|
||||||
final bool singlePage;
|
final bool singlePage;
|
||||||
|
|
||||||
|
static WebViewEnvironment? webViewEnvironment;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<AppWebview> createState() => _AppWebviewState();
|
State<AppWebview> createState() => _AppWebviewState();
|
||||||
}
|
}
|
||||||
@@ -117,7 +119,50 @@ class _AppWebviewState extends State<AppWebview> {
|
|||||||
)
|
)
|
||||||
];
|
];
|
||||||
|
|
||||||
Widget body = InAppWebView(
|
Widget body = (App.isWindows && AppWebview.webViewEnvironment == null)
|
||||||
|
? FutureBuilder(
|
||||||
|
future: WebViewEnvironment.create(
|
||||||
|
settings: WebViewEnvironmentSettings(
|
||||||
|
userDataFolder: "${App.dataPath}\\webview",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
builder: (context, e) {
|
||||||
|
if(e.error != null) {
|
||||||
|
return Center(child: Text("Error: ${e.error}"));
|
||||||
|
}
|
||||||
|
if(e.data == null) {
|
||||||
|
return const Center(child: CircularProgressIndicator());
|
||||||
|
}
|
||||||
|
AppWebview.webViewEnvironment = e.data;
|
||||||
|
return createWebviewWithEnvironment(AppWebview.webViewEnvironment);
|
||||||
|
},
|
||||||
|
)
|
||||||
|
: createWebviewWithEnvironment(AppWebview.webViewEnvironment);
|
||||||
|
|
||||||
|
body = Stack(
|
||||||
|
children: [
|
||||||
|
Positioned.fill(child: body),
|
||||||
|
if (_progress < 1.0)
|
||||||
|
const Positioned.fill(
|
||||||
|
child: Center(child: CircularProgressIndicator()))
|
||||||
|
],
|
||||||
|
);
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
appBar: Appbar(
|
||||||
|
title: Text(
|
||||||
|
title,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
actions: actions,
|
||||||
|
),
|
||||||
|
body: body);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget createWebviewWithEnvironment(WebViewEnvironment? e) {
|
||||||
|
return InAppWebView(
|
||||||
|
webViewEnvironment: e,
|
||||||
initialSettings: InAppWebViewSettings(
|
initialSettings: InAppWebViewSettings(
|
||||||
isInspectable: true,
|
isInspectable: true,
|
||||||
),
|
),
|
||||||
@@ -155,26 +200,6 @@ class _AppWebviewState extends State<AppWebview> {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
body = Stack(
|
|
||||||
children: [
|
|
||||||
Positioned.fill(child: body),
|
|
||||||
if (_progress < 1.0)
|
|
||||||
const Positioned.fill(
|
|
||||||
child: Center(child: CircularProgressIndicator()))
|
|
||||||
],
|
|
||||||
);
|
|
||||||
|
|
||||||
return Scaffold(
|
|
||||||
appBar: Appbar(
|
|
||||||
title: Text(
|
|
||||||
title,
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
),
|
|
||||||
actions: actions,
|
|
||||||
),
|
|
||||||
body: body);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -86,6 +86,9 @@ abstract class CBZ {
|
|||||||
var ext = e.path.split('.').last;
|
var ext = e.path.split('.').last;
|
||||||
return !['jpg', 'jpeg', 'png', 'webp', 'gif', 'jpe'].contains(ext);
|
return !['jpg', 'jpeg', 'png', 'webp', 'gif', 'jpe'].contains(ext);
|
||||||
});
|
});
|
||||||
|
if(files.isEmpty) {
|
||||||
|
throw Exception('No images found in the archive');
|
||||||
|
}
|
||||||
files.sort((a, b) => a.path.compareTo(b.path));
|
files.sort((a, b) => a.path.compareTo(b.path));
|
||||||
var coverFile = files.firstWhereOrNull(
|
var coverFile = files.firstWhereOrNull(
|
||||||
(element) =>
|
(element) =>
|
||||||
@@ -108,7 +111,7 @@ abstract class CBZ {
|
|||||||
var src = files[i];
|
var src = files[i];
|
||||||
var dst = File(
|
var dst = File(
|
||||||
FilePath.join(dest.path, '${i + 1}.${src.path.split('.').last}'));
|
FilePath.join(dest.path, '${i + 1}.${src.path.split('.').last}'));
|
||||||
src.copy(dst.path);
|
await src.copy(dst.path);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
dest.createSync();
|
dest.createSync();
|
||||||
@@ -126,7 +129,7 @@ abstract class CBZ {
|
|||||||
var src = chapter.value[i];
|
var src = chapter.value[i];
|
||||||
var dst = File(FilePath.join(
|
var dst = File(FilePath.join(
|
||||||
chapterDir.path, '${i + 1}.${src.path.split('.').last}'));
|
chapterDir.path, '${i + 1}.${src.path.split('.').last}'));
|
||||||
src.copy(dst.path);
|
await src.copy(dst.path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -184,7 +187,7 @@ abstract class CBZ {
|
|||||||
}
|
}
|
||||||
int i = 1;
|
int i = 1;
|
||||||
for (var image in allImages) {
|
for (var image in allImages) {
|
||||||
var src = File(image.replaceFirst('file://', ''));
|
var src = openFilePlatform(image);
|
||||||
var width = allImages.length.toString().length;
|
var width = allImages.length.toString().length;
|
||||||
var dstName =
|
var dstName =
|
||||||
'${i.toString().padLeft(width, '0')}.${image.split('.').last}';
|
'${i.toString().padLeft(width, '0')}.${image.split('.').last}';
|
||||||
|
@@ -71,12 +71,14 @@ Future<void> importAppData(File file, [bool checkVersion = false]) async {
|
|||||||
LocalFavoritesManager().init();
|
LocalFavoritesManager().init();
|
||||||
}
|
}
|
||||||
if (await appdataFile.exists()) {
|
if (await appdataFile.exists()) {
|
||||||
// proxy settings should be kept
|
// proxy settings & authorization setting should be kept
|
||||||
var proxySettings = appdata.settings["proxy"];
|
var proxySettings = appdata.settings["proxy"];
|
||||||
|
var authSettings = appdata.settings["authorizationRequired"];
|
||||||
File(FilePath.join(App.dataPath, "appdata.json")).deleteIfExistsSync();
|
File(FilePath.join(App.dataPath, "appdata.json")).deleteIfExistsSync();
|
||||||
appdataFile.renameSync(FilePath.join(App.dataPath, "appdata.json"));
|
appdataFile.renameSync(FilePath.join(App.dataPath, "appdata.json"));
|
||||||
await appdata.init();
|
await appdata.init();
|
||||||
appdata.settings["proxy"] = proxySettings;
|
appdata.settings["proxy"] = proxySettings;
|
||||||
|
appdata.settings["authorizationRequired"] = authSettings;
|
||||||
appdata.saveData();
|
appdata.saveData();
|
||||||
}
|
}
|
||||||
if (await cookieFile.exists()) {
|
if (await cookieFile.exists()) {
|
||||||
|
@@ -10,8 +10,14 @@ class FileType {
|
|||||||
if(ext.startsWith('.')) {
|
if(ext.startsWith('.')) {
|
||||||
ext = ext.substring(1);
|
ext = ext.substring(1);
|
||||||
}
|
}
|
||||||
var mime = lookupMimeType('no-file.$ext');
|
var mime = lookupMimeType('no-file.$ext') ?? 'application/octet-stream';
|
||||||
return FileType(".$ext", mime ?? 'application/octet-stream');
|
// Android doesn't support some mime types
|
||||||
|
mime = switch(mime) {
|
||||||
|
'text/javascript' => 'application/javascript',
|
||||||
|
'application/x-cbr' => 'application/octet-stream',
|
||||||
|
_ => mime,
|
||||||
|
};
|
||||||
|
return FileType(".$ext", mime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
354
lib/utils/import_comic.dart
Normal file
354
lib/utils/import_comic.dart
Normal file
@@ -0,0 +1,354 @@
|
|||||||
|
import 'dart:math';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:venera/components/components.dart';
|
||||||
|
import 'package:venera/foundation/app.dart';
|
||||||
|
import 'package:venera/foundation/comic_type.dart';
|
||||||
|
import 'package:venera/foundation/favorites.dart';
|
||||||
|
import 'package:venera/foundation/local.dart';
|
||||||
|
import 'package:venera/foundation/log.dart';
|
||||||
|
import 'package:sqlite3/sqlite3.dart' as sql;
|
||||||
|
import 'package:venera/utils/ext.dart';
|
||||||
|
import 'package:venera/utils/translations.dart';
|
||||||
|
import 'cbz.dart';
|
||||||
|
import 'io.dart';
|
||||||
|
|
||||||
|
class ImportComic {
|
||||||
|
final String? selectedFolder;
|
||||||
|
final bool copyToLocal;
|
||||||
|
|
||||||
|
const ImportComic({this.selectedFolder, this.copyToLocal = true});
|
||||||
|
|
||||||
|
Future<bool> cbz() async {
|
||||||
|
var file = await selectFile(ext: ['cbz']);
|
||||||
|
Map<String?, List<LocalComic>> imported = {};
|
||||||
|
if(file == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
var controller = showLoadingDialog(App.rootContext, allowCancel: false);
|
||||||
|
try {
|
||||||
|
var comic = await CBZ.import(File(file.path));
|
||||||
|
imported[selectedFolder] = [comic];
|
||||||
|
} catch (e, s) {
|
||||||
|
Log.error("Import Comic", e.toString(), s);
|
||||||
|
App.rootContext.showMessage(message: e.toString());
|
||||||
|
}
|
||||||
|
controller.close();
|
||||||
|
return registerComics(imported, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool> ehViewer() async {
|
||||||
|
var dbFile = await selectFile(ext: ['db']);
|
||||||
|
final picker = DirectoryPicker();
|
||||||
|
final comicSrc = await picker.pickDirectory();
|
||||||
|
Map<String?, List<LocalComic>> imported = {};
|
||||||
|
if (dbFile == null || comicSrc == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool cancelled = false;
|
||||||
|
var controller = showLoadingDialog(App.rootContext, onCancel: () {
|
||||||
|
cancelled = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
var db = sql.sqlite3.open(dbFile.path);
|
||||||
|
|
||||||
|
Future<List<LocalComic>> validateComics(List<sql.Row> comics) async {
|
||||||
|
List<LocalComic> imported = [];
|
||||||
|
for (var comic in comics) {
|
||||||
|
if (cancelled) {
|
||||||
|
return imported;
|
||||||
|
}
|
||||||
|
var comicDir = openDirectoryPlatform(
|
||||||
|
FilePath.join(comicSrc.path, comic['DIRNAME'] as String));
|
||||||
|
String titleJP =
|
||||||
|
comic['TITLE_JPN'] == null ? "" : comic['TITLE_JPN'] as String;
|
||||||
|
String title = titleJP == "" ? comic['TITLE'] as String : titleJP;
|
||||||
|
int timeStamp = comic['TIME'] as int;
|
||||||
|
DateTime downloadTime = timeStamp != 0
|
||||||
|
? DateTime.fromMillisecondsSinceEpoch(timeStamp)
|
||||||
|
: DateTime.now();
|
||||||
|
var comicObj = await _checkSingleComic(comicDir,
|
||||||
|
title: title,
|
||||||
|
tags: [
|
||||||
|
//1 >> x
|
||||||
|
[
|
||||||
|
"MISC",
|
||||||
|
"DOUJINSHI",
|
||||||
|
"MANGA",
|
||||||
|
"ARTISTCG",
|
||||||
|
"GAMECG",
|
||||||
|
"IMAGE SET",
|
||||||
|
"COSPLAY",
|
||||||
|
"ASIAN PORN",
|
||||||
|
"NON-H",
|
||||||
|
"WESTERN",
|
||||||
|
][(log(comic['CATEGORY'] as int) / ln2).floor()]
|
||||||
|
],
|
||||||
|
createTime: downloadTime);
|
||||||
|
if (comicObj == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
imported.add(comicObj);
|
||||||
|
}
|
||||||
|
return imported;
|
||||||
|
}
|
||||||
|
|
||||||
|
var tags = <String>[""];
|
||||||
|
tags.addAll(db.select("""
|
||||||
|
SELECT * FROM DOWNLOAD_LABELS LB
|
||||||
|
ORDER BY LB.TIME DESC;
|
||||||
|
""").map((r) => r['LABEL'] as String).toList());
|
||||||
|
|
||||||
|
for (var tag in tags) {
|
||||||
|
if (cancelled) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
var folderName =
|
||||||
|
tag == '' ? '(EhViewer)Default'.tl : '(EhViewer)$tag';
|
||||||
|
var comicList = db.select("""
|
||||||
|
SELECT *
|
||||||
|
FROM DOWNLOAD_DIRNAME DN
|
||||||
|
LEFT JOIN DOWNLOADS DL
|
||||||
|
ON DL.GID = DN.GID
|
||||||
|
WHERE DL.LABEL ${tag == '' ? 'IS NULL' : '= \'$tag\''} AND DL.STATE = 3
|
||||||
|
ORDER BY DL.TIME DESC
|
||||||
|
""").toList();
|
||||||
|
|
||||||
|
var validComics = await validateComics(comicList);
|
||||||
|
imported[folderName] = validComics;
|
||||||
|
if (validComics.isNotEmpty &&
|
||||||
|
!LocalFavoritesManager().existsFolder(folderName)) {
|
||||||
|
LocalFavoritesManager().createFolder(folderName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
db.dispose();
|
||||||
|
|
||||||
|
//Android specific
|
||||||
|
var cache = FilePath.join(App.cachePath, dbFile.name);
|
||||||
|
await File(cache).deleteIgnoreError();
|
||||||
|
} catch (e, s) {
|
||||||
|
Log.error("Import Comic", e.toString(), s);
|
||||||
|
App.rootContext.showMessage(message: e.toString());
|
||||||
|
}
|
||||||
|
controller.close();
|
||||||
|
if(cancelled) return false;
|
||||||
|
return registerComics(imported, copyToLocal);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool> directory(bool single) async {
|
||||||
|
final picker = DirectoryPicker();
|
||||||
|
final path = await picker.pickDirectory();
|
||||||
|
if (path == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Map<String?, List<LocalComic>> imported = {selectedFolder: []};
|
||||||
|
try {
|
||||||
|
if (single) {
|
||||||
|
var result = await _checkSingleComic(path);
|
||||||
|
if (result != null) {
|
||||||
|
imported[selectedFolder]!.add(result);
|
||||||
|
} else {
|
||||||
|
App.rootContext.showMessage(message: "Invalid Comic".tl);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
await for (var entry in path.list()) {
|
||||||
|
if (entry is Directory) {
|
||||||
|
var result = await _checkSingleComic(entry);
|
||||||
|
if (result != null) {
|
||||||
|
imported[selectedFolder]!.add(result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e, s) {
|
||||||
|
Log.error("Import Comic", e.toString(), s);
|
||||||
|
App.rootContext.showMessage(message: e.toString());
|
||||||
|
}
|
||||||
|
return registerComics(imported, copyToLocal);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Automatically search for cover image and chapters
|
||||||
|
Future<LocalComic?> _checkSingleComic(Directory directory,
|
||||||
|
{String? id,
|
||||||
|
String? title,
|
||||||
|
String? subtitle,
|
||||||
|
List<String>? tags,
|
||||||
|
DateTime? createTime})
|
||||||
|
async {
|
||||||
|
if (!(await directory.exists())) return null;
|
||||||
|
var name = title ?? directory.name;
|
||||||
|
if (LocalManager().findByName(name) != null) {
|
||||||
|
Log.info("Import Comic", "Comic already exists: $name");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
bool hasChapters = false;
|
||||||
|
var chapters = <String>[];
|
||||||
|
var coverPath = ''; // relative path to the cover image
|
||||||
|
var fileList = <String>[];
|
||||||
|
await for (var entry in directory.list()) {
|
||||||
|
if (entry is Directory) {
|
||||||
|
hasChapters = true;
|
||||||
|
chapters.add(entry.name);
|
||||||
|
await for (var file in entry.list()) {
|
||||||
|
if (file is Directory) {
|
||||||
|
Log.info("Import Comic",
|
||||||
|
"Invalid Chapter: ${entry.name}\nA directory is found in the chapter directory.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (entry is File) {
|
||||||
|
const imageExtensions = ['jpg', 'jpeg', 'png', 'webp', 'gif', 'jpe'];
|
||||||
|
if (imageExtensions.contains(entry.extension)) {
|
||||||
|
fileList.add(entry.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(fileList.isEmpty) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
fileList.sort();
|
||||||
|
coverPath = fileList.firstWhereOrNull((l) => l.startsWith('cover')) ?? fileList.first;
|
||||||
|
|
||||||
|
chapters.sort();
|
||||||
|
if (hasChapters && coverPath == '') {
|
||||||
|
// use the first image in the first chapter as the cover
|
||||||
|
var firstChapter = openDirectoryPlatform('${directory.path}/${chapters.first}');
|
||||||
|
await for (var entry in firstChapter.list()) {
|
||||||
|
if (entry is File) {
|
||||||
|
coverPath = entry.name;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (coverPath == '') {
|
||||||
|
Log.info("Import Comic", "Invalid Comic: $name\nNo cover image found.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return LocalComic(
|
||||||
|
id: id ?? '0',
|
||||||
|
title: name,
|
||||||
|
subtitle: subtitle ?? '',
|
||||||
|
tags: tags ?? [],
|
||||||
|
directory: directory.path,
|
||||||
|
chapters: hasChapters ? Map.fromIterables(chapters, chapters) : null,
|
||||||
|
cover: coverPath,
|
||||||
|
comicType: ComicType.local,
|
||||||
|
downloadedChapters: chapters,
|
||||||
|
createdAt: createTime ?? DateTime.now(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<Map<String, String>> _copyDirectories(Map<String, dynamic> data) async {
|
||||||
|
var toBeCopied = data['toBeCopied'] as List<String>;
|
||||||
|
var destination = data['destination'] as String;
|
||||||
|
Map<String, String> result = {};
|
||||||
|
for (var dir in toBeCopied) {
|
||||||
|
var source = openDirectoryPlatform(dir);
|
||||||
|
var dest = openDirectoryPlatform("$destination/${source.name}");
|
||||||
|
if (dest.existsSync()) {
|
||||||
|
// The destination directory already exists, and it is not managed by the app.
|
||||||
|
// Rename the old directory to avoid conflicts.
|
||||||
|
Log.info("Import Comic",
|
||||||
|
"Directory already exists: ${source.name}\nRenaming the old directory.");
|
||||||
|
await dest.rename(
|
||||||
|
findValidDirectoryName(dest.parent.path, "${dest.path}_old"));
|
||||||
|
}
|
||||||
|
dest.createSync();
|
||||||
|
await copyDirectory(source, dest);
|
||||||
|
result[source.path] = dest.path;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Map<String?, List<LocalComic>>> _copyComicsToLocalDir(
|
||||||
|
Map<String?, List<LocalComic>> comics) async {
|
||||||
|
var destPath = LocalManager().path;
|
||||||
|
Map<String?, List<LocalComic>> result = {};
|
||||||
|
for (var favoriteFolder in comics.keys) {
|
||||||
|
result[favoriteFolder] = comics[favoriteFolder]!
|
||||||
|
.where((c) => c.directory.startsWith(destPath))
|
||||||
|
.toList();
|
||||||
|
comics[favoriteFolder]!
|
||||||
|
.removeWhere((c) => c.directory.startsWith(destPath));
|
||||||
|
|
||||||
|
if (comics[favoriteFolder]!.isEmpty) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// copy the comics to the local directory
|
||||||
|
var pathMap = await compute<Map<String, dynamic>, Map<String, String>>(
|
||||||
|
_copyDirectories, {
|
||||||
|
'toBeCopied': comics[favoriteFolder]!.map((e) => e.directory).toList(),
|
||||||
|
'destination': destPath,
|
||||||
|
});
|
||||||
|
//Construct a new object since LocalComic.directory is a final String
|
||||||
|
for (var c in comics[favoriteFolder]!) {
|
||||||
|
result[favoriteFolder]!.add(
|
||||||
|
LocalComic(
|
||||||
|
id: c.id,
|
||||||
|
title: c.title,
|
||||||
|
subtitle: c.subtitle,
|
||||||
|
tags: c.tags,
|
||||||
|
directory: pathMap[c.directory]!,
|
||||||
|
chapters: c.chapters,
|
||||||
|
cover: c.cover,
|
||||||
|
comicType: c.comicType,
|
||||||
|
downloadedChapters: c.downloadedChapters,
|
||||||
|
createdAt: c.createdAt
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
App.rootContext.showMessage(message: "Failed to copy comics".tl);
|
||||||
|
Log.error("Import Comic", e.toString());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool> registerComics(Map<String?, List<LocalComic>> importedComics, bool copy) async {
|
||||||
|
try {
|
||||||
|
if (copy) {
|
||||||
|
importedComics = await _copyComicsToLocalDir(importedComics);
|
||||||
|
}
|
||||||
|
int importedCount = 0;
|
||||||
|
for (var folder in importedComics.keys) {
|
||||||
|
for (var comic in importedComics[folder]!) {
|
||||||
|
var id = LocalManager().findValidId(ComicType.local);
|
||||||
|
LocalManager().add(comic, id);
|
||||||
|
importedCount++;
|
||||||
|
if (folder != null) {
|
||||||
|
LocalFavoritesManager().addComic(
|
||||||
|
folder,
|
||||||
|
FavoriteItem(
|
||||||
|
id: id,
|
||||||
|
name: comic.title,
|
||||||
|
coverPath: comic.cover,
|
||||||
|
author: comic.subtitle,
|
||||||
|
type: comic.comicType,
|
||||||
|
tags: comic.tags,
|
||||||
|
favoriteTime: comic.createdAt
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
App.rootContext.showMessage(
|
||||||
|
message: "Imported @a comics".tlParams({
|
||||||
|
'a': importedCount,
|
||||||
|
}));
|
||||||
|
} catch(e) {
|
||||||
|
App.rootContext.showMessage(message: "Failed to register comics".tl);
|
||||||
|
Log.error("Import Comic", e.toString());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
@@ -4,6 +4,7 @@ import 'dart:isolate';
|
|||||||
|
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_file_dialog/flutter_file_dialog.dart';
|
import 'package:flutter_file_dialog/flutter_file_dialog.dart';
|
||||||
|
import 'package:flutter_saf/flutter_saf.dart';
|
||||||
import 'package:venera/foundation/app.dart';
|
import 'package:venera/foundation/app.dart';
|
||||||
import 'package:venera/utils/ext.dart';
|
import 'package:venera/utils/ext.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
@@ -14,6 +15,16 @@ import 'package:venera/utils/file_type.dart';
|
|||||||
export 'dart:io';
|
export 'dart:io';
|
||||||
export 'dart:typed_data';
|
export 'dart:typed_data';
|
||||||
|
|
||||||
|
class IO {
|
||||||
|
/// A global flag used to indicate whether the app is selecting files.
|
||||||
|
///
|
||||||
|
/// Select file and other similar file operations will launch external programs,
|
||||||
|
/// causing the app to lose focus. AppLifecycleState will be set to paused.
|
||||||
|
static bool get isSelectingFiles => _isSelectingFiles;
|
||||||
|
|
||||||
|
static bool _isSelectingFiles = false;
|
||||||
|
}
|
||||||
|
|
||||||
class FilePath {
|
class FilePath {
|
||||||
const FilePath._();
|
const FilePath._();
|
||||||
|
|
||||||
@@ -70,7 +81,7 @@ extension DirectoryExtension on Directory {
|
|||||||
int total = 0;
|
int total = 0;
|
||||||
for (var f in listSync(recursive: true)) {
|
for (var f in listSync(recursive: true)) {
|
||||||
if (FileSystemEntity.typeSync(f.path) == FileSystemEntityType.file) {
|
if (FileSystemEntity.typeSync(f.path) == FileSystemEntityType.file) {
|
||||||
total += await File(f.path).length();
|
total += await openFilePlatform(f.path).length();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return total;
|
return total;
|
||||||
@@ -82,7 +93,7 @@ extension DirectoryExtension on Directory {
|
|||||||
}
|
}
|
||||||
|
|
||||||
File joinFile(String name) {
|
File joinFile(String name) {
|
||||||
return File(FilePath.join(path, name));
|
return openFilePlatform(FilePath.join(path, name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +131,7 @@ Future<void> copyDirectory(Directory source, Directory destination) async {
|
|||||||
if (content is File) {
|
if (content is File) {
|
||||||
content.copySync(newPath);
|
content.copySync(newPath);
|
||||||
} else if (content is Directory) {
|
} else if (content is Directory) {
|
||||||
Directory newDirectory = Directory(newPath);
|
Directory newDirectory = openDirectoryPlatform(newPath);
|
||||||
newDirectory.createSync();
|
newDirectory.createSync();
|
||||||
copyDirectory(content.absolute, newDirectory.absolute);
|
copyDirectory(content.absolute, newDirectory.absolute);
|
||||||
}
|
}
|
||||||
@@ -136,47 +147,52 @@ Future<void> copyDirectoryIsolate(
|
|||||||
|
|
||||||
String findValidDirectoryName(String path, String directory) {
|
String findValidDirectoryName(String path, String directory) {
|
||||||
var name = sanitizeFileName(directory);
|
var name = sanitizeFileName(directory);
|
||||||
var dir = Directory("$path/$name");
|
var dir = openDirectoryPlatform("$path/$name");
|
||||||
var i = 1;
|
var i = 1;
|
||||||
while (dir.existsSync() && dir.listSync().isNotEmpty) {
|
while (dir.existsSync() && dir.listSync().isNotEmpty) {
|
||||||
name = sanitizeFileName("$directory($i)");
|
name = sanitizeFileName("$directory($i)");
|
||||||
dir = Directory("$path/$name");
|
dir = openDirectoryPlatform("$path/$name");
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
class DirectoryPicker {
|
class DirectoryPicker {
|
||||||
String? _directory;
|
/// Pick a directory.
|
||||||
|
///
|
||||||
|
/// The directory may not be usable after the instance is GCed.
|
||||||
|
DirectoryPicker();
|
||||||
|
|
||||||
final _methodChannel = const MethodChannel("venera/method_channel");
|
static final _finalizer = Finalizer<String>((path) {
|
||||||
|
if (path.startsWith(App.cachePath)) {
|
||||||
Future<Directory?> pickDirectory() async {
|
Directory(path).deleteIgnoreError();
|
||||||
if (App.isWindows || App.isLinux) {
|
|
||||||
var d = await file_selector.getDirectoryPath();
|
|
||||||
_directory = d;
|
|
||||||
return d == null ? null : Directory(d);
|
|
||||||
} else if (App.isAndroid) {
|
|
||||||
var d = await _methodChannel.invokeMethod<String?>("getDirectoryPath");
|
|
||||||
_directory = d;
|
|
||||||
return d == null ? null : Directory(d);
|
|
||||||
} else {
|
|
||||||
// ios, macos
|
|
||||||
var d = await _methodChannel.invokeMethod<String?>("getDirectoryPath");
|
|
||||||
_directory = d;
|
|
||||||
return d == null ? null : Directory(d);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> dispose() async {
|
|
||||||
if (_directory == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (App.isAndroid && _directory != null) {
|
|
||||||
return Directory(_directory!).deleteIgnoreError(recursive: true);
|
|
||||||
}
|
}
|
||||||
if (App.isIOS || App.isMacOS) {
|
if (App.isIOS || App.isMacOS) {
|
||||||
await _methodChannel.invokeMethod("stopAccessingSecurityScopedResource");
|
_methodChannel.invokeMethod("stopAccessingSecurityScopedResource");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
static const _methodChannel = MethodChannel("venera/method_channel");
|
||||||
|
|
||||||
|
Future<Directory?> pickDirectory() async {
|
||||||
|
IO._isSelectingFiles = true;
|
||||||
|
try {
|
||||||
|
String? directory;
|
||||||
|
if (App.isWindows || App.isLinux) {
|
||||||
|
directory = await file_selector.getDirectoryPath();
|
||||||
|
} else if (App.isAndroid) {
|
||||||
|
directory = (await AndroidDirectory.pickDirectory())?.path;
|
||||||
|
} else {
|
||||||
|
// ios, macos
|
||||||
|
directory = await _methodChannel.invokeMethod<String?>("getDirectoryPath");
|
||||||
|
}
|
||||||
|
if (directory == null) return null;
|
||||||
|
_finalizer.attach(this, directory);
|
||||||
|
return openDirectoryPlatform(directory);
|
||||||
|
} finally {
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
IO._isSelectingFiles = false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -186,53 +202,74 @@ class IOSDirectoryPicker {
|
|||||||
|
|
||||||
// 调用 iOS 目录选择方法
|
// 调用 iOS 目录选择方法
|
||||||
static Future<String?> selectDirectory() async {
|
static Future<String?> selectDirectory() async {
|
||||||
|
IO._isSelectingFiles = true;
|
||||||
try {
|
try {
|
||||||
final String? path = await _channel.invokeMethod('selectDirectory');
|
final String? path = await _channel.invokeMethod('selectDirectory');
|
||||||
return path;
|
return path;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// 返回报错信息
|
// 返回报错信息
|
||||||
return e.toString();
|
return e.toString();
|
||||||
|
} finally {
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
IO._isSelectingFiles = false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<file_selector.XFile?> selectFile({required List<String> ext}) async {
|
Future<FileSelectResult?> selectFile({required List<String> ext}) async {
|
||||||
|
IO._isSelectingFiles = true;
|
||||||
|
try {
|
||||||
var extensions = App.isMacOS || App.isIOS ? null : ext;
|
var extensions = App.isMacOS || App.isIOS ? null : ext;
|
||||||
if (App.isAndroid) {
|
|
||||||
for (var e in ext) {
|
|
||||||
var fileType = FileType.fromExtension(e);
|
|
||||||
if (fileType.mime == "application/octet-stream") {
|
|
||||||
extensions = null;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
file_selector.XTypeGroup typeGroup = file_selector.XTypeGroup(
|
file_selector.XTypeGroup typeGroup = file_selector.XTypeGroup(
|
||||||
label: 'files',
|
label: 'files',
|
||||||
extensions: extensions,
|
extensions: extensions,
|
||||||
);
|
);
|
||||||
file_selector.XFile? file;
|
FileSelectResult? file;
|
||||||
if (extensions == null && App.isAndroid) {
|
if (App.isAndroid) {
|
||||||
const selectFileChannel = MethodChannel("venera/select_file");
|
const selectFileChannel = MethodChannel("venera/select_file");
|
||||||
var filePath = await selectFileChannel.invokeMethod("selectFile");
|
String mimeType = "*/*";
|
||||||
|
if (ext.length == 1) {
|
||||||
|
mimeType = FileType.fromExtension(ext[0]).mime;
|
||||||
|
if (mimeType == "application/octet-stream") {
|
||||||
|
mimeType = "*/*";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var filePath = await selectFileChannel.invokeMethod(
|
||||||
|
"selectFile",
|
||||||
|
mimeType,
|
||||||
|
);
|
||||||
if (filePath == null) return null;
|
if (filePath == null) return null;
|
||||||
file = file_selector.XFile(filePath);
|
file = FileSelectResult(filePath);
|
||||||
} else {
|
} else {
|
||||||
file = await file_selector.openFile(
|
var xFile = await file_selector.openFile(
|
||||||
acceptedTypeGroups: <file_selector.XTypeGroup>[typeGroup],
|
acceptedTypeGroups: <file_selector.XTypeGroup>[typeGroup],
|
||||||
);
|
);
|
||||||
if (file == null) return null;
|
if (xFile == null) return null;
|
||||||
|
file = FileSelectResult(xFile.path);
|
||||||
}
|
}
|
||||||
if (!ext.contains(file.path.split(".").last)) {
|
if (!ext.contains(file.path.split(".").last)) {
|
||||||
App.rootContext.showMessage(message: "Invalid file type");
|
App.rootContext.showMessage(message: "Invalid file type");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return file;
|
return file;
|
||||||
|
} finally {
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
IO._isSelectingFiles = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<String?> selectDirectory() async {
|
Future<String?> selectDirectory() async {
|
||||||
|
IO._isSelectingFiles = true;
|
||||||
|
try {
|
||||||
var path = await file_selector.getDirectoryPath();
|
var path = await file_selector.getDirectoryPath();
|
||||||
return path;
|
return path;
|
||||||
|
} finally {
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
IO._isSelectingFiles = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// selectDirectoryIOS
|
// selectDirectoryIOS
|
||||||
@@ -245,6 +282,8 @@ Future<void> saveFile(
|
|||||||
if (data == null && file == null) {
|
if (data == null && file == null) {
|
||||||
throw Exception("data and file cannot be null at the same time");
|
throw Exception("data and file cannot be null at the same time");
|
||||||
}
|
}
|
||||||
|
IO._isSelectingFiles = true;
|
||||||
|
try {
|
||||||
if (data != null) {
|
if (data != null) {
|
||||||
var cache = FilePath.join(App.cachePath, filename);
|
var cache = FilePath.join(App.cachePath, filename);
|
||||||
if (File(cache).existsSync()) {
|
if (File(cache).existsSync()) {
|
||||||
@@ -265,6 +304,38 @@ Future<void> saveFile(
|
|||||||
await xFile.saveTo(result.path);
|
await xFile.saveTo(result.path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
IO._isSelectingFiles = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Directory openDirectoryPlatform(String path) {
|
||||||
|
if(App.isAndroid) {
|
||||||
|
var dir = AndroidDirectory.fromPathSync(path);
|
||||||
|
if(dir == null) {
|
||||||
|
return Directory(path);
|
||||||
|
}
|
||||||
|
return dir;
|
||||||
|
} else {
|
||||||
|
return Directory(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
File openFilePlatform(String path) {
|
||||||
|
if(path.startsWith("file://")) {
|
||||||
|
path = path.substring(7);
|
||||||
|
}
|
||||||
|
if(App.isAndroid) {
|
||||||
|
var f = AndroidFile.fromPathSync(path);
|
||||||
|
if(f == null) {
|
||||||
|
return File(path);
|
||||||
|
}
|
||||||
|
return f;
|
||||||
|
} else {
|
||||||
|
return File(path);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class Share {
|
class Share {
|
||||||
@@ -302,3 +373,27 @@ String bytesToReadableString(int bytes) {
|
|||||||
return "${(bytes / 1024 / 1024 / 1024).toStringAsFixed(2)} GB";
|
return "${(bytes / 1024 / 1024 / 1024).toStringAsFixed(2)} GB";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class FileSelectResult {
|
||||||
|
final String path;
|
||||||
|
|
||||||
|
static final _finalizer = Finalizer<String>((path) {
|
||||||
|
if (path.startsWith(App.cachePath)) {
|
||||||
|
File(path).deleteIgnoreError();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
FileSelectResult(this.path) {
|
||||||
|
_finalizer.attach(this, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> saveTo(String path) async {
|
||||||
|
await File(this.path).copy(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Uint8List> readAsBytes() {
|
||||||
|
return File(path).readAsBytes();
|
||||||
|
}
|
||||||
|
|
||||||
|
String get name => File(path).name;
|
||||||
|
}
|
21
pubspec.lock
21
pubspec.lock
@@ -389,6 +389,15 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.5.1"
|
version: "2.5.1"
|
||||||
|
flutter_saf:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
path: "."
|
||||||
|
ref: "829a566b738a26ea98e523807f49838e21308543"
|
||||||
|
resolved-ref: "829a566b738a26ea98e523807f49838e21308543"
|
||||||
|
url: "https://github.com/pkuislm/flutter_saf.git"
|
||||||
|
source: git
|
||||||
|
version: "0.0.1"
|
||||||
flutter_test:
|
flutter_test:
|
||||||
dependency: "direct dev"
|
dependency: "direct dev"
|
||||||
description: flutter
|
description: flutter
|
||||||
@@ -597,10 +606,10 @@ packages:
|
|||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: mime
|
name: mime
|
||||||
sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
|
sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.6"
|
version: "2.0.0"
|
||||||
mime_type:
|
mime_type:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -767,18 +776,18 @@ packages:
|
|||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: share_plus
|
name: share_plus
|
||||||
sha256: "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52"
|
sha256: "9c9bafd4060728d7cdb2464c341743adbd79d327cb067ec7afb64583540b47c8"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "10.0.2"
|
version: "10.1.2"
|
||||||
share_plus_platform_interface:
|
share_plus_platform_interface:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: share_plus_platform_interface
|
name: share_plus_platform_interface
|
||||||
sha256: "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5"
|
sha256: c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "5.0.0"
|
version: "5.0.1"
|
||||||
sky_engine:
|
sky_engine:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description: flutter
|
description: flutter
|
||||||
|
@@ -2,7 +2,7 @@ name: venera
|
|||||||
description: "A comic app."
|
description: "A comic app."
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
|
|
||||||
version: 1.0.6+106
|
version: 1.0.7+107
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.5.0 <4.0.0'
|
sdk: '>=3.5.0 <4.0.0'
|
||||||
@@ -32,7 +32,7 @@ dependencies:
|
|||||||
git:
|
git:
|
||||||
url: https://github.com/wgh136/photo_view
|
url: https://github.com/wgh136/photo_view
|
||||||
ref: 94724a0b
|
ref: 94724a0b
|
||||||
mime: ^1.0.5
|
mime: ^2.0.0
|
||||||
share_plus: ^10.0.2
|
share_plus: ^10.0.2
|
||||||
scrollable_positioned_list:
|
scrollable_positioned_list:
|
||||||
git:
|
git:
|
||||||
@@ -65,6 +65,10 @@ dependencies:
|
|||||||
ref: 285f87f15bccd2d5d5ff443761348c6ee47b98d1
|
ref: 285f87f15bccd2d5d5ff443761348c6ee47b98d1
|
||||||
battery_plus: ^6.2.0
|
battery_plus: ^6.2.0
|
||||||
local_auth: ^2.3.0
|
local_auth: ^2.3.0
|
||||||
|
flutter_saf:
|
||||||
|
git:
|
||||||
|
url: https://github.com/pkuislm/flutter_saf.git
|
||||||
|
ref: dd5242918da0ea9a0a50b0f87ade7a2def65453d
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
1
windows/.gitignore
vendored
1
windows/.gitignore
vendored
@@ -15,3 +15,4 @@ x86/
|
|||||||
*.[Cc]ache
|
*.[Cc]ache
|
||||||
# but keep track of directories ending in .cache
|
# but keep track of directories ending in .cache
|
||||||
!*.[Cc]ache/
|
!*.[Cc]ache/
|
||||||
|
/ChineseSimplified.isl
|
||||||
|
Reference in New Issue
Block a user