diff --git a/.github/workflows/reader.yml b/.github/workflows/reader.yml
index 6918c10..d204b4d 100644
--- a/.github/workflows/reader.yml
+++ b/.github/workflows/reader.yml
@@ -4,6 +4,7 @@ on:
push:
branches:
- master
+ - dev
jobs:
build:
diff --git a/.gitignore b/.gitignore
index 9ab3b92..ba63cba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
*.iml
.gradle
/local.properties
@@ -8,8 +7,7 @@
/build
/captures
.externalNativeBuild
-=======
->>>>>>> eee131cea39d27218fc7d1c3d641d617d377af42
+keystore
# Compiled class file
*.class
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index 471bf10..0000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7643783
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+ ^$
+
+
+
+
+
+
+
+
+ style
+ ^$
+
+
+
+
+
+
+
+
+ .*
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
\ No newline at end of file
diff --git a/.idea/copyright/FYReader.xml b/.idea/copyright/FYReader.xml
new file mode 100644
index 0000000..991492f
--- /dev/null
+++ b/.idea/copyright/FYReader.xml
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..0d789ef
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dictionaries/fengyue.xml b/.idea/dictionaries/fengyue.xml
deleted file mode 100644
index 58d8886..0000000
--- a/.idea/dictionaries/fengyue.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index eb20a8e..ab232b8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,11 +7,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index eb2873e..b526bd5 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a92f8ed..bba6cb8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,62 +3,22 @@
-
-
-
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ba83cda..35e7452 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,6 +5,7 @@
\ No newline at end of file
diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml
new file mode 100644
index 0000000..fe25d78
--- /dev/null
+++ b/.idea/render.experimental.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/DialogX/build.gradle b/DialogX/build.gradle
index 00eaade..5da6ecc 100644
--- a/DialogX/build.gradle
+++ b/DialogX/build.gradle
@@ -1,8 +1,24 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see
diff --git a/DialogX/src/main/java/com/kongzue/dialogx/DialogX.java b/DialogX/src/main/java/com/kongzue/dialogx/DialogX.java
index f079471..d6aef4d 100644
--- a/DialogX/src/main/java/com/kongzue/dialogx/DialogX.java
+++ b/DialogX/src/main/java/com/kongzue/dialogx/DialogX.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DialogX/src/main/res/drawable/button_dialogx_material_night.xml b/DialogX/src/main/res/drawable/button_dialogx_material_night.xml
index e2f8fb7..2b0a822 100644
--- a/DialogX/src/main/res/drawable/button_dialogx_material_night.xml
+++ b/DialogX/src/main/res/drawable/button_dialogx_material_night.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/button_dialogx_miui_gray.xml b/DialogX/src/main/res/drawable/button_dialogx_miui_gray.xml
index 30fec5e..832e786 100644
--- a/DialogX/src/main/res/drawable/button_dialogx_miui_gray.xml
+++ b/DialogX/src/main/res/drawable/button_dialogx_miui_gray.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_night.xml
index b14a6a7..8a2c14c 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_night.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_material_bottom_bkg_night.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_material_button_light_forword.xml b/DialogX/src/main/res/drawable/rect_dialogx_material_button_light_forword.xml
index 261c420..f527725 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_material_button_light_forword.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_material_button_light_forword.xml
@@ -1,4 +1,22 @@
+
+
-
+
+
-
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_material_poptip_bkg_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_material_poptip_bkg_night.xml
index e367970..56125a1 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_material_poptip_bkg_night.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_material_poptip_bkg_night.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_light.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_light.xml
index cbfdb50..fa534e6 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_light.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_light.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_night.xml
index 34584b3..990da9e 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_night.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_bkg_night.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal.xml
index 9516c1f..0dcea10 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal_night.xml
index 3689f9a..f2184bb 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal_night.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_normal_night.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press.xml
index 20fd79f..6cd7c5c 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press_night.xml b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press_night.xml
index fac0a17..6b18812 100644
--- a/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press_night.xml
+++ b/DialogX/src/main/res/drawable/rect_dialogx_miui_button_gray_press_night.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/DialogX/src/main/res/layout/item_dialogx_material_bottom_menu_normal_text.xml b/DialogX/src/main/res/layout/item_dialogx_material_bottom_menu_normal_text.xml
index 70a7bb9..8059d1c 100644
--- a/DialogX/src/main/res/layout/item_dialogx_material_bottom_menu_normal_text.xml
+++ b/DialogX/src/main/res/layout/item_dialogx_material_bottom_menu_normal_text.xml
@@ -1,3 +1,21 @@
+
+
diff --git a/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml b/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml
index e5613a4..e0cb5f1 100644
--- a/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml
+++ b/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml
@@ -1,4 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DialogX/src/main/res/values/colors.xml b/DialogX/src/main/res/values/colors.xml
index f4a3882..78da168 100644
--- a/DialogX/src/main/res/values/colors.xml
+++ b/DialogX/src/main/res/values/colors.xml
@@ -1,4 +1,22 @@
+
+
#2196F3
diff --git a/DialogX/src/main/res/values/styles.xml b/DialogX/src/main/res/values/styles.xml
index a70d270..661ee75 100644
--- a/DialogX/src/main/res/values/styles.xml
+++ b/DialogX/src/main/res/values/styles.xml
@@ -1,4 +1,22 @@
+
+
diff --git a/README.md b/README.md
index 1e7f73b..a74b372 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,10 @@
@@ -62,9 +62,9 @@
-
@@ -74,21 +74,21 @@
-
-
-
diff --git a/app/build.gradle b/app/build.gradle
index 98d12d4..0d6d0ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,31 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see
+
+ 风月读书APP隐私政策
风月读书APP隐私政策
diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
index 33539ec..f399522 100644
--- a/app/src/main/assets/updatelog.fy
+++ b/app/src/main/assets/updatelog.fy
@@ -1,3 +1,86 @@
+风月读书v2.4.5
+更新内容：
+1、修复书籍无法导出缓存的问题
+
+2022.04.24
+风月读书v2.4.4
+更新内容：
+1、修复软件无法打开的问题(超时时间为5s)
+2、修复DIY书源重复显示订阅书源的问题
+3、优化动态插件加载
+
+2022.03.29
+风月读书v2.4.3
+更新内容：
+1、修复存在同名章节时后面章节内容加载前面章节的问题
+2、修复启动页面加载超时的问题
+3、新增动态插件
+
+2022.03.25
+风月读书v2.4.2
+更新内容：
+1、修复代理问题
+2、修复书源debug闪退问题
+3、修复日志无法上传问题
+4、修改部分URL
+
+2022.03.24
+风月读书v2.4.1
+更新内容：
+1、新增软件代理设置
+2、新增设置切换动画
+3、订阅书源支持编辑
+4、书源订阅支持备份\恢复
+5、修复已知bug
+6、用户中心新增免广告服务
+注：兑换码获取途径：1、从4月份开始，每月将在QQ频道发放(当月有效)；2、反馈bug\提出有效建议；3、捐赠获取(带截图私聊作者，之前捐赠的用户也一样)
+
+2022.03.04
+风月读书v2.4.0-beta
+更新内容：
+1、新增用户中心
+2、修复v2.3.9版本搜索界面书源分组显示错位的问题
+
+2022.03.03
+风月读书v2.3.9-beta
+更新内容：
+1、新增书源订阅功能，移除内置书源，原内置书源界面改为订阅书源(订阅书源全部搜集自网络，每月更新)
+2、新增去除广告功能
+3、设置新增我的界面显示方式
+4、修复已知bug
+注：此为beta版本，可能存在未知bug
+
+2022.02.23
+风月读书v2.3.8
+更新内容：
+1、部分设备兼容性适配
+2、尝试解决搜索卡死的问题
+3、修复部分已知bug
+
+2022.02.17
+风月读书v2.3.7
+更新内容：
+1、新增邮箱登录
+2、新增开屏广告
+3、支持作者界面新增广告支持作者
+注：由于广告投放次数的需要，此次更新为强制更新
+
+2022.02.07
+风月读书v2.3.6
+更新内容：
+1、修复第三方书源书籍更新后未读章节提示不高亮的问题
+2、修复日夜间切换闪退bug
+3、修复部分发现无法加载下一页的问题
+4、新增应用崩溃记录界面
+5、书源网络支持蓝奏云文件链接(如有密码，用逗号隔开)
+
+2022.01.21
+风月读书v2.3.4
+更新内容:
+1、兼容第三方书源3.0版本(注意：需要重新导入书源)
+2、修复已知bug
+3、优化部分功能
+
2022.01.17
风月读书v2.3.2
更新内容：
diff --git a/app/src/main/java/xyz/fycz/myreader/ActivityManage.java b/app/src/main/java/xyz/fycz/myreader/ActivityManage.java
index cbfd3f9..2553d8c 100644
--- a/app/src/main/java/xyz/fycz/myreader/ActivityManage.java
+++ b/app/src/main/java/xyz/fycz/myreader/ActivityManage.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see activities = new ArrayList<>();
+ public static int mResumeActivityCount = 0;
+
public static void addActivity(AppCompatActivity activity){
activities.add(activity);
}
diff --git a/app/src/main/java/xyz/fycz/myreader/application/App.java b/app/src/main/java/xyz/fycz/myreader/application/App.java
index c033b7c..099676c 100644
--- a/app/src/main/java/xyz/fycz/myreader/application/App.java
+++ b/app/src/main/java/xyz/fycz/myreader/application/App.java
@@ -1,7 +1,24 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see sources = BookSourceManager.getAllLocalSource();
+ for (BookSource source : sources){
+ source.setEnable(false);
+ }
+ BookSourceManager.addBookSource(sources);
}
setting.setSourceVersion(APPCONST.SOURCE_VERSION);
saveSetting(setting);
diff --git a/app/src/main/java/xyz/fycz/myreader/base/BaseActivity.java b/app/src/main/java/xyz/fycz/myreader/base/BaseActivity.java
index 5896d4f..68bb01b 100644
--- a/app/src/main/java/xyz/fycz/myreader/base/BaseActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/base/BaseActivity.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see extends SwipeBackActivity {
private static final int INVALID_VAL = -1;
+ protected VB binding;
+
protected static final String INTENT = "intent";
protected CompositeDisposable mDisposable;
protected Toolbar mToolbar;
+
/****************************abstract area*************************************/
/**
* 绑定视图
@@ -150,6 +174,33 @@ public abstract class BaseActivity extends SwipeBackActivity {
}
}
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ AdUtils.backTime();
+ ActivityManage.mResumeActivityCount--;
+ if (ActivityManage.mResumeActivityCount <= 0
+ && !App.isBackground){
+ App.isBackground = true;
+ Log.d("FYReader", "onActivityStarted: 应用进入后台");
+ }
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ ActivityManage.mResumeActivityCount++;
+ if (ActivityManage.mResumeActivityCount == 1 &&
+ App.isBackground) {
+ App.isBackground = false;
+ Log.d("FYReader", "onActivityStarted: 应用进入前台");
+ if (!(this instanceof SplashActivity) && AdUtils.backSplashAd()) {
+ SplashActivity.start(this);
+ }
+ }
+ }
+
@Override
protected void onResume() {
super.onResume();
diff --git a/app/src/main/java/xyz/fycz/myreader/base/BaseFragment.java b/app/src/main/java/xyz/fycz/myreader/base/BaseFragment.java
index 0b3a0de..603bfd7 100644
--- a/app/src/main/java/xyz/fycz/myreader/base/BaseFragment.java
+++ b/app/src/main/java/xyz/fycz/myreader/base/BaseFragment.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see extends BaseActivity {
/**************View***************/
protected TabLayout mTlIndicator;
protected ViewPager mVp;
diff --git a/app/src/main/java/xyz/fycz/myreader/base/BitIntentDataManager.java b/app/src/main/java/xyz/fycz/myreader/base/BitIntentDataManager.java
index 3926a28..8a94c91 100644
--- a/app/src/main/java/xyz/fycz/myreader/base/BitIntentDataManager.java
+++ b/app/src/main/java/xyz/fycz/myreader/base/BitIntentDataManager.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see extends RecyclerView.Adapter implements Filterable {
private static final String TAG = "BaseListAdapter";
+ protected static final int TYPE_OTHER = Integer.MIN_VALUE;
/*common statement*/
protected List mList = new ArrayList<>();
+ protected SparseArray otherViews = new SparseArray<>();
+ protected SparseIntArray otherViewPos = new SparseIntArray();
protected OnItemClickListener mClickListener;
protected OnItemLongClickListener mLongClickListener;
/************************abstract area************************/
protected abstract IViewHolder createViewHolder(int viewType);
+
/*************************rewrite logic area***************************************/
+
+ @Override
+ public int getItemViewType(int position) {
+ int key = otherViewPos.indexOfKey(position);
+ if (key >= 0) {
+ return otherViewPos.valueAt(key);
+ }
+ return super.getItemViewType(position);
+ }
+
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ if (viewType < TYPE_OTHER + getOtherCount()) {
+ return new OtherViewHolder(otherViews.get(viewType));
+ }
IViewHolder viewHolder = createViewHolder(viewType);
View view = viewHolder.createItemView(parent);
@@ -41,6 +78,7 @@ public abstract class BaseListAdapter extends RecyclerView.Adapter extends RecyclerView.Adapter extends RecyclerView.Adapter values) {
int oldSize = getItemSize();
if (mList.addAll(values)) {
@@ -122,7 +171,7 @@ public abstract class BaseListAdapter extends RecyclerView.Adapter extends RecyclerView.Adapter= 0 && oldPos < size && newPos >=0 && newPos < size){
+ if (oldPos >= 0 && oldPos < size && newPos >= 0 && newPos < size) {
Collections.swap(mList, oldPos, newPos);
notifyItemMoved(oldPos, newPos);
}
@@ -174,4 +223,11 @@ public abstract class BaseListAdapter extends RecyclerView.Adapter[\\w\\W]*? |@js:[\\w\\W]*$)", Pattern.CASE_INSENSITIVE);
+ public static final Pattern JS_PATTERN_3 = Pattern.compile("([\\w\\W]*?) |@js:([\\w\\W]*)", Pattern.CASE_INSENSITIVE);
public static final Pattern EXP_PATTERN = Pattern.compile("\\{\\{([\\w\\W]*?)\\}\\}");
// public static final Pattern IMG_PATTERN = Pattern.compile("): List {
+ val sources = mutableListOf()
+ source3s.forEach {
+ sources.add(source3ToSource(it))
+ }
+ return sources
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/entity/thirdsource/source3/TocRule3.kt b/app/src/main/java/xyz/fycz/myreader/entity/thirdsource/source3/TocRule3.kt
new file mode 100644
index 0000000..6bd1654
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/entity/thirdsource/source3/TocRule3.kt
@@ -0,0 +1,33 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see getVariableMap() {
if (variableMap == null && !TextUtils.isEmpty(variable)) {
- variableMap = new Gson().fromJson(variable, MAP_STRING);
+ variableMap = GsonExtensionsKt.getGSON().fromJson(variable, MAP_STRING);
+ }
+ if (variableMap == null) {
+ variableMap = new HashMap<>();
}
return variableMap;
}
+ public void setVariableMap(Map variableMap) {
+ this.variableMap = variableMap;
+ }
+
public String getVariable() {
return this.variable;
}
-
public void setVariable(String variable) {
this.variable = variable;
}
+ public Map getCatheMap() {
+ return catheMap;
+ }
+
public void putCathe(String key, String value) {
if (catheMap == null) {
catheMap = new HashMap<>();
@@ -410,14 +447,18 @@ public class Book implements Serializable {
catheMap.put(key, value);
}
- public String getCathe(String key){
- if (catheMap == null){
+ public String getCathe(String key) {
+ if (catheMap == null) {
return "";
}
return catheMap.get(key);
}
- public void clearCathe(){
+ public void setCatheMap(Map catheMap) {
+ this.catheMap = catheMap;
+ }
+
+ public void clearCathe() {
if (catheMap != null) {
catheMap.clear();
}
@@ -430,4 +471,46 @@ public class Book implements Serializable {
public void setReSeg(boolean reSeg) {
this.reSeg = reSeg;
}
+
+ @Nullable
+ @Override
+ public String getVariable(@NonNull String key) {
+ return getVariableMap().get(key);
+ }
+
+ public Book changeSource(Book newBook) {
+ Book bookTem = (Book) clone();
+ bookTem.clearCathe();
+ bookTem.setChapterUrl(newBook.getChapterUrl());
+ bookTem.setInfoUrl(newBook.getInfoUrl());
+ bookTem.setSource(newBook.getSource());
+ if (!StringHelper.isEmpty(newBook.getImgUrl())) {
+ bookTem.setImgUrl(newBook.getImgUrl());
+ }
+ if (!StringHelper.isEmpty(newBook.getType())) {
+ bookTem.setType(newBook.getType());
+ }
+ if (!StringHelper.isEmpty(newBook.getDesc())) {
+ bookTem.setDesc(newBook.getDesc());
+ }
+ if (!StringHelper.isEmpty(newBook.getUpdateDate())) {
+ bookTem.setUpdateDate(newBook.getUpdateDate());
+ }
+ if (!StringHelper.isEmpty(newBook.getWordCount())) {
+ bookTem.setWordCount(newBook.getWordCount());
+ }
+ if (!StringHelper.isEmpty(newBook.getStatus())) {
+ bookTem.setStatus(newBook.getStatus());
+ }
+ if (!StringHelper.isEmpty(newBook.getVariable())) {
+ bookTem.setVariable(newBook.getVariable());
+ bookTem.setVariableMap(newBook.getVariableMap());
+ }
+ if (newBook.getCatheMap() != null) {
+ bookTem.setCatheMap(newBook.getCatheMap());
+ }
+ return bookTem;
+ }
+
+ public void setReverseToc(boolean reverseToc){}
}
diff --git a/app/src/main/java/xyz/fycz/myreader/greendao/entity/BookGroup.java b/app/src/main/java/xyz/fycz/myreader/greendao/entity/BookGroup.java
index fd1c6fc..67e1925 100644
--- a/app/src/main/java/xyz/fycz/myreader/greendao/entity/BookGroup.java
+++ b/app/src/main/java/xyz/fycz/myreader/greendao/entity/BookGroup.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see variableMap;
+
- @Generated(hash = 763230955)
+ @Generated(hash = 1109296579)
public Chapter(String id, String bookId, int number, String title, String url,
- String content, long start, long end) {
+ boolean isVip, boolean isPay, String updateTime, String content,
+ long start, long end, String variable) {
this.id = id;
this.bookId = bookId;
this.number = number;
this.title = title;
this.url = url;
+ this.isVip = isVip;
+ this.isPay = isPay;
+ this.updateTime = updateTime;
this.content = content;
this.start = start;
this.end = end;
+ this.variable = variable;
}
+
@Generated(hash = 393170288)
public Chapter() {
}
+
+
public String getId() {
return this.id;
}
+
public void setId(String id) {
this.id = id;
}
+
public String getBookId() {
return this.bookId;
}
+
public void setBookId(String bookId) {
this.bookId = bookId;
}
+
public int getNumber() {
return this.number;
}
+
public void setNumber(int number) {
this.number = number;
}
+
public String getTitle() {
return this.title;
}
+
public void setTitle(String title) {
this.title = title;
}
+
public String getUrl() {
return this.url;
}
+
public void setUrl(String url) {
this.url = url;
}
+
public String getContent() {
if (end > 0) return end + "";
- String filePath = APPCONST.BOOK_CACHE_PATH + bookId
- + File.separator + title + FileUtils.SUFFIX_FY;
- File file = new File(filePath);
- if (file.exists() && file.length() > 0){
- this.content = filePath;
- }else {
+ File file = ChapterService.getChapterFile(this);
+ if (file.exists() && file.length() > 0) {
+ this.content = file.getAbsolutePath();
+ } else {
this.content = null;
}
return this.content;
}
+
public void setContent(String content) {
this.content = content;
}
@@ -109,4 +162,61 @@ public class Chapter {
public void setEnd(long end) {
this.end = end;
}
+
+ public void putVariable(@NonNull String key, String value) {
+ if (variableMap == null) {
+ variableMap = new HashMap<>();
+ }
+ variableMap.put(key, value);
+ variable = GsonExtensionsKt.getGSON().toJson(variableMap);
+ }
+
+ @NonNull
+ public Map getVariableMap() {
+ if (variableMap == null && !TextUtils.isEmpty(variable)) {
+ variableMap = GsonExtensionsKt.getGSON().fromJson(variable, MAP_STRING);
+ }
+ if (variableMap == null) {
+ variableMap = new HashMap<>();
+ }
+ return variableMap;
+ }
+
+ @Nullable
+ @Override
+ public String getVariable(@NonNull String key) {
+ return getVariableMap().get(key);
+ }
+
+ public String getVariable() {
+ return this.variable;
+ }
+
+ public void setVariable(String variable) {
+ this.variable = variable;
+ }
+
+ public String getUpdateTime() {
+ return this.updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public boolean getIsVip() {
+ return this.isVip;
+ }
+
+ public void setIsVip(boolean isVip) {
+ this.isVip = isVip;
+ }
+
+ public boolean getIsPay() {
+ return this.isPay;
+ }
+
+ public void setIsPay(boolean isPay) {
+ this.isPay = isPay;
+ }
}
diff --git a/app/src/main/java/xyz/fycz/myreader/greendao/entity/CookieBean.java b/app/src/main/java/xyz/fycz/myreader/greendao/entity/CookieBean.java
index 5c4bd6c..ae12b46 100644
--- a/app/src/main/java/xyz/fycz/myreader/greendao/entity/CookieBean.java
+++ b/app/src/main/java/xyz/fycz/myreader/greendao/entity/CookieBean.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see groupList;
@@ -72,12 +96,12 @@ public class BookSource implements Parcelable, Cloneable {
@Convert(converter = FindRuleConvert.class, columnType = String.class)
private FindRule findRule;
- @Generated(hash = 277037260)
+ @Generated(hash = 945434046)
public BookSource(String sourceUrl, String sourceEName, String sourceName, String sourceGroup,
- String sourceCharset, String sourceType, String sourceHeaders, String loginUrl,
- String sourceComment, Long lastUpdateTime, int orderNum, int weight, boolean enable,
- SearchRule searchRule, InfoRule infoRule, TocRule tocRule, ContentRule contentRule,
- FindRule findRule) {
+ String sourceCharset, String sourceType, String sourceHeaders, String loginUrl, String loginCheckJs,
+ String sourceComment, String concurrentRate, Long lastUpdateTime, int orderNum, int weight,
+ boolean enable, boolean noProxy, SearchRule searchRule, InfoRule infoRule, TocRule tocRule,
+ ContentRule contentRule, FindRule findRule) {
this.sourceUrl = sourceUrl;
this.sourceEName = sourceEName;
this.sourceName = sourceName;
@@ -86,11 +110,14 @@ public class BookSource implements Parcelable, Cloneable {
this.sourceType = sourceType;
this.sourceHeaders = sourceHeaders;
this.loginUrl = loginUrl;
+ this.loginCheckJs = loginCheckJs;
this.sourceComment = sourceComment;
+ this.concurrentRate = concurrentRate;
this.lastUpdateTime = lastUpdateTime;
this.orderNum = orderNum;
this.weight = weight;
this.enable = enable;
+ this.noProxy = noProxy;
this.searchRule = searchRule;
this.infoRule = infoRule;
this.tocRule = tocRule;
@@ -112,7 +139,9 @@ public class BookSource implements Parcelable, Cloneable {
sourceType = in.readString();
sourceHeaders = in.readString();
loginUrl = in.readString();
+ loginCheckJs = in.readString();
sourceComment = in.readString();
+ concurrentRate = in.readString();
if (in.readByte() == 0) {
lastUpdateTime = null;
} else {
@@ -121,6 +150,7 @@ public class BookSource implements Parcelable, Cloneable {
orderNum = in.readInt();
weight = in.readInt();
enable = in.readByte() != 0;
+ noProxy = in.readByte() != 0;
searchRule = in.readParcelable(SearchRule.class.getClassLoader());
infoRule = in.readParcelable(InfoRule.class.getClassLoader());
tocRule = in.readParcelable(TocRule.class.getClassLoader());
@@ -138,7 +168,9 @@ public class BookSource implements Parcelable, Cloneable {
dest.writeString(sourceType);
dest.writeString(sourceHeaders);
dest.writeString(loginUrl);
+ dest.writeString(loginCheckJs);
dest.writeString(sourceComment);
+ dest.writeString(concurrentRate);
if (lastUpdateTime == null) {
dest.writeByte((byte) 0);
} else {
@@ -148,6 +180,7 @@ public class BookSource implements Parcelable, Cloneable {
dest.writeInt(orderNum);
dest.writeInt(weight);
dest.writeByte((byte) (enable ? 1 : 0));
+ dest.writeByte((byte) (noProxy ? 1 : 0));
dest.writeParcelable(searchRule, flags);
dest.writeParcelable(infoRule, flags);
dest.writeParcelable(tocRule, flags);
@@ -178,6 +211,7 @@ public class BookSource implements Parcelable, Cloneable {
if (o == null || getClass() != o.getClass()) return false;
BookSource source = (BookSource) o;
return enable == source.enable &&
+ noProxy == source.noProxy &&
stringEquals(sourceUrl, source.sourceUrl) &&
stringEquals(sourceEName, source.sourceEName) &&
stringEquals(sourceName, source.sourceName) &&
@@ -186,7 +220,9 @@ public class BookSource implements Parcelable, Cloneable {
stringEquals(sourceType, source.sourceType) &&
stringEquals(sourceHeaders, source.sourceHeaders) &&
stringEquals(loginUrl, source.loginUrl) &&
+ stringEquals(loginCheckJs, source.loginCheckJs) &&
stringEquals(sourceComment, source.sourceComment) &&
+ stringEquals(concurrentRate, source.concurrentRate) &&
Objects.equals(searchRule, source.searchRule) &&
Objects.equals(infoRule, source.infoRule) &&
Objects.equals(tocRule, source.tocRule) &&
@@ -396,4 +432,62 @@ public class BookSource implements Parcelable, Cloneable {
public void setLoginUrl(String loginUrl) {
this.loginUrl = loginUrl;
}
+
+ public String getLoginCheckJs() {
+ return loginCheckJs;
+ }
+
+ public void setLoginCheckJs(String loginCheckJs) {
+ this.loginCheckJs = loginCheckJs;
+ }
+
+ public String getConcurrentRate() {
+ return this.concurrentRate;
+ }
+
+ public void setConcurrentRate(String concurrentRate) {
+ this.concurrentRate = concurrentRate;
+ }
+
+ @Nullable
+ @Override
+ public String getConcurrentRateKt() {
+ return concurrentRate;
+ }
+
+ @Nullable
+ @Override
+ public String getLoginUrlKt() {
+ return loginUrl;
+ }
+
+ @Override
+ public String getHeader() {
+ return sourceHeaders;
+ }
+
+ @NonNull
+ @Override
+ public String getTag() {
+ return sourceName;
+ }
+
+ @NonNull
+ @Override
+ public String getKey() {
+ return sourceUrl;
+ }
+
+ @Override
+ public BookSource getSource() {
+ return this;
+ }
+
+ public boolean getNoProxy() {
+ return this.noProxy;
+ }
+
+ public void setNoProxy(boolean noProxy) {
+ this.noProxy = noProxy;
+ }
}
diff --git a/app/src/main/java/xyz/fycz/myreader/greendao/entity/rule/ContentRule.java b/app/src/main/java/xyz/fycz/myreader/greendao/entity/rule/ContentRule.java
index 71ba5ab..4ac83cb 100644
--- a/app/src/main/java/xyz/fycz/myreader/greendao/entity/rule/ContentRule.java
+++ b/app/src/main/java/xyz/fycz/myreader/greendao/entity/rule/ContentRule.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see >()
+
+ /**
+ * saveTime 单位为秒
+ */
+ @JvmOverloads
+ fun put(key: String, value: Any, saveTime: Int = 0) {
+ val deadline =
+ if (saveTime == 0) 0 else System.currentTimeMillis() + saveTime * 1000
+ when (value) {
+ is QueryTTF -> queryTTFMap[key] = Pair(deadline, value)
+ is ByteArray -> ACache.get(App.getmContext()).put(key, value, saveTime)
+ else -> {
+ val cache = Cache(key, value.toString(), deadline)
+ DbManager.getDaoSession().cacheDao.insertOrReplace(cache)
+ }
+ }
+ }
+
+ fun get(key: String): String? {
+ var str: String? = null
+ try {
+ val sql = "select VALUE from CACHE where key = ? and (DEAD_LINE = 0 or DEAD_LINE > ?)"
+ val cursor: Cursor = DbManager.getDaoSession().database.rawQuery(
+ sql,
+ arrayOf(key, "" + System.currentTimeMillis())
+ ) ?: return null
+ if (cursor.moveToNext()) {
+ str = cursor.getColumnName(0)
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ return str
+ }
+
+ fun getInt(key: String): Int? {
+ return get(key)?.toIntOrNull()
+ }
+
+ fun getLong(key: String): Long? {
+ return get(key)?.toLongOrNull()
+ }
+
+ fun getDouble(key: String): Double? {
+ return get(key)?.toDoubleOrNull()
+ }
+
+ fun getFloat(key: String): Float? {
+ return get(key)?.toFloatOrNull()
+ }
+
+ fun getByteArray(key: String): ByteArray? {
+ return ACache.get(App.getmContext()).getAsBinary(key)
+ }
+
+ fun getQueryTTF(key: String): QueryTTF? {
+ val cache = queryTTFMap[key] ?: return null
+ if (cache.first == 0L || cache.first > System.currentTimeMillis()) {
+ return cache.second
+ }
+ return null
+ }
+
+ fun delete(key: String) {
+ DbManager.getDaoSession().cacheDao.deleteByKey(key)
+ ACache.get(App.getmContext()).remove(key)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/greendao/service/ChapterService.java b/app/src/main/java/xyz/fycz/myreader/greendao/service/ChapterService.java
index c9e8c0c..20e1bbd 100644
--- a/app/src/main/java/xyz/fycz/myreader/greendao/service/ChapterService.java
+++ b/app/src/main/java/xyz/fycz/myreader/greendao/service/ChapterService.java
@@ -1,8 +1,27 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see findChapters(String sql, String[] selectionArgs) {
ArrayList chapters = new ArrayList<>();
try {
@@ -40,9 +60,12 @@ public class ChapterService extends BaseService {
chapter.setNumber(cursor.getInt(2));
chapter.setTitle(cursor.getString(3));
chapter.setUrl(cursor.getString(4));
- chapter.setContent(cursor.getString(5));
- chapter.setStart(cursor.getInt(6));
- chapter.setEnd(cursor.getInt(7));
+ chapter.setIsVip(cursor.getInt(5) != 0);
+ chapter.setIsPay(cursor.getInt(6) != 0);
+ chapter.setUpdateTime(cursor.getString(7));
+ chapter.setContent(cursor.getString(8));
+ chapter.setStart(cursor.getInt(9));
+ chapter.setEnd(cursor.getInt(10));
chapters.add(chapter);
}
} catch (Exception e) {
@@ -185,11 +208,11 @@ public class ChapterService extends BaseService {
return;
}
- File file = getBookFile(chapter.getBookId(), chapter.getTitle());
+ File file = getChapterFileExisted(chapter);
BufferedWriter bw = null;
try {
bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)));
- bw.write(content.replace(chapter.getTitle(), ""));
+ bw.write(content);
bw.flush();
} catch (IOException e) {
e.printStackTrace();
@@ -204,25 +227,25 @@ public class ChapterService extends BaseService {
* @param chapter
*/
public void deleteChapterCacheFile(Chapter chapter) {
- File file = getBookFile(chapter.getBookId(), chapter.getTitle());
- file.delete();
+ File file = getChapterFile(chapter);
+ if (file.exists()) file.delete();
}
/**
* 获取缓存章节内容
+ *
* @param chapter
* @return
*/
- public String getChapterCatheContent(Chapter chapter){
- File file = new File(APPCONST.BOOK_CACHE_PATH + chapter.getBookId()
- + File.separator + chapter.getTitle() + FileUtils.SUFFIX_FY);
+ public String getChapterCatheContent(Chapter chapter) {
+ File file = getChapterFile(chapter);
if (!file.exists()) return null;
BufferedReader br = null;
try {
br = new BufferedReader(new FileReader(file));
StringBuilder s = new StringBuilder();
String line = null;
- while ((line = br.readLine()) != null){
+ while ((line = br.readLine()) != null) {
s.append(line);
s.append("\n");
}
@@ -230,7 +253,7 @@ public class ChapterService extends BaseService {
} catch (IOException e) {
e.printStackTrace();
return null;
- }finally {
+ } finally {
IOUtils.close(br);
}
}
@@ -275,13 +298,20 @@ public class ChapterService extends BaseService {
* 根据文件名判断是否被缓存过 (因为可能数据库显示被缓存过，但是文件中却没有的情况，所以需要根据文件判断是否被缓存
* 过)
*
- * @param folderName : bookId
- * @param fileName: chapterName
+ * @param chapter : chapter
* @return
*/
- public static boolean isChapterCached(String folderName, String fileName) {
- File file = new File(APPCONST.BOOK_CACHE_PATH + folderName
- + File.separator + fileName + FileUtils.SUFFIX_FY);
+ public static boolean isChapterCached(Chapter chapter) {
+ File file = getChapterFile(chapter);
+ return file.exists();
+ }
+
+ public static boolean isChapterCached(BookMark bookMark) {
+ Chapter chapter = new Chapter();
+ chapter.setBookId(bookMark.getBookId());
+ chapter.setNumber(bookMark.getBookMarkChapterNum());
+ chapter.setTitle(bookMark.getTitle());
+ File file = getChapterFile(chapter);
return file.exists();
}
@@ -323,4 +353,24 @@ public class ChapterService extends BaseService {
+ File.separator + fileName + FileUtils.SUFFIX_FY);
}
+ public static File getChapterFile(Chapter chapter) {
+ File file = new File(APPCONST.BOOK_CACHE_PATH + chapter.getBookId()
+ + File.separator + chapter.getNumber() + "、" + chapter.getTitle() + FileUtils.SUFFIX_FY);
+ if (!file.exists()) {
+ file = new File(APPCONST.BOOK_CACHE_PATH + chapter.getBookId()
+ + File.separator + chapter.getTitle() + FileUtils.SUFFIX_FY);
+ }
+ return file;
+ }
+
+ public static File getChapterFileExisted(Chapter chapter) {
+ File file = new File(APPCONST.BOOK_CACHE_PATH + chapter.getBookId()
+ + File.separator + chapter.getTitle() + FileUtils.SUFFIX_FY);
+ if (!file.exists()) {
+ file = FileUtils.getFile(APPCONST.BOOK_CACHE_PATH + chapter.getBookId()
+ + File.separator + chapter.getNumber() + "、" + chapter.getTitle() + FileUtils.SUFFIX_FY);
+ }
+ return file;
+ }
+
}
diff --git a/app/src/main/java/xyz/fycz/myreader/greendao/service/CookieStore.kt b/app/src/main/java/xyz/fycz/myreader/greendao/service/CookieStore.kt
index 1f23a28..84e917a 100644
--- a/app/src/main/java/xyz/fycz/myreader/greendao/service/CookieStore.kt
+++ b/app/src/main/java/xyz/fycz/myreader/greendao/service/CookieStore.kt
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see getAllSubSource() {
+ return DbManager.getDaoSession().getBookSourceDao().queryBuilder()
+ .where(BookSourceDao.Properties.SourceEName.isNotNull())
+ .where(BookSourceDao.Properties.SourceType.isNotNull())
+ .orderAsc(BookSourceDao.Properties.OrderNum)
+ .list();
+ }
+
/**
- * 获取所有导入书源
+ * 获取所有非内置书源
*
* @return
*/
public static List getAllNoLocalSource() {
return DbManager.getDaoSession().getBookSourceDao().queryBuilder()
.where(BookSourceDao.Properties.SourceEName.isNull())
+ .where(BookSourceDao.Properties.SourceType.isNotNull())
+ .orderAsc(BookSourceDao.Properties.OrderNum)
+ .list();
+ }
+
+ public static void removeSourceBySubscribe(SubscribeFile file) {
+ DbManager.getDaoSession().getBookSourceDao().queryBuilder()
+ .where(BookSourceDao.Properties.SourceEName.eq("订阅书源:" + file.getId()))
+ .buildDelete().executeDeleteWithoutDetachingEntities();
+ }
+
+ public static List getSourceBySubscribe(SubscribeFile file) {
+ return DbManager.getDaoSession().getBookSourceDao().queryBuilder()
+ .where(BookSourceDao.Properties.SourceEName.eq("订阅书源:" + file.getId()))
.orderAsc(BookSourceDao.Properties.OrderNum)
.list();
}
@@ -189,6 +236,10 @@ public class BookSourceManager {
DbManager.getDaoSession().getBookSourceDao().deleteInTx(sources);
}
+ public static boolean isBookSourceExist(BookSource source) {
+ if (source == null) return false;
+ return DbManager.getDaoSession().getBookSourceDao().load(source.getSourceUrl()) != null;
+ }
public static String getBookSourceSort() {
switch (SharedPreUtils.getInstance().getInt("SourceSort", 0)) {
@@ -259,7 +310,7 @@ public class BookSourceManager {
}).compose(RxUtils::toSimpleSingle);
}
- public static List getEnableNoLocalGroupList() {
+ public static List getEnableGroupList() {
List groupList = new ArrayList<>();
String sql = "SELECT DISTINCT "
+ BookSourceDao.Properties.SourceGroup.columnName
@@ -280,17 +331,24 @@ public class BookSourceManager {
return groupList;
}
- public static List getNoLocalGroupList() {
+ public static List getGroupList(boolean isSubscribe) {
List groupList = new ArrayList<>();
- String sql = "SELECT DISTINCT " + BookSourceDao.Properties.SourceGroup.columnName + " FROM " + BookSourceDao.TABLENAME;
+ String sql = "SELECT DISTINCT " + BookSourceDao.Properties.SourceGroup.columnName + ","
+ + BookSourceDao.Properties.SourceEName.columnName + " FROM " + BookSourceDao.TABLENAME;
Cursor cursor = DbManager.getDaoSession().getDatabase().rawQuery(sql, null);
if (!cursor.moveToFirst()) return groupList;
do {
String group = cursor.getString(0);
+ String eName = cursor.getString(1);
if (TextUtils.isEmpty(group) || TextUtils.isEmpty(group.trim())) continue;
for (String item : group.split("\\s*[,;，；]\\s*")) {
- if (TextUtils.isEmpty(item) || groupList.contains(item) || item.equals("内置书源"))
- continue;
+ if (isSubscribe) {
+ if (TextUtils.isEmpty(eName) || TextUtils.isEmpty(item) || groupList.contains(item) || item.equals("内置书源"))
+ continue;
+ } else {
+ if (!TextUtils.isEmpty(eName) || TextUtils.isEmpty(item) || groupList.contains(item) || item.equals("内置书源"))
+ continue;
+ }
groupList.add(item);
}
} while (cursor.moveToNext());
@@ -298,36 +356,50 @@ public class BookSourceManager {
return groupList;
}
- public static Observable> importSource(String string) {
+ public static Observable> importSource(String string, String subscribeId) {
if (StringHelper.isEmpty(string)) return null;
string = string.trim();
if (NetworkUtils.isIPv4Address(string)) {
string = String.format("http://%s:65501", string);
}
if (StringUtils.isJsonType(string)) {
- return importBookSourceFromJson(string.trim())
+ return importBookSourceFromJson(string.trim(), subscribeId)
.compose(RxUtils::toSimpleSingle);
} else if (StringUtils.isCompressJsonType(string)) {
- return importBookSourceFromJson(StringUtils.unCompressJson(string))
+ return importBookSourceFromJson(StringUtils.unCompressJson(string), subscribeId)
.compose(RxUtils::toSimpleSingle);
} else if (new File(string).isFile()) {
- return importSource(FileUtils.readText(string));
+ return importSource(FileUtils.readText(string), subscribeId);
+ }
+ if (string.matches("https://.+\\.lanzou[a-z]\\.com/[\\s\\S]*")) {
+ return LanZouApi.INSTANCE.getFileUrl(string)
+ .flatMap((Function>) s -> Observable.create(emitter -> {
+ emitter.onNext(OkHttpUtils.getHtml(s));
+ emitter.onComplete();
+ })).flatMap(json -> importBookSourceFromJson(json, subscribeId))
+ .compose(RxUtils::toSimpleSingle);
}
if (NetworkUtils.isUrl(string)) {
String finalString = string;
return Observable.create((ObservableEmitter e) -> e.onNext(OkHttpUtils.getHtml(finalString)))
- .flatMap(BookSourceManager::importBookSourceFromJson)
+ .flatMap(json -> importBookSourceFromJson(json, subscribeId))
.compose(RxUtils::toSimpleSingle);
}
return Observable.error(new Exception("不是Json或Url格式或文件路径"));
}
private static Observable> importBookSourceFromJson(String json) {
+ return importBookSourceFromJson(json, "");
+ }
+
+ private static Observable> importBookSourceFromJson(String json, String subscribeId) {
return Observable.create(emitter -> {
List successImportSources = new ArrayList<>();
List bookSources = importSources(json);
if (bookSources != null) {
for (BookSource bookSource : bookSources) {
+ if (!TextUtils.isEmpty(subscribeId))
+ bookSource.setSourceEName("订阅书源:" + subscribeId);
if (bookSource.containsGroup("删除")) {
DbManager.getDaoSession().getBookSourceDao().queryBuilder()
.where(BookSourceDao.Properties.SourceUrl.eq(bookSource.getSourceUrl()))
@@ -355,16 +427,17 @@ public class BookSourceManager {
return sources;
}
+ List source3s = SourceAnalyzer.INSTANCE.jsonToBookSources(json);
+ String source3sJson = GsonExtensionsKt.getGSON().toJson(source3s);
+ if (source3s.size() > 0 && source3sJson.length() > source3s.size() * SOURCE_LENGTH) {
+ return Third3SourceUtil.INSTANCE.source3sToSources(source3s);
+ }
+
List source2s = GsonUtils.parseJArray(json, BookSourceBean.class);
String source2sJson = GsonExtensionsKt.getGSON().toJson(source2s);
if (source2s.size() > 0 && source2sJson.length() > source2s.size() * SOURCE_LENGTH) {
return ThirdSourceUtil.source2sToSources(source2s);
}
- List source3s = GsonUtils.parseJArray(json, BookSource3Bean.class);
- String source3sJson = GsonExtensionsKt.getGSON().toJson(source3s);
- if (source3s.size() > 0 && source3sJson.length() > source3s.size() * SOURCE_LENGTH) {
- return ThirdSourceUtil.source3sToSources(source3s);
- }
} catch (Exception e) {
e.printStackTrace();
}
@@ -379,6 +452,13 @@ public class BookSourceManager {
return sources;
}
+ Source3 source3 = SourceAnalyzer.INSTANCE.jsonToBookSource(json);
+ String source3Json = GsonExtensionsKt.getGSON().toJson(source3);
+ if (!StringHelper.isEmpty(source3Json) && source3Json.length() > SOURCE_LENGTH) {
+ sources.add(Third3SourceUtil.INSTANCE.source3ToSource(source3));
+ return sources;
+ }
+
BookSourceBean source2 = GsonUtils.parseJObject(json, BookSourceBean.class);
String source2Json = GsonExtensionsKt.getGSON().toJson(source2);
if (!StringHelper.isEmpty(source2Json) && source2Json.length() > SOURCE_LENGTH) {
@@ -386,12 +466,6 @@ public class BookSourceManager {
return sources;
}
- BookSource3Bean source3 = GsonUtils.parseJObject(json, BookSource3Bean.class);
- String source3Json = GsonExtensionsKt.getGSON().toJson(source3);
- if (!StringHelper.isEmpty(source3Json) && source3Json.length() > SOURCE_LENGTH) {
- sources.add(ThirdSourceUtil.source3ToSource(source3));
- return sources;
- }
} catch (Exception e) {
e.printStackTrace();
}
@@ -403,14 +477,13 @@ public class BookSourceManager {
Log.d("initDefaultSources", "execute");
DbManager.getDaoSession().getBookSourceDao().deleteAll();
String searchSource = SharedPreUtils.getInstance().getString(App.getmContext().getString(R.string.searchSource));
- boolean isEmpty = StringHelper.isEmpty(searchSource);
for (LocalBookSource source : LocalBookSource.values()) {
if (source == LocalBookSource.local || source == LocalBookSource.fynovel) continue;
BookSource source1 = new BookSource();
source1.setSourceEName(source.toString());
source1.setSourceName(source.text);
source1.setSourceGroup("内置书源");
- source1.setEnable(isEmpty || searchSource.contains(source.toString()));
+ source1.setEnable(false);
source1.setSourceUrl(ReadCrawlerUtil.getReadCrawlerClz(source.toString()));
source1.setOrderNum(0);
DbManager.getDaoSession().getBookSourceDao().insertOrReplace(source1);
diff --git a/app/src/main/java/xyz/fycz/myreader/model/sourceAnalyzer/JsonPathAnalyzer.java b/app/src/main/java/xyz/fycz/myreader/model/sourceAnalyzer/JsonPathAnalyzer.java
index 1382696..e08f1ad 100644
--- a/app/src/main/java/xyz/fycz/myreader/model/sourceAnalyzer/JsonPathAnalyzer.java
+++ b/app/src/main/java/xyz/fycz/myreader/model/sourceAnalyzer/JsonPathAnalyzer.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see (json)?.let {
+ DbManager.getInstance().session.subscribeFileDao.insertOrReplaceInTx(it)
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
try {
val settingFile = FileUtils.getFile(path + File.separator + "setting.json")
val settingJson = settingFile.readText()
diff --git a/app/src/main/java/xyz/fycz/myreader/model/storage/WebDavHelp.kt b/app/src/main/java/xyz/fycz/myreader/model/storage/WebDavHelp.kt
index 64f0f52..dcb19c5 100644
--- a/app/src/main/java/xyz/fycz/myreader/model/storage/WebDavHelp.kt
+++ b/app/src/main/java/xyz/fycz/myreader/model/storage/WebDavHelp.kt
@@ -1,3 +1,21 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see ? {
+ return GSON.fromJsonArray(loginUi)
+ }*/
+
+ fun getLoginJs(): String? {
+ val loginJs = getLoginUrlKt()
+ return when {
+ loginJs == null -> null
+ loginJs.startsWith("@js:") -> loginJs.substring(4)
+ loginJs.startsWith("") ->
+ loginJs.substring(4, loginJs.lastIndexOf("<"))
+ else -> loginJs
+ }
+ }
+
+ fun login() {
+ getLoginJs()?.let {
+ evalJS(it)
+ }
+ }
+
+ /**
+ * 解析header规则
+ */
+ fun getHeaderMap(hasLoginHeader: Boolean = false) = HashMap().apply {
+ this[APPCONST.UA_NAME] = APPCONST.DEFAULT_USER_AGENT
+ getHeader()?.let {
+ GSON.fromJsonObject>(
+ when {
+ it.startsWith("@js:", true) ->
+ evalJS(it.substring(4)).toString()
+ it.startsWith("", true) ->
+ evalJS(it.substring(4, it.lastIndexOf("<"))).toString()
+ else -> it
+ }
+ )?.let { map ->
+ putAll(map)
+ }
+ }
+ if (hasLoginHeader) {
+ getLoginHeaderMap()?.let {
+ putAll(it)
+ }
+ }
+ }
+
+ /**
+ * 获取用于登录的头部信息
+ */
+ fun getLoginHeader(): String? {
+ return CacheManager.get("loginHeader_${getKey()}")
+ }
+
+ fun getLoginHeaderMap(): Map? {
+ val cache = getLoginHeader() ?: return null
+ return GSON.fromJsonObject(cache)
+ }
+
+ /**
+ * 保存登录头部信息,map格式,访问时自动添加
+ */
+ fun putLoginHeader(header: String) {
+ CacheManager.put("loginHeader_${getKey()}", header)
+ }
+
+ fun removeLoginHeader() {
+ CacheManager.delete("loginHeader_${getKey()}")
+ }
+
+ /**
+ * 获取用户信息,可以用来登录
+ * 用户信息采用aes加密存储
+ */
+ fun getLoginInfo(): String? {
+ try {
+ val key = APPCONST.androidId.encodeToByteArray(0, 8)
+ val cache = CacheManager.get("userInfo_${getKey()}") ?: return null
+ val encodeBytes = Base64.decode(cache, Base64.DEFAULT)
+ val decodeBytes = EncoderUtils.decryptAES(encodeBytes, key)
+ ?: return null
+ return String(decodeBytes)
+ } catch (e: Exception) {
+ Log.e("BaseSource","" + e.localizedMessage)
+ return null
+ }
+ }
+
+ fun getLoginInfoMap(): Map? {
+ return GSON.fromJsonObject(getLoginInfo())
+ }
+
+ /**
+ * 保存用户信息,aes加密
+ */
+ fun putLoginInfo(info: String): Boolean {
+ return try {
+ val key = (APPCONST.androidId).encodeToByteArray(0, 8)
+ val encodeBytes = EncoderUtils.encryptAES(info.toByteArray(), key)
+ val encodeStr = Base64.encodeToString(encodeBytes, Base64.DEFAULT)
+ CacheManager.put("userInfo_${getKey()}", encodeStr)
+ true
+ } catch (e: Exception) {
+ Log.e("BaseSource","" + e.localizedMessage)
+ false
+ }
+ }
+
+ fun removeLoginInfo() {
+ CacheManager.delete("userInfo_${getKey()}")
+ }
+
+ fun setVariable(variable: String?) {
+ if (variable != null) {
+ CacheManager.put("sourceVariable_${getKey()}", variable)
+ } else {
+ CacheManager.delete("sourceVariable_${getKey()}")
+ }
+ }
+
+ fun getVariable(): String? {
+ return CacheManager.get("sourceVariable_${getKey()}")
+ }
+
+ /**
+ * 执行JS
+ */
+ @Throws(Exception::class)
+ fun evalJS(jsStr: String, bindingsConfig: SimpleBindings.() -> Unit = {}): Any? {
+ val bindings = SimpleBindings()
+ bindings.apply(bindingsConfig)
+ bindings["java"] = this
+ bindings["source"] = this
+ bindings["baseUrl"] = getKey()
+ bindings["cookie"] = CookieStore
+ bindings["cache"] = CacheManager
+ return APPCONST.SCRIPT_ENGINE.eval(jsStr, bindings)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/BookType.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/BookType.kt
new file mode 100644
index 0000000..e7fc813
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/BookType.kt
@@ -0,0 +1,26 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see (
+ val scope: CoroutineScope,
+ context: CoroutineContext = Dispatchers.IO,
+ block: suspend CoroutineScope.() -> T
+) {
+
+ companion object {
+
+ private val DEFAULT = MainScope()
+
+ fun async(
+ scope: CoroutineScope = DEFAULT,
+ context: CoroutineContext = Dispatchers.IO,
+ block: suspend CoroutineScope.() -> T
+ ): Coroutine {
+ return Coroutine(scope, context, block)
+ }
+
+ }
+
+ private val job: Job
+
+ private var start: VoidCallback? = null
+ private var success: Callback? = null
+ private var error: Callback? = null
+ private var finally: VoidCallback? = null
+ private var cancel: VoidCallback? = null
+
+ private var timeMillis: Long? = null
+ private var errorReturn: Result? = null
+
+ val isCancelled: Boolean
+ get() = job.isCancelled
+
+ val isActive: Boolean
+ get() = job.isActive
+
+ val isCompleted: Boolean
+ get() = job.isCompleted
+
+ init {
+ this.job = executeInternal(context, block)
+ }
+
+ fun timeout(timeMillis: () -> Long): Coroutine {
+ this.timeMillis = timeMillis()
+ return this@Coroutine
+ }
+
+ fun timeout(timeMillis: Long): Coroutine {
+ this.timeMillis = timeMillis
+ return this@Coroutine
+ }
+
+ fun onErrorReturn(value: () -> T?): Coroutine {
+ this.errorReturn = Result(value())
+ return this@Coroutine
+ }
+
+ fun onErrorReturn(value: T?): Coroutine {
+ this.errorReturn = Result(value)
+ return this@Coroutine
+ }
+
+ fun onStart(
+ context: CoroutineContext? = null,
+ block: (suspend CoroutineScope.() -> Unit)
+ ): Coroutine {
+ this.start = VoidCallback(context, block)
+ return this@Coroutine
+ }
+
+ fun onSuccess(
+ context: CoroutineContext? = null,
+ block: suspend CoroutineScope.(T) -> Unit
+ ): Coroutine {
+ this.success = Callback(context, block)
+ return this@Coroutine
+ }
+
+ fun onError(
+ context: CoroutineContext? = null,
+ block: suspend CoroutineScope.(Throwable) -> Unit
+ ): Coroutine {
+ this.error = Callback(context, block)
+ return this@Coroutine
+ }
+
+ fun onFinally(
+ context: CoroutineContext? = null,
+ block: suspend CoroutineScope.() -> Unit
+ ): Coroutine {
+ this.finally = VoidCallback(context, block)
+ return this@Coroutine
+ }
+
+ fun onCancel(
+ context: CoroutineContext? = null,
+ block: suspend CoroutineScope.() -> Unit
+ ): Coroutine {
+ this.cancel = VoidCallback(context, block)
+ return this@Coroutine
+ }
+
+ //取消当前任务
+ fun cancel(cause: CancellationException? = null) {
+ job.cancel(cause)
+ cancel?.let {
+ MainScope().launch {
+ if (null == it.context) {
+ it.block.invoke(scope)
+ } else {
+ withContext(scope.coroutineContext.plus(it.context)) {
+ it.block.invoke(this)
+ }
+ }
+ }
+ }
+ }
+
+ fun invokeOnCompletion(handler: CompletionHandler): DisposableHandle {
+ return job.invokeOnCompletion(handler)
+ }
+
+ private fun executeInternal(
+ context: CoroutineContext,
+ block: suspend CoroutineScope.() -> T
+ ): Job {
+ return scope.plus(Dispatchers.Main).launch {
+ try {
+ start?.let { dispatchVoidCallback(this, it) }
+ ensureActive()
+ val value = executeBlock(scope, context, timeMillis ?: 0L, block)
+ ensureActive()
+ success?.let { dispatchCallback(this, value, it) }
+ } catch (e: CancellationException) {
+ Log.d("Coroutine", "任务取消")
+ } catch (e: Throwable) {
+ e.printStackTrace()
+ Log.d("Coroutine", "" + e.localizedMessage)
+ val consume: Boolean = errorReturn?.value?.let { value ->
+ if (isActive) {
+ success?.let { dispatchCallback(this, value, it) }
+ }
+ true
+ } ?: false
+ if (!consume && isActive) {
+ error?.let { dispatchCallback(this, e, it) }
+ }
+ } finally {
+ if (isActive) {
+ finally?.let { dispatchVoidCallback(this, it) }
+ }
+ }
+ }
+ }
+
+ private suspend inline fun dispatchVoidCallback(scope: CoroutineScope, callback: VoidCallback) {
+ if (null == callback.context) {
+ callback.block.invoke(scope)
+ } else {
+ withContext(scope.coroutineContext.plus(callback.context)) {
+ callback.block.invoke(this)
+ }
+ }
+ }
+
+ private suspend inline fun dispatchCallback(
+ scope: CoroutineScope,
+ value: R,
+ callback: Callback
+ ) {
+ if (!scope.isActive) return
+ if (null == callback.context) {
+ callback.block.invoke(scope, value)
+ } else {
+ withContext(scope.coroutineContext.plus(callback.context)) {
+ callback.block.invoke(this, value)
+ }
+ }
+ }
+
+ private suspend inline fun executeBlock(
+ scope: CoroutineScope,
+ context: CoroutineContext,
+ timeMillis: Long,
+ noinline block: suspend CoroutineScope.() -> T
+ ): T {
+ return withContext(scope.coroutineContext.plus(context)) {
+ if (timeMillis > 0L) withTimeout(timeMillis) {
+ block()
+ } else {
+ block()
+ }
+ }
+ }
+
+ private data class Result(val value: T?)
+
+ private inner class VoidCallback(
+ val context: CoroutineContext?,
+ val block: suspend CoroutineScope.() -> Unit
+ )
+
+ private inner class Callback(
+ val context: CoroutineContext?,
+ val block: suspend CoroutineScope.(VALUE) -> Unit
+ )
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/Debug.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/Debug.kt
new file mode 100644
index 0000000..8898f5a
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/Debug.kt
@@ -0,0 +1,47 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see {
+ val bookSources = mutableListOf()
+ val items: List> = jsonPath.parse(json).read("$")
+ for (item in items) {
+ val jsonItem = jsonPath.parse(item)
+ jsonToBookSource(jsonItem.jsonString())?.let {
+ bookSources.add(it)
+ }
+ }
+ return bookSources
+ }
+
+ fun jsonToBookSource(json: String): Source3? {
+ val source = Source3()
+ val sourceAny = try {
+ GSON.fromJsonObject(json.trim())
+ } catch (e: Exception) {
+ null
+ }
+ try {
+ if (sourceAny?.ruleToc == null) {
+ source.apply {
+ val jsonItem = jsonPath.parse(json.trim())
+ bookSourceUrl = jsonItem.readString("bookSourceUrl") ?: return null
+ bookSourceName = jsonItem.readString("bookSourceName") ?: ""
+ bookSourceGroup = jsonItem.readString("bookSourceGroup")
+ loginUrl = jsonItem.readString("loginUrl")
+ loginUi = jsonItem.readString("loginUi")
+ loginCheckJs = jsonItem.readString("loginCheckJs")
+ bookSourceComment = jsonItem.readString("bookSourceComment") ?: ""
+ bookUrlPattern = jsonItem.readString("ruleBookUrlPattern")
+ customOrder = jsonItem.readInt("serialNumber") ?: 0
+ header = uaToHeader(jsonItem.readString("httpUserAgent"))
+ searchUrl = toNewUrl(jsonItem.readString("ruleSearchUrl"))
+ exploreUrl = toNewUrls(jsonItem.readString("ruleFindUrl"))
+ bookSourceType =
+ if (jsonItem.readString("bookSourceType") == "AUDIO") BookType.audio else BookType.default
+ enabled = jsonItem.readBool("enable") ?: true
+ if (exploreUrl.isNullOrBlank()) {
+ enabledExplore = false
+ }
+ ruleSearch = SearchRule3(
+ bookList = toNewRule(jsonItem.readString("ruleSearchList")),
+ name = toNewRule(jsonItem.readString("ruleSearchName")),
+ author = toNewRule(jsonItem.readString("ruleSearchAuthor")),
+ intro = toNewRule(jsonItem.readString("ruleSearchIntroduce")),
+ kind = toNewRule(jsonItem.readString("ruleSearchKind")),
+ bookUrl = toNewRule(jsonItem.readString("ruleSearchNoteUrl")),
+ coverUrl = toNewRule(jsonItem.readString("ruleSearchCoverUrl")),
+ lastChapter = toNewRule(jsonItem.readString("ruleSearchLastChapter"))
+ )
+ ruleExplore = ExploreRule3(
+ bookList = toNewRule(jsonItem.readString("ruleFindList")),
+ name = toNewRule(jsonItem.readString("ruleFindName")),
+ author = toNewRule(jsonItem.readString("ruleFindAuthor")),
+ intro = toNewRule(jsonItem.readString("ruleFindIntroduce")),
+ kind = toNewRule(jsonItem.readString("ruleFindKind")),
+ bookUrl = toNewRule(jsonItem.readString("ruleFindNoteUrl")),
+ coverUrl = toNewRule(jsonItem.readString("ruleFindCoverUrl")),
+ lastChapter = toNewRule(jsonItem.readString("ruleFindLastChapter"))
+ )
+ ruleBookInfo = BookInfoRule3(
+ init = toNewRule(jsonItem.readString("ruleBookInfoInit")),
+ name = toNewRule(jsonItem.readString("ruleBookName")),
+ author = toNewRule(jsonItem.readString("ruleBookAuthor")),
+ intro = toNewRule(jsonItem.readString("ruleIntroduce")),
+ kind = toNewRule(jsonItem.readString("ruleBookKind")),
+ coverUrl = toNewRule(jsonItem.readString("ruleCoverUrl")),
+ lastChapter = toNewRule(jsonItem.readString("ruleBookLastChapter")),
+ tocUrl = toNewRule(jsonItem.readString("ruleChapterUrl"))
+ )
+ ruleToc = TocRule3(
+ chapterList = toNewRule(jsonItem.readString("ruleChapterList")),
+ chapterName = toNewRule(jsonItem.readString("ruleChapterName")),
+ chapterUrl = toNewRule(jsonItem.readString("ruleContentUrl")),
+ nextTocUrl = toNewRule(jsonItem.readString("ruleChapterUrlNext"))
+ )
+ var content = toNewRule(jsonItem.readString("ruleBookContent")) ?: ""
+ if (content.startsWith("$") && !content.startsWith("$.")) {
+ content = content.substring(1)
+ }
+ ruleContent = ContentRule3(
+ content = content,
+ replaceRegex = toNewRule(jsonItem.readString("ruleBookContentReplace")),
+ nextContentUrl = toNewRule(jsonItem.readString("ruleContentUrlNext"))
+ )
+ }
+ } else {
+ source.bookSourceUrl = sourceAny.bookSourceUrl
+ source.bookSourceName = sourceAny.bookSourceName
+ source.bookSourceGroup = sourceAny.bookSourceGroup
+ source.bookSourceType = sourceAny.bookSourceType
+ source.bookUrlPattern = sourceAny.bookUrlPattern
+ source.customOrder = sourceAny.customOrder
+ source.enabled = sourceAny.enabled
+ source.enabledExplore = sourceAny.enabledExplore
+ source.concurrentRate = sourceAny.concurrentRate
+ source.header = sourceAny.header
+ source.loginUrl = when (sourceAny.loginUrl) {
+ null -> null
+ is String -> sourceAny.loginUrl.toString()
+ else -> JsonPath.parse(sourceAny.loginUrl).readString("url")
+ }
+ source.loginUi = if (sourceAny.loginUi is List<*>) {
+ GSON.toJson(sourceAny.loginUi)
+ } else {
+ sourceAny.loginUi?.toString()
+ }
+ source.loginCheckJs = sourceAny.loginCheckJs
+ source.bookSourceComment = sourceAny.bookSourceComment
+ source.lastUpdateTime = sourceAny.lastUpdateTime
+ source.respondTime = sourceAny.respondTime
+ source.weight = sourceAny.weight
+ source.exploreUrl = sourceAny.exploreUrl
+ source.ruleExplore = if (sourceAny.ruleExplore is String) {
+ GSON.fromJsonObject(sourceAny.ruleExplore.toString())
+ } else {
+ GSON.fromJsonObject(GSON.toJson(sourceAny.ruleExplore))
+ }
+ source.searchUrl = sourceAny.searchUrl
+ source.ruleSearch = if (sourceAny.ruleSearch is String) {
+ GSON.fromJsonObject(sourceAny.ruleSearch.toString())
+ } else {
+ GSON.fromJsonObject(GSON.toJson(sourceAny.ruleSearch))
+ }
+ source.ruleBookInfo = if (sourceAny.ruleBookInfo is String) {
+ GSON.fromJsonObject(sourceAny.ruleBookInfo.toString())
+ } else {
+ GSON.fromJsonObject(GSON.toJson(sourceAny.ruleBookInfo))
+ }
+ source.ruleToc = if (sourceAny.ruleToc is String) {
+ GSON.fromJsonObject(sourceAny.ruleToc.toString())
+ } else {
+ GSON.fromJsonObject(GSON.toJson(sourceAny.ruleToc))
+ }
+ source.ruleContent = if (sourceAny.ruleContent is String) {
+ GSON.fromJsonObject(sourceAny.ruleContent.toString())
+ } else {
+ GSON.fromJsonObject(GSON.toJson(sourceAny.ruleContent))
+ }
+ }
+ } catch (e: Exception) {
+ Log.e("SourceAnalyzer", "" + e.localizedMessage)
+ }
+ return source
+ }
+
+ @Keep
+ data class BookSourceAny(
+ var bookSourceName: String = "", // 名称
+ var bookSourceGroup: String? = null, // 分组
+ var bookSourceUrl: String = "", // 地址，包括 http/https
+ var bookSourceType: Int = BookType.default, // 类型，0 文本，1 音频
+ var bookUrlPattern: String? = null, // 详情页url正则
+ var customOrder: Int = 0, // 手动排序编号
+ var enabled: Boolean = true, // 是否启用
+ var enabledExplore: Boolean = true, // 启用发现
+ var concurrentRate: String? = null, // 并发率
+ var header: String? = null, // 请求头
+ var loginUrl: Any? = null, // 登录规则
+ var loginUi: Any? = null, // 登录UI
+ var loginCheckJs: String? = null, //登录检测js
+ var bookSourceComment: String? = "", //书源注释
+ var lastUpdateTime: Long = 0, // 最后更新时间，用于排序
+ var respondTime: Long = 180000L, // 响应时间，用于排序
+ var weight: Int = 0, // 智能排序的权重
+ var exploreUrl: String? = null, // 发现url
+ var ruleExplore: Any? = null, // 发现规则
+ var searchUrl: String? = null, // 搜索url
+ var ruleSearch: Any? = null, // 搜索规则
+ var ruleBookInfo: Any? = null, // 书籍信息页规则
+ var ruleToc: Any? = null, // 目录页规则
+ var ruleContent: Any? = null // 正文页规则
+ )
+
+ // default规则适配
+ // #正则#替换内容 替换成 ##正则##替换内容
+ // | 替换成 ||
+ // & 替换成 &&
+ private fun toNewRule(oldRule: String?): String? {
+ if (oldRule.isNullOrBlank()) return null
+ var newRule = oldRule
+ var reverse = false
+ var allinone = false
+ if (oldRule.startsWith("-")) {
+ reverse = true
+ newRule = oldRule.substring(1)
+ }
+ if (newRule.startsWith("+")) {
+ allinone = true
+ newRule = newRule.substring(1)
+ }
+ if (!newRule.startsWith("@CSS:", true) &&
+ !newRule.startsWith("@XPath:", true) &&
+ !newRule.startsWith("//") &&
+ !newRule.startsWith("##") &&
+ !newRule.startsWith(":") &&
+ !newRule.contains("@js:", true) &&
+ !newRule.contains("", true)
+ ) {
+ if (newRule.contains("#") && !newRule.contains("##")) {
+ newRule = oldRule.replace("#", "##")
+ }
+ if (newRule.contains("|") && !newRule.contains("||")) {
+ if (newRule.contains("##")) {
+ val list = newRule.split("##")
+ if (list[0].contains("|")) {
+ newRule = list[0].replace("|", "||")
+ for (i in 1 until list.size) {
+ newRule += "##" + list[i]
+ }
+ }
+ } else {
+ newRule = newRule.replace("|", "||")
+ }
+ }
+ if (newRule.contains("&")
+ && !newRule.contains("&&")
+ && !newRule.contains("http")
+ && !newRule.startsWith("/")
+ ) {
+ newRule = newRule.replace("&", "&&")
+ }
+ }
+ if (allinone) {
+ newRule = "+$newRule"
+ }
+ if (reverse) {
+ newRule = "-$newRule"
+ }
+ return newRule
+ }
+
+ private fun toNewUrls(oldUrls: String?): String? {
+ if (oldUrls.isNullOrBlank()) return null
+ if (oldUrls.startsWith("@js:") || oldUrls.startsWith("")) {
+ return oldUrls
+ }
+ if (!oldUrls.contains("\n") && !oldUrls.contains("&&")) {
+ return toNewUrl(oldUrls)
+ }
+ val urls = oldUrls.split("(&&|\r?\n)+".toRegex())
+ return urls.map {
+ toNewUrl(it)?.replace("\n\\s*".toRegex(), "")
+ }.joinToString("\n")
+ }
+
+ private fun toNewUrl(oldUrl: String?): String? {
+ if (oldUrl.isNullOrBlank()) return null
+ var url: String = oldUrl
+ if (oldUrl.startsWith("", true)) {
+ url = url.replace("=searchKey", "={{key}}")
+ .replace("=searchPage", "={{page}}")
+ return url
+ }
+ val map = HashMap()
+ var mather = headerPattern.matcher(url)
+ if (mather.find()) {
+ val header = mather.group()
+ url = url.replace(header, "")
+ map["headers"] = header.substring(8)
+ }
+ var urlList = url.split("|")
+ url = urlList[0]
+ if (urlList.size > 1) {
+ map["charset"] = urlList[1].split("=")[1]
+ }
+ mather = jsPattern.matcher(url)
+ val jsList = arrayListOf()
+ while (mather.find()) {
+ jsList.add(mather.group())
+ url = url.replace(jsList.last(), "$${jsList.size - 1}")
+ }
+ url = url.replace("{", "<").replace("}", ">")
+ url = url.replace("searchKey", "{{key}}")
+ url = url.replace("".toRegex(), "{{page$1}}")
+ .replace("searchPage([-+]1)".toRegex(), "{{page$1}}")
+ .replace("searchPage", "{{page}}")
+ for ((index, item) in jsList.withIndex()) {
+ url = url.replace(
+ "$$index",
+ item.replace("searchKey", "key").replace("searchPage", "page")
+ )
+ }
+ urlList = url.split("@")
+ url = urlList[0]
+ if (urlList.size > 1) {
+ map["method"] = "POST"
+ map["body"] = urlList[1]
+ }
+ if (map.size > 0) {
+ url += "," + GSON.toJson(map)
+ }
+ return url
+ }
+
+ private fun uaToHeader(ua: String?): String? {
+ if (ua.isNullOrEmpty()) return null
+ val map = mapOf(Pair(APPCONST.UA_NAME, ua))
+ return GSON.toJson(map)
+ }
+
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByJSonPath.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByJSonPath.kt
new file mode 100644
index 0000000..be78dc2
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByJSonPath.kt
@@ -0,0 +1,193 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see (json)
+ else -> JsonPath.parse(json) //JsonPath.parse(json)
+ }
+ }
+ }
+
+ private var ctx: ReadContext = parse(json)
+
+ /**
+ * 改进解析方法
+ * 解决阅读”&&“、”||“与jsonPath支持的”&&“、”||“之间的冲突
+ * 解决{$.rule}形式规则可能匹配错误的问题，旧规则用正则解析内容含‘}’的json文本时，用规则中的字段去匹配这种内容会匹配错误.现改用平衡嵌套方法解决这个问题
+ * */
+ fun getString(rule: String): String? {
+ if (rule.isEmpty()) return null
+ var result: String
+ val ruleAnalyzes = RuleAnalyzer(rule, true) //设置平衡组为代码平衡
+ val rules = ruleAnalyzes.splitRule("&&", "||")
+
+ if (rules.size == 1) {
+
+ ruleAnalyzes.reSetPos() //将pos重置为0，复用解析器
+
+ result = ruleAnalyzes.innerRule("{$.") { getString(it) } //替换所有{$.rule...}
+
+ if (result.isEmpty()) { //st为空，表明无成功替换的内嵌规则
+ try {
+ val ob = ctx.read(rule)
+ result = if (ob is List<*>) {
+ ob.joinToString("\n")
+ } else {
+ ob.toString()
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, e.toString())
+ }
+ }
+ return result
+ } else {
+ val textList = arrayListOf()
+ for (rl in rules) {
+ val temp = getString(rl)
+ if (!temp.isNullOrEmpty()) {
+ textList.add(temp)
+ if (ruleAnalyzes.elementsType == "||") {
+ break
+ }
+ }
+ }
+ return textList.joinToString("\n")
+ }
+ }
+
+ internal fun getStringList(rule: String): List {
+ val result = ArrayList()
+ if (rule.isEmpty()) return result
+ val ruleAnalyzes = RuleAnalyzer(rule, true) //设置平衡组为代码平衡
+ val rules = ruleAnalyzes.splitRule("&&", "||", "%%")
+
+ if (rules.size == 1) {
+ ruleAnalyzes.reSetPos() //将pos重置为0，复用解析器
+ val st = ruleAnalyzes.innerRule("{$.") { getString(it) } //替换所有{$.rule...}
+ if (st.isEmpty()) { //st为空，表明无成功替换的内嵌规则
+ try {
+ val obj = ctx.read(rule)
+ if (obj is List<*>) {
+ for (o in obj) result.add(o.toString())
+ } else {
+ result.add(obj.toString())
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, e.toString())
+ }
+ } else {
+ result.add(st)
+ }
+ return result
+ } else {
+ val results = ArrayList>()
+ for (rl in rules) {
+ val temp = getStringList(rl)
+ if (temp.isNotEmpty()) {
+ results.add(temp)
+ if (temp.isNotEmpty() && ruleAnalyzes.elementsType == "||") {
+ break
+ }
+ }
+ }
+ if (results.size > 0) {
+ if ("%%" == ruleAnalyzes.elementsType) {
+ for (i in results[0].indices) {
+ for (temp in results) {
+ if (i < temp.size) {
+ result.add(temp[i])
+ }
+ }
+ }
+ } else {
+ for (temp in results) {
+ result.addAll(temp)
+ }
+ }
+ }
+ return result
+ }
+ }
+
+ internal fun getObject(rule: String): Any {
+ return ctx.read(rule)
+ }
+
+ internal fun getList(rule: String): ArrayList? {
+ val result = ArrayList()
+ if (rule.isEmpty()) return result
+ val ruleAnalyzes = RuleAnalyzer(rule, true) //设置平衡组为代码平衡
+ val rules = ruleAnalyzes.splitRule("&&", "||", "%%")
+ if (rules.size == 1) {
+ ctx.let {
+ try {
+ return it.read>(rules[0])
+ } catch (e: Exception) {
+ Log.e(TAG, e.toString())
+ }
+ }
+ } else {
+ val results = ArrayList>()
+ for (rl in rules) {
+ val temp = getList(rl)
+ if (temp != null && temp.isNotEmpty()) {
+ results.add(temp)
+ if (temp.isNotEmpty() && ruleAnalyzes.elementsType == "||") {
+ break
+ }
+ }
+ }
+ if (results.size > 0) {
+ if ("%%" == ruleAnalyzes.elementsType) {
+ for (i in 0 until results[0].size) {
+ for (temp in results) {
+ if (i < temp.size) {
+ temp[i]?.let { result.add(it) }
+ }
+ }
+ }
+ } else {
+ for (temp in results) {
+ result.addAll(temp)
+ }
+ }
+ }
+ }
+ return result
+ }
+
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByJSoup.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByJSoup.kt
new file mode 100644
index 0000000..ea5f432
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByJSoup.kt
@@ -0,0 +1,510 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see {
+
+ val textS = ArrayList()
+
+ if (ruleStr.isEmpty()) return textS
+
+ //拆分规则
+ val sourceRule = SourceRule(ruleStr)
+
+ if (sourceRule.elementsRule.isEmpty()) {
+
+ textS.add(element.data() ?: "")
+
+ } else {
+
+ val ruleAnalyzes = RuleAnalyzer(sourceRule.elementsRule)
+ val ruleStrS = ruleAnalyzes.splitRule("&&", "||", "%%")
+
+ val results = ArrayList>()
+ for (ruleStrX in ruleStrS) {
+
+ val temp: ArrayList? =
+ if (sourceRule.isCss) {
+ val lastIndex = ruleStrX.lastIndexOf('@')
+ getResultLast(
+ element.select(ruleStrX.substring(0, lastIndex)),
+ ruleStrX.substring(lastIndex + 1)
+ )
+ } else {
+ getResultList(ruleStrX)
+ }
+
+ if (!temp.isNullOrEmpty()) {
+ results.add(temp)
+ if (ruleAnalyzes.elementsType == "||") break
+ }
+ }
+ if (results.size > 0) {
+ if ("%%" == ruleAnalyzes.elementsType) {
+ for (i in results[0].indices) {
+ for (temp in results) {
+ if (i < temp.size) {
+ textS.add(temp[i])
+ }
+ }
+ }
+ } else {
+ for (temp in results) {
+ textS.addAll(temp)
+ }
+ }
+ }
+ }
+ return textS
+ }
+
+ /**
+ * 获取Elements
+ */
+ private fun getElements(temp: Element?, rule: String): Elements {
+
+ if (temp == null || rule.isEmpty()) return Elements()
+
+ val elements = Elements()
+
+ val sourceRule = SourceRule(rule)
+ val ruleAnalyzes = RuleAnalyzer(sourceRule.elementsRule)
+ val ruleStrS = ruleAnalyzes.splitRule("&&", "||", "%%")
+
+ val elementsList = ArrayList()
+ if (sourceRule.isCss) {
+ for (ruleStr in ruleStrS) {
+ val tempS = temp.select(ruleStr)
+ elementsList.add(tempS)
+ if (tempS.size > 0 && ruleAnalyzes.elementsType == "||") {
+ break
+ }
+ }
+ } else {
+ for (ruleStr in ruleStrS) {
+
+ val rsRule = RuleAnalyzer(ruleStr)
+
+ rsRule.trim() // 修剪当前规则之前的"@"或者空白符
+
+ val rs = rsRule.splitRule("@")
+
+ val el = if (rs.size > 1) {
+ val el = Elements()
+ el.add(temp)
+ for (rl in rs) {
+ val es = Elements()
+ for (et in el) {
+ es.addAll(getElements(et, rl))
+ }
+ el.clear()
+ el.addAll(es)
+ }
+ el
+ } else ElementsSingle().getElementsSingle(temp, ruleStr)
+
+ elementsList.add(el)
+ if (el.size > 0 && ruleAnalyzes.elementsType == "||") {
+ break
+ }
+ }
+ }
+ if (elementsList.size > 0) {
+ if ("%%" == ruleAnalyzes.elementsType) {
+ for (i in 0 until elementsList[0].size) {
+ for (es in elementsList) {
+ if (i < es.size) {
+ elements.add(es[i])
+ }
+ }
+ }
+ } else {
+ for (es in elementsList) {
+ elements.addAll(es)
+ }
+ }
+ }
+ return elements
+ }
+
+ /**
+ * 获取内容列表
+ */
+ private fun getResultList(ruleStr: String): ArrayList? {
+
+ if (ruleStr.isEmpty()) return null
+
+ var elements = Elements()
+
+ elements.add(element)
+
+ val rule = RuleAnalyzer(ruleStr) //创建解析
+
+ rule.trim() //修建前置赘余符号
+
+ val rules = rule.splitRule("@") // 切割成列表
+
+ val last = rules.size - 1
+ for (i in 0 until last) {
+ val es = Elements()
+ for (elt in elements) {
+ es.addAll(ElementsSingle().getElementsSingle(elt, rules[i]))
+ }
+ elements.clear()
+ elements = es
+ }
+ return if (elements.isEmpty()) null else getResultLast(elements, rules[last])
+ }
+
+ /**
+ * 根据最后一个规则获取内容
+ */
+ private fun getResultLast(elements: Elements, lastRule: String): ArrayList {
+ val textS = ArrayList()
+ when (lastRule) {
+ "text" -> for (element in elements) {
+ val text = element.text()
+ if (text.isNotEmpty()) {
+ textS.add(text)
+ }
+ }
+ "textNodes" -> for (element in elements) {
+ val tn = arrayListOf()
+ val contentEs = element.textNodes()
+ for (item in contentEs) {
+ val text = item.text().trim { it <= ' ' }
+ if (text.isNotEmpty()) {
+ tn.add(text)
+ }
+ }
+ if (tn.isNotEmpty()) {
+ textS.add(tn.joinToString("\n"))
+ }
+ }
+ "ownText" -> for (element in elements) {
+ val text = element.ownText()
+ if (text.isNotEmpty()) {
+ textS.add(text)
+ }
+ }
+ "html" -> {
+ elements.select("script").remove()
+ elements.select("style").remove()
+ val html = elements.outerHtml()
+ if (html.isNotEmpty()) {
+ textS.add(html)
+ }
+ }
+ "all" -> textS.add(elements.outerHtml())
+ else -> for (element in elements) {
+
+ val url = element.attr(lastRule)
+
+ if (url.isBlank() || textS.contains(url)) continue
+
+ textS.add(url)
+ }
+ }
+ return textS
+ }
+
+ /**
+ * 1.支持阅读原有写法，':'分隔索引，!或.表示筛选方式，索引可为负数
+ * 例如 tag.div.-1:10:2 或 tag.div!0:3
+ *
+ * 2. 支持与jsonPath类似的[]索引写法
+ * 格式形如 [it,it，。。。] 或 [!it,it，。。。] 其中[!开头表示筛选方式为排除，it为单个索引或区间。
+ * 区间格式为 start:end 或 start:end:step，其中start为0可省略，end为-1可省略。
+ * 索引，区间两端及间隔都支持负数
+ * 例如 tag.div[-1, 3:-2:-10, 2]
+ * 特殊用法 tag.div[-1:0] 可在任意地方让列表反向
+ * */
+ @Suppress("UNCHECKED_CAST")
+ data class ElementsSingle(
+ var split: Char = '.',
+ var beforeRule: String = "",
+ val indexDefault: MutableList = mutableListOf(),
+ val indexes: MutableList = mutableListOf()
+ ) {
+ /**
+ * 获取Elements按照一个规则
+ */
+ fun getElementsSingle(temp: Element, rule: String): Elements {
+
+ findIndexSet(rule) //执行索引列表处理器
+
+ /**
+ * 获取所有元素
+ * */
+ var elements =
+ if (beforeRule.isEmpty()) temp.children() //允许索引直接作为根元素，此时前置规则为空，效果与children相同
+ else {
+ val rules = beforeRule.split(".")
+ when (rules[0]) {
+ "children" -> temp.children() //允许索引直接作为根元素，此时前置规则为空，效果与children相同
+ "class" -> temp.getElementsByClass(rules[1])
+ "tag" -> temp.getElementsByTag(rules[1])
+ "id" -> Collector.collect(Evaluator.Id(rules[1]), temp)
+ "text" -> temp.getElementsContainingOwnText(rules[1])
+ else -> temp.select(beforeRule)
+ }
+ }
+
+ val len = elements.size
+ val lastIndexes = (indexDefault.size - 1).takeIf { it != -1 } ?: indexes.size - 1
+ val indexSet = mutableSetOf()
+
+ /**
+ * 获取无重且不越界的索引集合
+ * */
+ if (indexes.isEmpty()) for (ix in lastIndexes downTo 0) { //indexes为空，表明是非[]式索引，集合是逆向遍历插入的，所以这里也逆向遍历，好还原顺序
+
+ val it = indexDefault[ix]
+ if (it in 0 until len) indexSet.add(it) //将正数不越界的索引添加到集合
+ else if (it < 0 && len >= -it) indexSet.add(it + len) //将负数不越界的索引添加到集合
+
+ } else for (ix in lastIndexes downTo 0) { //indexes不空，表明是[]式索引，集合是逆向遍历插入的，所以这里也逆向遍历，好还原顺序
+
+ if (indexes[ix] is Triple<*, *, *>) { //区间
+ val (startX, endX, stepX) = indexes[ix] as Triple //还原储存时的类型
+
+ val start = if (startX == null) 0 //左端省略表示0
+ else if (startX >= 0) if (startX < len) startX else len - 1 //右端越界，设置为最大索引
+ else if (-startX <= len) len + startX /* 将负索引转正 */ else 0 //左端越界，设置为最小索引
+
+ val end = if (endX == null) len - 1 //右端省略表示 len - 1
+ else if (endX >= 0) if (endX < len) endX else len - 1 //右端越界，设置为最大索引
+ else if (-endX <= len) len + endX /* 将负索引转正 */ else 0 //左端越界，设置为最小索引
+
+ if (start == end || stepX >= len) { //两端相同，区间里只有一个数。或间隔过大，区间实际上仅有首位
+
+ indexSet.add(start)
+ continue
+
+ }
+
+ val step =
+ if (stepX > 0) stepX else if (-stepX < len) stepX + len else 1 //最小正数间隔为1
+
+ //将区间展开到集合中,允许列表反向。
+ indexSet.addAll(if (end > start) start..end step step else start downTo end step step)
+
+ } else {//单个索引
+
+ val it = indexes[ix] as Int //还原储存时的类型
+
+ if (it in 0 until len) indexSet.add(it) //将正数不越界的索引添加到集合
+ else if (it < 0 && len >= -it) indexSet.add(it + len) //将负数不越界的索引添加到集合
+
+ }
+
+ }
+
+ /**
+ * 根据索引集合筛选元素
+ * */
+ if (split == '!') { //排除
+
+ for (pcInt in indexSet) elements[pcInt] = null
+
+ elements.removeAll(listOf(null)) //测试过，这样就行
+
+ } else if (split == '.') { //选择
+
+ val es = Elements()
+
+ for (pcInt in indexSet) es.add(elements[pcInt])
+
+ elements = es
+
+ }
+
+ return elements //返回筛选结果
+
+ }
+
+ private fun findIndexSet(rule: String) {
+
+ val rus = rule.trim { it <= ' ' }
+
+ var len = rus.length
+ var curInt: Int? //当前数字
+ var curMinus = false //当前数字是否为负
+ val curList = mutableListOf() //当前数字区间
+ var l = "" //暂存数字字符串
+
+ val head = rus.last() == ']' //是否为常规索引写法
+
+ if (head) { //常规索引写法[index...]
+
+ len-- //跳过尾部']'
+
+ while (len-- >= 0) { //逆向遍历,可以无前置规则
+
+ var rl = rus[len]
+ if (rl == ' ') continue //跳过空格
+
+ if (rl in '0'..'9') l = rl + l //将数值累接入临时字串中，遇到分界符才取出
+ else if (rl == '-') curMinus = true
+ else {
+
+ curInt =
+ if (l.isEmpty()) null else if (curMinus) -l.toInt() else l.toInt() //当前数字
+
+ when (rl) {
+
+ ':' -> curList.add(curInt) //区间右端或区间间隔
+
+ else -> {
+
+ //为保证查找顺序，区间和单个索引都添加到同一集合
+ if (curList.isEmpty()) {
+
+ if (curInt == null) break //是jsoup选择器而非索引列表，跳出
+
+ indexes.add(curInt)
+ } else {
+
+ //列表最后压入的是区间右端，若列表有两位则最先压入的是间隔
+ indexes.add(
+ Triple(
+ curInt,
+ curList.last(),
+ if (curList.size == 2) curList.first() else 1
+ )
+ )
+
+ curList.clear() //重置临时列表，避免影响到下个区间的处理
+
+ }
+
+ if (rl == '!') {
+ split = '!'
+ do {
+ rl = rus[--len]
+ } while (len > 0 && rl == ' ')//跳过所有空格
+ }
+
+ if (rl == '[') {
+ beforeRule = rus.substring(0, len) //遇到索引边界，返回结果
+ return
+ }
+
+ if (rl != ',') break //非索引结构，跳出
+
+ }
+ }
+
+ l = "" //清空
+ curMinus = false //重置
+ }
+ }
+ } else while (len-- >= 0) { //阅读原本写法，逆向遍历,可以无前置规则
+
+ val rl = rus[len]
+ if (rl == ' ') continue //跳过空格
+
+ if (rl in '0'..'9') l = rl + l //将数值累接入临时字串中，遇到分界符才取出
+ else if (rl == '-') curMinus = true
+ else {
+
+ if (rl == '!' || rl == '.' || rl == ':') { //分隔符或起始符
+
+ indexDefault.add(if (curMinus) -l.toInt() else l.toInt()) // 当前数字追加到列表
+
+ if (rl != ':') { //rl == '!' || rl == '.'
+ split = rl
+ beforeRule = rus.substring(0, len)
+ return
+ }
+
+ } else break //非索引结构，跳出循环
+
+ l = "" //清空
+ curMinus = false //重置
+ }
+
+ }
+
+ split = ' '
+ beforeRule = rus
+ }
+ }
+
+
+ internal inner class SourceRule(ruleStr: String) {
+ var isCss = false
+ var elementsRule: String = if (ruleStr.startsWith("@CSS:", true)) {
+ isCss = true
+ ruleStr.substring(5).trim { it <= ' ' }
+ } else {
+ ruleStr
+ }
+ }
+
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByRegex.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByRegex.kt
new file mode 100644
index 0000000..2518f21
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByRegex.kt
@@ -0,0 +1,79 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see , index: Int = 0): List? {
+ var vIndex = index
+ val resM = Pattern.compile(regs[vIndex]).matcher(res)
+ if (!resM.find()) {
+ return null
+ }
+ // 判断索引的规则是最后一个规则
+ return if (vIndex + 1 == regs.size) {
+ // 新建容器
+ val info = arrayListOf()
+ for (groupIndex in 0..resM.groupCount()) {
+ info.add(resM.group(groupIndex)!!)
+ }
+ info
+ } else {
+ val result = StringBuilder()
+ do {
+ result.append(resM.group())
+ } while (resM.find())
+ getElement(result.toString(), regs, ++vIndex)
+ }
+ }
+
+ fun getElements(res: String, regs: Array, index: Int = 0): List> {
+ var vIndex = index
+ val resM = Pattern.compile(regs[vIndex]).matcher(res)
+ if (!resM.find()) {
+ return arrayListOf()
+ }
+ // 判断索引的规则是最后一个规则
+ if (vIndex + 1 == regs.size) {
+ // 创建书息缓存数组
+ val books = ArrayList>()
+ // 提取列表
+ do {
+ // 新建容器
+ val info = arrayListOf()
+ for (groupIndex in 0..resM.groupCount()) {
+ info.add(resM.group(groupIndex)!!)
+ }
+ books.add(info)
+ } while (resM.find())
+ return books
+ } else {
+ val result = StringBuilder()
+ do {
+ result.append(resM.group())
+ } while (resM.find())
+ return getElements(result.toString(), regs, ++vIndex)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByXPath.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByXPath.kt
new file mode 100644
index 0000000..ba2e54d
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeByXPath.kt
@@ -0,0 +1,167 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see ${html1} "
+ }
+ if (html1.endsWith("") || html1.endsWith("")) {
+ html1 = ""
+ }
+ return JXDocument.create(html1)
+ }
+
+ private fun getResult(xPath: String): List? {
+ val node = jxNode
+ return if (node is JXNode) {
+ node.sel(xPath)
+ } else {
+ (node as JXDocument).selN(xPath)
+ }
+ }
+
+ internal fun getElements(xPath: String): List? {
+
+ if (xPath.isEmpty()) return null
+
+ val jxNodes = ArrayList()
+ val ruleAnalyzes = RuleAnalyzer(xPath)
+ val rules = ruleAnalyzes.splitRule("&&", "||", "%%")
+
+ if (rules.size == 1) {
+ return getResult(rules[0])
+ } else {
+ val results = ArrayList>()
+ for (rl in rules) {
+ val temp = getElements(rl)
+ if (temp != null && temp.isNotEmpty()) {
+ results.add(temp)
+ if (temp.isNotEmpty() && ruleAnalyzes.elementsType == "||") {
+ break
+ }
+ }
+ }
+ if (results.size > 0) {
+ if ("%%" == ruleAnalyzes.elementsType) {
+ for (i in results[0].indices) {
+ for (temp in results) {
+ if (i < temp.size) {
+ jxNodes.add(temp[i])
+ }
+ }
+ }
+ } else {
+ for (temp in results) {
+ jxNodes.addAll(temp)
+ }
+ }
+ }
+ }
+ return jxNodes
+ }
+
+ internal fun getStringList(xPath: String): List {
+
+ val result = ArrayList()
+ val ruleAnalyzes = RuleAnalyzer(xPath)
+ val rules = ruleAnalyzes.splitRule("&&", "||", "%%")
+
+ if (rules.size == 1) {
+ getResult(xPath)?.map {
+ result.add(it.asString())
+ }
+ return result
+ } else {
+ val results = ArrayList>()
+ for (rl in rules) {
+ val temp = getStringList(rl)
+ if (temp.isNotEmpty()) {
+ results.add(temp)
+ if (temp.isNotEmpty() && ruleAnalyzes.elementsType == "||") {
+ break
+ }
+ }
+ }
+ if (results.size > 0) {
+ if ("%%" == ruleAnalyzes.elementsType) {
+ for (i in results[0].indices) {
+ for (temp in results) {
+ if (i < temp.size) {
+ result.add(temp[i])
+ }
+ }
+ }
+ } else {
+ for (temp in results) {
+ result.addAll(temp)
+ }
+ }
+ }
+ }
+ return result
+ }
+
+ fun getString(rule: String): String? {
+ val ruleAnalyzes = RuleAnalyzer(rule)
+ val rules = ruleAnalyzes.splitRule("&&", "||")
+ if (rules.size == 1) {
+ getResult(rule)?.let {
+ return TextUtils.join("\n", it)
+ }
+ return null
+ } else {
+ val textList = arrayListOf()
+ for (rl in rules) {
+ val temp = getString(rl)
+ if (!temp.isNullOrEmpty()) {
+ textList.add(temp)
+ if (ruleAnalyzes.elementsType == "||") {
+ break
+ }
+ }
+ }
+ return textList.joinToString("\n")
+ }
+ }
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeRule.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeRule.kt
new file mode 100644
index 0000000..6432378
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeRule.kt
@@ -0,0 +1,712 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see ? {
+ if (rule.isNullOrEmpty()) return null
+ val ruleList = splitSourceRule(rule, false)
+ return getStringList(ruleList, mContent, isUrl)
+ }
+
+ @JvmOverloads
+ fun getStringList(
+ ruleList: List,
+ mContent: Any? = null,
+ isUrl: Boolean = false
+ ): List? {
+ var result: Any? = null
+ val content = mContent ?: this.content
+ if (content != null && ruleList.isNotEmpty()) {
+ result = content
+ if (content is NativeObject) {
+ result = content[ruleList[0].rule]?.toString()
+ } else {
+ for (sourceRule in ruleList) {
+ putRule(sourceRule.putMap)
+ sourceRule.makeUpRule(result)
+ result?.let {
+ if (sourceRule.rule.isNotEmpty()) {
+ result = when (sourceRule.mode) {
+ Mode.Js -> evalJS(sourceRule.rule, result)
+ Mode.Json -> getAnalyzeByJSonPath(it).getStringList(sourceRule.rule)
+ Mode.XPath -> getAnalyzeByXPath(it).getStringList(sourceRule.rule)
+ Mode.Default -> getAnalyzeByJSoup(it).getStringList(sourceRule.rule)
+ else -> sourceRule.rule
+ }
+ }
+ if (sourceRule.replaceRegex.isNotEmpty() && result is List<*>) {
+ val newList = ArrayList()
+ for (item in result as List<*>) {
+ newList.add(replaceRegex(item.toString(), sourceRule))
+ }
+ result = newList
+ } else if (sourceRule.replaceRegex.isNotEmpty()) {
+ result = replaceRegex(result.toString(), sourceRule)
+ }
+ }
+ }
+ }
+ }
+ if (result == null) return null
+ if (result is String) {
+ result = (result as String).split("\n")
+ }
+ if (isUrl) {
+ val urlList = ArrayList()
+ if (result is List<*>) {
+ for (url in result as List<*>) {
+ val absoluteURL = NetworkUtils.getAbsoluteURL(redirectUrl, url.toString())
+ if (absoluteURL.isNotEmpty() && !urlList.contains(absoluteURL)) {
+ urlList.add(absoluteURL)
+ }
+ }
+ }
+ return urlList
+ }
+ @Suppress("UNCHECKED_CAST")
+ return result as? List
+ }
+
+ /**
+ * 获取文本
+ */
+ @JvmOverloads
+ fun getString(ruleStr: String?, mContent: Any? = null, isUrl: Boolean = false): String {
+ if (TextUtils.isEmpty(ruleStr)) return ""
+ val ruleList = splitSourceRule(ruleStr)
+ return getString(ruleList, mContent, isUrl)
+ }
+
+ @JvmOverloads
+ fun getString(
+ ruleList: List,
+ mContent: Any? = null,
+ isUrl: Boolean = false
+ ): String {
+ var result: Any? = null
+ val content = mContent ?: this.content
+ if (content != null && ruleList.isNotEmpty()) {
+ result = content
+ if (result is NativeObject) {
+ result = result[ruleList[0].rule]?.toString()
+ } else {
+ for (sourceRule in ruleList) {
+ putRule(sourceRule.putMap)
+ sourceRule.makeUpRule(result)
+ result?.let {
+ if (sourceRule.rule.isNotBlank() || sourceRule.replaceRegex.isEmpty()) {
+ result = when (sourceRule.mode) {
+ Mode.Js -> evalJS(sourceRule.rule, it)
+ Mode.Json -> getAnalyzeByJSonPath(it).getString(sourceRule.rule)
+ Mode.XPath -> getAnalyzeByXPath(it).getString(sourceRule.rule)
+ Mode.Default -> if (isUrl) {
+ getAnalyzeByJSoup(it).getString0(sourceRule.rule)
+ } else {
+ getAnalyzeByJSoup(it).getString(sourceRule.rule)
+ }
+ else -> sourceRule.rule
+ }
+ }
+ if ((result != null) && sourceRule.replaceRegex.isNotEmpty()) {
+ result = replaceRegex(result.toString(), sourceRule)
+ }
+ }
+ }
+ }
+ }
+ if (result == null) result = ""
+ val str = kotlin.runCatching {
+ Entities.unescape(result.toString())
+ }.onFailure {
+ log("Entities.unescape() error\n${it.localizedMessage}")
+ }.getOrElse {
+ result.toString()
+ }
+ if (isUrl) {
+ return if (str.isBlank()) {
+ baseUrl ?: ""
+ } else {
+ NetworkUtils.getAbsoluteURL(redirectUrl, str)
+ }
+ }
+ return str
+ }
+
+ /**
+ * 获取Element
+ */
+ fun getElement(ruleStr: String): Any? {
+ if (TextUtils.isEmpty(ruleStr)) return null
+ var result: Any? = null
+ val content = this.content
+ val ruleList = splitSourceRule(ruleStr, true)
+ if (content != null && ruleList.isNotEmpty()) {
+ result = content
+ for (sourceRule in ruleList) {
+ putRule(sourceRule.putMap)
+ sourceRule.makeUpRule(result)
+ result?.let {
+ result = when (sourceRule.mode) {
+ Mode.Regex -> AnalyzeByRegex.getElement(
+ result.toString(),
+ sourceRule.rule.splitNotBlank("&&")
+ )
+ Mode.Js -> evalJS(sourceRule.rule, it)
+ Mode.Json -> getAnalyzeByJSonPath(it).getObject(sourceRule.rule)
+ Mode.XPath -> getAnalyzeByXPath(it).getElements(sourceRule.rule)
+ else -> getAnalyzeByJSoup(it).getElements(sourceRule.rule)
+ }
+ if (sourceRule.replaceRegex.isNotEmpty()) {
+ result = replaceRegex(result.toString(), sourceRule)
+ }
+ }
+ }
+ }
+ return result
+ }
+
+ /**
+ * 获取列表
+ */
+ @Suppress("UNCHECKED_CAST")
+ fun getElements(ruleStr: String): List {
+ var result: Any? = null
+ val content = this.content
+ val ruleList = splitSourceRule(ruleStr, true)
+ if (content != null && ruleList.isNotEmpty()) {
+ result = content
+ for (sourceRule in ruleList) {
+ putRule(sourceRule.putMap)
+ result?.let {
+ result = when (sourceRule.mode) {
+ Mode.Regex -> AnalyzeByRegex.getElements(
+ result.toString(),
+ sourceRule.rule.splitNotBlank("&&")
+ )
+ Mode.Js -> evalJS(sourceRule.rule, result)
+ Mode.Json -> getAnalyzeByJSonPath(it).getList(sourceRule.rule)
+ Mode.XPath -> getAnalyzeByXPath(it).getElements(sourceRule.rule)
+ else -> getAnalyzeByJSoup(it).getElements(sourceRule.rule)
+ }
+ if (sourceRule.replaceRegex.isNotEmpty()) {
+ result = replaceRegex(result.toString(), sourceRule)
+ }
+ }
+ }
+ }
+ result?.let {
+ return it as List
+ }
+ return ArrayList()
+ }
+
+ /**
+ * 保存变量
+ */
+ private fun putRule(map: Map) {
+ for ((key, value) in map) {
+ put(key, getString(value))
+ }
+ }
+
+ /**
+ * 分离put规则
+ */
+ private fun splitPutRule(ruleStr: String, putMap: HashMap): String {
+ var vRuleStr = ruleStr
+ val putMatcher = putPattern.matcher(vRuleStr)
+ while (putMatcher.find()) {
+ vRuleStr = vRuleStr.replace(putMatcher.group(), "")
+ val map = GSON.fromJsonObject>(putMatcher.group(1))
+ map?.let { putMap.putAll(map) }
+ }
+ return vRuleStr
+ }
+
+ /**
+ * 正则替换
+ */
+ private fun replaceRegex(result: String, rule: SourceRule): String {
+ if (rule.replaceRegex.isEmpty()) return result
+ var vResult = result
+ vResult = if (rule.replaceFirst) {
+ kotlin.runCatching {
+ val pattern = Pattern.compile(rule.replaceRegex)
+ val matcher = pattern.matcher(vResult)
+ if (matcher.find()) {
+ matcher.group(0)!!.replaceFirst(rule.replaceRegex.toRegex(), rule.replacement)
+ } else {
+ ""
+ }
+ }.getOrElse {
+ vResult.replaceFirst(rule.replaceRegex, rule.replacement)
+ }
+ } else {
+ kotlin.runCatching {
+ vResult.replace(rule.replaceRegex.toRegex(), rule.replacement)
+ }.getOrElse {
+ vResult.replace(rule.replaceRegex, rule.replacement)
+ }
+ }
+ return vResult
+ }
+
+ /**
+ * 分解规则生成规则列表
+ */
+ fun splitSourceRule(ruleStr: String?, allInOne: Boolean = false): List {
+ if (ruleStr.isNullOrEmpty()) return ArrayList()
+ val ruleList = ArrayList()
+ var mMode: Mode = Mode.Default
+ var start = 0
+ //仅首字符为:时为AllInOne，其实:与伪类选择器冲突，建议改成?更合理
+ if (allInOne && ruleStr.startsWith(":")) {
+ mMode = Mode.Regex
+ isRegex = true
+ start = 1
+ } else if (isRegex) {
+ mMode = Mode.Regex
+ }
+ var tmp: String
+ val jsMatcher = JS_PATTERN_3.matcher(ruleStr)
+ while (jsMatcher.find()) {
+ if (jsMatcher.start() > start) {
+ tmp = ruleStr.substring(start, jsMatcher.start()).trim { it <= ' ' }
+ if (tmp.isNotEmpty()) {
+ ruleList.add(SourceRule(tmp, mMode))
+ }
+ }
+ ruleList.add(SourceRule(jsMatcher.group(2) ?: jsMatcher.group(1), Mode.Js))
+ start = jsMatcher.end()
+ }
+
+ if (ruleStr.length > start) {
+ tmp = ruleStr.substring(start).trim { it <= ' ' }
+ if (tmp.isNotEmpty()) {
+ ruleList.add(SourceRule(tmp, mMode))
+ }
+ }
+
+ return ruleList
+ }
+
+ /**
+ * 规则类
+ */
+ inner class SourceRule internal constructor(
+ ruleStr: String,
+ internal var mode: Mode = Mode.Default
+ ) {
+ internal var rule: String
+ internal var replaceRegex = ""
+ internal var replacement = ""
+ internal var replaceFirst = false
+ internal val putMap = HashMap()
+ private val ruleParam = ArrayList()
+ private val ruleType = ArrayList()
+ private val getRuleType = -2
+ private val jsRuleType = -1
+ private val defaultRuleType = 0
+
+ init {
+ rule = when {
+ mode == Mode.Js || mode == Mode.Regex -> ruleStr
+ ruleStr.startsWith("@CSS:", true) -> {
+ mode = Mode.Default
+ ruleStr
+ }
+ ruleStr.startsWith("@@") -> {
+ mode = Mode.Default
+ ruleStr.substring(2)
+ }
+ ruleStr.startsWith("@XPath:", true) -> {
+ mode = Mode.XPath
+ ruleStr.substring(7)
+ }
+ ruleStr.startsWith("@Json:", true) -> {
+ mode = Mode.Json
+ ruleStr.substring(6)
+ }
+ isJSON || ruleStr.startsWith("$.") || ruleStr.startsWith("$[") -> {
+ mode = Mode.Json
+ ruleStr
+ }
+ ruleStr.startsWith("/") -> {//XPath特征很明显,无需配置单独的识别标头
+ mode = Mode.XPath
+ ruleStr
+ }
+ else -> ruleStr
+ }
+ //分离put
+ rule = splitPutRule(rule, putMap)
+ //@get,{{ }}, 拆分
+ var start = 0
+ var tmp: String
+ val evalMatcher = evalPattern.matcher(rule)
+
+ if (evalMatcher.find()) {
+ tmp = rule.substring(start, evalMatcher.start())
+ if (mode != Mode.Js && mode != Mode.Regex &&
+ (evalMatcher.start() == 0 || !tmp.contains("##"))
+ ) {
+ mode = Mode.Regex
+ }
+ do {
+ if (evalMatcher.start() > start) {
+ tmp = rule.substring(start, evalMatcher.start())
+ splitRegex(tmp)
+ }
+ tmp = evalMatcher.group()
+ when {
+ tmp.startsWith("@get:", true) -> {
+ ruleType.add(getRuleType)
+ ruleParam.add(tmp.substring(6, tmp.lastIndex))
+ }
+ tmp.startsWith("{{") -> {
+ ruleType.add(jsRuleType)
+ ruleParam.add(tmp.substring(2, tmp.length - 2))
+ }
+ else -> {
+ splitRegex(tmp)
+ }
+ }
+ start = evalMatcher.end()
+ } while (evalMatcher.find())
+ }
+ if (rule.length > start) {
+ tmp = rule.substring(start)
+ splitRegex(tmp)
+ }
+ }
+
+ /**
+ * 拆分\$\d{1,2}
+ */
+ private fun splitRegex(ruleStr: String) {
+ var start = 0
+ var tmp: String
+ val ruleStrArray = ruleStr.split("##")
+ val regexMatcher = regexPattern.matcher(ruleStrArray[0])
+
+ if (regexMatcher.find()) {
+ if (mode != Mode.Js && mode != Mode.Regex) {
+ mode = Mode.Regex
+ }
+ do {
+ if (regexMatcher.start() > start) {
+ tmp = ruleStr.substring(start, regexMatcher.start())
+ ruleType.add(defaultRuleType)
+ ruleParam.add(tmp)
+ }
+ tmp = regexMatcher.group()
+ ruleType.add(tmp.substring(1).toInt())
+ ruleParam.add(tmp)
+ start = regexMatcher.end()
+ } while (regexMatcher.find())
+ }
+ if (ruleStr.length > start) {
+ tmp = ruleStr.substring(start)
+ ruleType.add(defaultRuleType)
+ ruleParam.add(tmp)
+ }
+ }
+
+ /**
+ * 替换@get,{{ }}
+ */
+ fun makeUpRule(result: Any?) {
+ val infoVal = StringBuilder()
+ if (ruleParam.isNotEmpty()) {
+ var index = ruleParam.size
+ while (index-- > 0) {
+ val regType = ruleType[index]
+ when {
+ regType > defaultRuleType -> {
+ @Suppress("UNCHECKED_CAST")
+ (result as? List)?.run {
+ if (this.size > regType) {
+ this[regType]?.let {
+ infoVal.insert(0, it)
+ }
+ }
+ } ?: infoVal.insert(0, ruleParam[index])
+ }
+ regType == jsRuleType -> {
+ if (isRule(ruleParam[index])) {
+ getString(arrayListOf(SourceRule(ruleParam[index]))).let {
+ infoVal.insert(0, it)
+ }
+ } else {
+ val jsEval: Any? = evalJS(ruleParam[index], result)
+ when {
+ jsEval == null -> Unit
+ jsEval is String -> infoVal.insert(0, jsEval)
+ jsEval is Double && jsEval % 1.0 == 0.0 -> infoVal.insert(
+ 0,
+ String.format("%.0f", jsEval)
+ )
+ else -> infoVal.insert(0, jsEval.toString())
+ }
+ }
+ }
+ regType == getRuleType -> {
+ infoVal.insert(0, get(ruleParam[index]))
+ }
+ else -> infoVal.insert(0, ruleParam[index])
+ }
+ }
+ rule = infoVal.toString()
+ }
+ //分离正则表达式
+ val ruleStrS = rule.split("##")
+ rule = ruleStrS[0].trim()
+ if (ruleStrS.size > 1) {
+ replaceRegex = ruleStrS[1]
+ }
+ if (ruleStrS.size > 2) {
+ replacement = ruleStrS[2]
+ }
+ if (ruleStrS.size > 3) {
+ replaceFirst = true
+ }
+ }
+
+ private fun isRule(ruleStr: String): Boolean {
+ return ruleStr.startsWith('@') //js首个字符不可能是@，除非是装饰器，所以@开头规定为规则
+ || ruleStr.startsWith("$.")
+ || ruleStr.startsWith("$[")
+ || ruleStr.startsWith("//")
+ }
+ }
+
+ enum class Mode {
+ XPath, Json, Default, Js, Regex
+ }
+
+ fun put(key: String, value: String): String {
+ chapter?.putVariable(key, value)
+ ?: book?.putVariable(key, value)
+ ?: ruleData.putVariable(key, value)
+ return value
+ }
+
+ fun get(key: String): String {
+ when (key) {
+ "bookName" -> book?.let {
+ return it.name
+ }
+ "title" -> chapter?.let {
+ return it.title
+ }
+ }
+ return chapter?.variableMap?.get(key)
+ ?: book?.variableMap?.get(key)
+ ?: ruleData.variableMap[key]
+ ?: ""
+ }
+
+ /**
+ * 执行JS
+ */
+ fun evalJS(jsStr: String, result: Any?): Any? {
+ val bindings = SimpleBindings()
+ bindings["java"] = this
+ bindings["cookie"] = CookieStore
+ bindings["cache"] = CacheManager
+ bindings["source"] = source
+ bindings["book"] = book
+ bindings["result"] = result
+ bindings["baseUrl"] = baseUrl
+ bindings["chapter"] = chapter
+ bindings["title"] = chapter?.title
+ bindings["src"] = content
+ bindings["nextChapterUrl"] = nextChapterUrl
+ return SCRIPT_ENGINE.eval(jsStr, bindings)
+ }
+
+ override fun getSource(): BaseSource? {
+ return source
+ }
+
+ /**
+ * js实现跨域访问,不能删
+ */
+ override fun ajax(urlStr: String): String? {
+ return runBlocking {
+ kotlin.runCatching {
+ val analyzeUrl = AnalyzeUrl(urlStr, source = source, ruleData = book)
+ analyzeUrl.getStrResponseAwait().body
+ }.onFailure {
+ log("ajax(${urlStr}) error\n${it.stackTraceToString()}")
+ Log.e(TAG, it.toString())
+ }.getOrElse {
+ it.message
+ }
+ }
+ }
+
+ /**
+ * 章节数转数字
+ */
+ fun toNumChapter(s: String?): String? {
+ s ?: return null
+ val matcher = titleNumPattern.matcher(s)
+ if (matcher.find()) {
+ return "${matcher.group(1)}${StringUtils.stringToInt(matcher.group(2))}${matcher.group(3)}"
+ }
+ return s
+ }
+
+ companion object {
+ private val putPattern = Pattern.compile("@put:(\\{[^}]+?\\})", Pattern.CASE_INSENSITIVE)
+ private val evalPattern =
+ Pattern.compile("@get:\\{[^}]+?\\}|\\{\\{[\\w\\W]*?\\}\\}", Pattern.CASE_INSENSITIVE)
+ private val regexPattern = Pattern.compile("\\$\\d{1,2}")
+ private val titleNumPattern = Pattern.compile("(第)(.+?)(章)")
+ }
+
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeUrl.kt
new file mode 100644
index 0000000..b7d09cb
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/AnalyzeUrl.kt
@@ -0,0 +1,570 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see ? = null,
+) : JsExtensions {
+ companion object {
+ val paramPattern: Pattern = Pattern.compile("\\s*,\\s*(?=\\{)")
+ private val pagePattern = Pattern.compile("<(.*?)>")
+ private val concurrentRecordMap = hashMapOf()
+ }
+
+ var ruleUrl = ""
+ private set
+ var url: String = ""
+ private set
+ var body: String? = null
+ private set
+ var type: String? = null
+ private set
+ val headerMap = HashMap()
+ private var urlNoQuery: String = ""
+ private var queryStr: String? = null
+ private val fieldMap = LinkedHashMap()
+ private var charset: String? = null
+ private var method = RequestMethod.GET
+ private var proxy: String? = null
+ private var retry: Int = 0
+ private var useWebView: Boolean = false
+ private var webJs: String? = null
+
+ init {
+ val urlMatcher = paramPattern.matcher(baseUrl)
+ if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start())
+ headerMapF?.let {
+ headerMap.putAll(it)
+ if (it.containsKey("proxy")) {
+ proxy = it["proxy"]
+ headerMap.remove("proxy")
+ }
+ }
+ initUrl()
+ }
+
+ /**
+ * 处理url
+ */
+ fun initUrl() {
+ ruleUrl = mUrl
+ //执行@js,(ruleUrl.substring(urlMatcher.end()))?.let { option ->
+ option.method?.let {
+ if (it.equals("POST", true)) method = RequestMethod.POST
+ }
+ option.headers?.let { headers ->
+ if (headers is Map<*, *>) {
+ headers.forEach { entry ->
+ headerMap[entry.key.toString()] = entry.value.toString()
+ }
+ } else if (headers is String) {
+ GSON.fromJsonObject>(headers)
+ ?.let { headerMap.putAll(it) }
+ }
+ }
+ option.body?.let {
+ body = if (it is String) it else GSON.toJson(it)
+ }
+ type = option.type
+ charset = option.charset
+ retry = option.retry
+ useWebView = option.webView?.toString()?.isNotBlank() == true
+ webJs = option.webJs
+ option.js?.let { jsStr ->
+ evalJS(jsStr, url)?.toString()?.let {
+ url = it
+ }
+ }
+ }
+ }
+ headerMap[UA_NAME] ?: let {
+ headerMap[UA_NAME] = DEFAULT_USER_AGENT
+ }
+ urlNoQuery = url
+ when (method) {
+ RequestMethod.GET -> {
+ val pos = url.indexOf('?')
+ if (pos != -1) {
+ analyzeFields(url.substring(pos + 1))
+ urlNoQuery = url.substring(0, pos)
+ }
+ }
+ RequestMethod.POST -> body?.let {
+ if (!it.isJson()) {
+ analyzeFields(it)
+ }
+ }
+ }
+ }
+
+ /**
+ * 解析QueryMap
+ */
+ private fun analyzeFields(fieldsTxt: String) {
+ queryStr = fieldsTxt
+ val queryS = fieldsTxt.splitNotBlank("&")
+ for (query in queryS) {
+ val queryM = query.splitNotBlank("=")
+ val value = if (queryM.size > 1) queryM[1] else ""
+ if (charset.isNullOrEmpty()) {
+ if (UrlEncoderUtils.hasUrlEncoded(value)) {
+ fieldMap[queryM[0]] = value
+ } else {
+ fieldMap[queryM[0]] = URLEncoder.encode(value, "UTF-8")
+ }
+ } else if (charset == "escape") {
+ fieldMap[queryM[0]] = EncoderUtils.escape(value)
+ } else {
+ fieldMap[queryM[0]] = URLEncoder.encode(value, charset)
+ }
+ }
+ }
+
+ /**
+ * 执行JS
+ */
+ fun evalJS(jsStr: String, result: Any? = null): Any? {
+ val bindings = SimpleBindings()
+ bindings["java"] = this
+ bindings["baseUrl"] = baseUrl
+ bindings["cookie"] = CookieStore
+ bindings["cache"] = CacheManager
+ bindings["page"] = page
+ bindings["key"] = key
+ bindings["speakText"] = speakText
+ bindings["speakSpeed"] = speakSpeed
+ bindings["book"] = ruleData as? Book
+ bindings["source"] = source
+ bindings["result"] = result
+ return SCRIPT_ENGINE.eval(jsStr, bindings)
+ }
+
+ fun put(key: String, value: String): String {
+ chapter?.putVariable(key, value)
+ ?: ruleData?.putVariable(key, value)
+ return value
+ }
+
+ fun get(key: String): String {
+ when (key) {
+ "bookName" -> (ruleData as? Book)?.let {
+ return it.name
+ }
+ "title" -> chapter?.let {
+ return it.title
+ }
+ }
+ return chapter?.variableMap?.get(key)
+ ?: ruleData?.variableMap?.get(key)
+ ?: ""
+ }
+
+ /**
+ * 开始访问,并发判断
+ */
+ private fun fetchStart(): ConcurrentRecord? {
+ source ?: return null
+ val concurrentRate = source.getConcurrentRateKt()
+ if (concurrentRate.isNullOrEmpty()) {
+ return null
+ }
+ val rateIndex = concurrentRate.indexOf("/")
+ var fetchRecord = concurrentRecordMap[source.getKey()]
+ if (fetchRecord == null) {
+ fetchRecord = ConcurrentRecord(rateIndex > 0, System.currentTimeMillis(), 1)
+ concurrentRecordMap[source.getKey()] = fetchRecord
+ return fetchRecord
+ }
+ val waitTime: Int = synchronized(fetchRecord) {
+ try {
+ if (rateIndex == -1) {
+ if (fetchRecord.frequency > 0) {
+ return@synchronized concurrentRate.toInt()
+ }
+ val nextTime = fetchRecord.time + concurrentRate.toInt()
+ if (System.currentTimeMillis() >= nextTime) {
+ fetchRecord.time = System.currentTimeMillis()
+ fetchRecord.frequency = 1
+ return@synchronized 0
+ }
+ return@synchronized (nextTime - System.currentTimeMillis()).toInt()
+ } else {
+ val sj = concurrentRate.substring(rateIndex + 1)
+ val nextTime = fetchRecord.time + sj.toInt()
+ if (System.currentTimeMillis() >= nextTime) {
+ fetchRecord.time = System.currentTimeMillis()
+ fetchRecord.frequency = 1
+ return@synchronized 0
+ }
+ val cs = concurrentRate.substring(0, rateIndex)
+ if (fetchRecord.frequency > cs.toInt()) {
+ return@synchronized (nextTime - System.currentTimeMillis()).toInt()
+ } else {
+ fetchRecord.frequency = fetchRecord.frequency + 1
+ return@synchronized 0
+ }
+ }
+ } catch (e: Exception) {
+ return@synchronized 0
+ }
+ }
+ if (waitTime > 0) {
+ throw ConcurrentException("根据并发率还需等待${waitTime}毫秒才可以访问", waitTime = waitTime)
+ }
+ return fetchRecord
+ }
+
+ /**
+ * 访问结束
+ */
+ private fun fetchEnd(concurrentRecord: ConcurrentRecord?) {
+ if (concurrentRecord != null && !concurrentRecord.concurrent) {
+ synchronized(concurrentRecord) {
+ concurrentRecord.frequency = concurrentRecord.frequency - 1
+ }
+ }
+ }
+
+ /**
+ * 访问网站,返回StrResponse
+ */
+ suspend fun getStrResponseAwait(
+ jsStr: String? = null,
+ sourceRegex: String? = null,
+ useWebView: Boolean = true,
+ ): StrResponse {
+ if (type != null) {
+ return StrResponse(url, StringUtils.byteToHexString(getByteArrayAwait()))
+ }
+ val concurrentRecord = fetchStart()
+ setCookie(source?.getKey())
+ val strResponse: StrResponse
+ if (this.useWebView && useWebView) {
+ strResponse = when (method) {
+ RequestMethod.POST -> {
+ val body = getProxyClient(proxy, source?.getNoProxy() == true).newCallStrResponse(retry) {
+ addHeaders(headerMap)
+ url(urlNoQuery)
+ if (fieldMap.isNotEmpty() || body.isNullOrBlank()) {
+ postForm(fieldMap, true)
+ } else {
+ postJson(body)
+ }
+ }.body
+ BackstageWebView(
+ url = url,
+ html = body,
+ tag = source?.getKey(),
+ javaScript = webJs ?: jsStr,
+ sourceRegex = sourceRegex,
+ headerMap = headerMap
+ ).getStrResponse()
+ }
+ else -> BackstageWebView(
+ url = url,
+ tag = source?.getKey(),
+ javaScript = webJs ?: jsStr,
+ sourceRegex = sourceRegex,
+ headerMap = headerMap
+ ).getStrResponse()
+ }
+ } else {
+ strResponse = getProxyClient(proxy, source?.getNoProxy() == true).newCallStrResponse(retry) {
+ addHeaders(headerMap)
+ when (method) {
+ RequestMethod.POST -> {
+ url(urlNoQuery)
+ if (fieldMap.isNotEmpty() || body.isNullOrBlank()) {
+ postForm(fieldMap, true)
+ } else {
+ postJson(body)
+ }
+ }
+ else -> get(urlNoQuery, fieldMap, true)
+ }
+ }
+ }
+ fetchEnd(concurrentRecord)
+ return strResponse
+ }
+
+ @JvmOverloads
+ fun getStrResponse(
+ jsStr: String? = null,
+ sourceRegex: String? = null,
+ useWebView: Boolean = true,
+ ): StrResponse {
+ return runBlocking {
+ getStrResponseAwait(jsStr, sourceRegex, useWebView)
+ }
+ }
+
+ /**
+ * 访问网站,返回Response
+ */
+ suspend fun getResponseAwait(): Response {
+ val concurrentRecord = fetchStart()
+ setCookie(source?.getKey())
+ @Suppress("BlockingMethodInNonBlockingContext")
+ val response = getProxyClient(proxy, source?.getNoProxy() == true).newCallResponse(retry) {
+ addHeaders(headerMap)
+ when (method) {
+ RequestMethod.POST -> {
+ url(urlNoQuery)
+ if (fieldMap.isNotEmpty() || body.isNullOrBlank()) {
+ postForm(fieldMap, true)
+ } else {
+ postJson(body)
+ }
+ }
+ else -> get(urlNoQuery, fieldMap, true)
+ }
+ }
+ fetchEnd(concurrentRecord)
+ return response
+ }
+
+ fun getResponse(): Response {
+ return runBlocking {
+ getResponseAwait()
+ }
+ }
+
+ /**
+ * 访问网站,返回ByteArray
+ */
+ suspend fun getByteArrayAwait(): ByteArray {
+ val concurrentRecord = fetchStart()
+ setCookie(source?.getKey())
+ @Suppress("BlockingMethodInNonBlockingContext")
+ val byteArray = getProxyClient(proxy, source?.getNoProxy() == true).newCallResponseBody(retry) {
+ addHeaders(headerMap)
+ when (method) {
+ RequestMethod.POST -> {
+ url(urlNoQuery)
+ if (fieldMap.isNotEmpty() || body.isNullOrBlank()) {
+ postForm(fieldMap, true)
+ } else {
+ postJson(body)
+ }
+ }
+ else -> get(urlNoQuery, fieldMap, true)
+ }
+ }.bytes()
+ fetchEnd(concurrentRecord)
+ return byteArray
+ }
+
+ fun getByteArray(): ByteArray {
+ return runBlocking {
+ getByteArrayAwait()
+ }
+ }
+
+ /**
+ * 上传文件
+ */
+ suspend fun upload(fileName: String, file: Any, contentType: String): StrResponse {
+ return getProxyClient(proxy, source?.getNoProxy() == true).newCallStrResponse(retry) {
+ url(urlNoQuery)
+ val bodyMap = GSON.fromJsonObject>(body)!!
+ bodyMap.forEach { entry ->
+ if (entry.value.toString() == "fileRequest") {
+ bodyMap[entry.key] = mapOf(
+ Pair("fileName", fileName),
+ Pair("file", file),
+ Pair("contentType", contentType)
+ )
+ }
+ }
+ postMultipart(type, bodyMap)
+ }
+ }
+
+ private fun setCookie(tag: String?) {
+ if (tag != null) {
+ val cookie = CookieStore.getCookie(tag)
+ if (cookie.isNotEmpty()) {
+ val cookieMap = CookieStore.cookieToMap(cookie)
+ val customCookieMap = CookieStore.cookieToMap(headerMap["Cookie"] ?: "")
+ cookieMap.putAll(customCookieMap)
+ val newCookie = CookieStore.mapToCookie(cookieMap)
+ newCookie?.let {
+ headerMap.put("Cookie", it)
+ }
+ }
+ }
+ }
+
+ fun getGlideUrl(): GlideUrl {
+ val headers = LazyHeaders.Builder()
+ headerMap.forEach { (key, value) ->
+ headers.addHeader(key, value)
+ }
+ return GlideUrl(url, headers.build())
+ }
+
+ fun getUserAgent(): String {
+ return headerMap[UA_NAME] ?: DEFAULT_USER_AGENT
+ }
+
+ fun isPost(): Boolean {
+ return method == RequestMethod.POST
+ }
+
+ override fun getSource(): BaseSource? {
+ return source
+ }
+
+ data class UrlOption(
+ val method: String?,
+ val charset: String?,
+ val headers: Any?,
+ val body: Any?,
+ val type: String?,
+ val js: String?,
+ val retry: Int = 0,
+ val webView: Any?,
+ val webJs: String?,
+ )
+
+ data class ConcurrentRecord(
+ val concurrent: Boolean,
+ var time: Long,
+ var frequency: Int
+ )
+
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/JsExtensions.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/JsExtensions.kt
new file mode 100644
index 0000000..82cda80
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/JsExtensions.kt
@@ -0,0 +1,676 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see ): Array {
+ return runBlocking {
+ val asyncArray = Array(urlList.size) {
+ async(IO) {
+ val url = urlList[it]
+ val analyzeUrl = AnalyzeUrl(url, source = getSource())
+ analyzeUrl.getStrResponseAwait()
+ }
+ }
+ val resArray = Array(urlList.size) {
+ asyncArray[it].await()
+ }
+ resArray
+ }
+ }
+
+ /**
+ * 访问网络,返回Response
+ */
+ fun connect(urlStr: String): StrResponse {
+ return runBlocking {
+ val analyzeUrl = AnalyzeUrl(urlStr, source = getSource())
+ kotlin.runCatching {
+ analyzeUrl.getStrResponseAwait()
+ }.onFailure {
+ log("connect(${urlStr}) error\n${it.stackTraceToString()}")
+ Log.e(TAG, it.toString())
+ }.getOrElse {
+ StrResponse(analyzeUrl.url, it.localizedMessage)
+ }
+ }
+ }
+
+ fun connect(urlStr: String, header: String?): StrResponse {
+ return runBlocking {
+ val headerMap = GSON.fromJsonObject>(header)
+ val analyzeUrl = AnalyzeUrl(urlStr, headerMapF = headerMap, source = getSource())
+ kotlin.runCatching {
+ analyzeUrl.getStrResponseAwait()
+ }.onFailure {
+ log("ajax($urlStr,$header) error\n${it.stackTraceToString()}")
+ Log.e(TAG, it.toString())
+ }.getOrElse {
+ StrResponse(analyzeUrl.url, it.localizedMessage)
+ }
+ }
+ }
+
+ /**
+ * 使用webView访问网络
+ * @param html 直接用webView载入的html, 如果html为空直接访问url
+ * @param url html内如果有相对路径的资源不传入url访问不了
+ * @param js 用来取返回值的js语句, 没有就返回整个源代码
+ * @return 返回js获取的内容
+ */
+ fun webView(html: String?, url: String?, js: String?): String? {
+ return runBlocking {
+ BackstageWebView(
+ url = url,
+ html = html,
+ javaScript = js
+ ).getStrResponse().body
+ }
+ }
+
+ /**
+ * 实现16进制字符串转文件
+ * @param content 需要转成文件的16进制字符串
+ * @param url 通过url里的参数来判断文件类型
+ * @return 相对路径
+ */
+ fun downloadFile(content: String, url: String): String {
+ val type = AnalyzeUrl(url, source = getSource()).type ?: return ""
+ val zipPath = FileUtils.getPath(
+ FileUtils.getFile(FileUtils.getCachePath()),
+ "${MD5Utils.md5Encode16(url)}.${type}"
+ )
+ FileUtils.deleteFile(zipPath)
+ val zipFile = FileUtils.getFile(zipPath)
+ StringUtils.hexStringToByte(content).let {
+ if (it.isNotEmpty()) {
+ zipFile.writeBytes(it)
+ }
+ }
+ return zipPath.substring(FileUtils.getCachePath().length)
+ }
+
+ /**
+ * js实现重定向拦截,网络访问get
+ */
+ fun get(urlStr: String, headers: Map): Connection.Response {
+ return Jsoup.connect(urlStr)
+ .sslSocketFactory(SSLHelper.unsafeSSLSocketFactory)
+ .ignoreContentType(true)
+ .followRedirects(false)
+ .headers(headers)
+ .method(Connection.Method.GET)
+ .execute()
+ }
+
+ /**
+ * 网络访问post
+ */
+ fun post(urlStr: String, body: String, headers: Map): Connection.Response {
+ return Jsoup.connect(urlStr)
+ .sslSocketFactory(SSLHelper.unsafeSSLSocketFactory)
+ .ignoreContentType(true)
+ .followRedirects(false)
+ .requestBody(body)
+ .headers(headers)
+ .method(Connection.Method.POST)
+ .execute()
+ }
+
+ /**
+ *js实现读取cookie
+ */
+ fun getCookie(tag: String, key: String? = null): String {
+ val cookie = CookieStore.getCookie(tag)
+ val cookieMap = CookieStore.cookieToMap(cookie)
+ return if (key != null) {
+ cookieMap[key] ?: ""
+ } else {
+ cookie
+ }
+ }
+
+ /**
+ * js实现解码,不能删
+ */
+ fun base64Decode(str: String): String {
+ return EncoderUtils.base64Decode(str, Base64.NO_WRAP)
+ }
+
+ fun base64Decode(str: String, flags: Int): String {
+ return EncoderUtils.base64Decode(str, flags)
+ }
+
+ fun base64DecodeToByteArray(str: String?): ByteArray? {
+ if (str.isNullOrBlank()) {
+ return null
+ }
+ return Base64.decode(str, Base64.DEFAULT)
+ }
+
+ fun base64DecodeToByteArray(str: String?, flags: Int): ByteArray? {
+ if (str.isNullOrBlank()) {
+ return null
+ }
+ return Base64.decode(str, flags)
+ }
+
+ fun base64Encode(str: String): String? {
+ return EncoderUtils.base64Encode(str, Base64.NO_WRAP)
+ }
+
+ fun base64Encode(str: String, flags: Int): String? {
+ return EncoderUtils.base64Encode(str, flags)
+ }
+
+ fun md5Encode(str: String): String {
+ return MD5Utils.md5Encode(str)
+ }
+
+ fun md5Encode16(str: String): String {
+ return MD5Utils.md5Encode16(str)
+ }
+
+ /**
+ * 格式化时间
+ */
+ fun timeFormatUTC(time: Long, format: String, sh: Int): String? {
+ val utc = SimpleTimeZone(sh, "UTC")
+ return SimpleDateFormat(format, Locale.getDefault()).run {
+ timeZone = utc
+ format(Date(time))
+ }
+ }
+
+ /**
+ * 时间格式化
+ */
+ fun timeFormat(time: Long): String {
+ return dateFormat.format(Date(time))
+ }
+
+ /**
+ * utf8编码转gbk编码
+ */
+ fun utf8ToGbk(str: String): String {
+ val utf8 = String(str.toByteArray(charset("UTF-8")))
+ val unicode = String(utf8.toByteArray(), charset("UTF-8"))
+ return String(unicode.toByteArray(charset("GBK")))
+ }
+
+ fun encodeURI(str: String): String {
+ return try {
+ URLEncoder.encode(str, "UTF-8")
+ } catch (e: Exception) {
+ ""
+ }
+ }
+
+ fun encodeURI(str: String, enc: String): String {
+ return try {
+ URLEncoder.encode(str, enc)
+ } catch (e: Exception) {
+ ""
+ }
+ }
+
+ fun htmlFormat(str: String): String {
+ return HtmlFormatter.format(str)
+// return HtmlFormatter.formatKeepImg(str)
+ }
+
+ //****************文件操作******************//
+
+ /**
+ * 获取本地文件
+ * @param path 相对路径
+ * @return File
+ */
+ fun getFile(path: String): File {
+ val cachePath = FileUtils.getCachePath()
+ val aPath = if (path.startsWith(File.separator)) {
+ cachePath + path
+ } else {
+ cachePath + File.separator + path
+ }
+ return File(aPath)
+ }
+
+ fun readFile(path: String): ByteArray? {
+ val file = getFile(path)
+ if (file.exists()) {
+ return file.readBytes()
+ }
+ return null
+ }
+
+ fun readTxtFile(path: String): String {
+ val file = getFile(path)
+ if (file.exists()) {
+ val charsetName = EncodingDetect.getJavaEncode(file)
+ return String(file.readBytes(), charset(charsetName))
+ }
+ return ""
+ }
+
+ fun readTxtFile(path: String, charsetName: String): String {
+ val file = getFile(path)
+ if (file.exists()) {
+ return String(file.readBytes(), charset(charsetName))
+ }
+ return ""
+ }
+
+ /**
+ * 删除本地文件
+ */
+ fun deleteFile(path: String) {
+ FileUtils.deleteFile(path)
+ }
+
+ /**
+ * js实现压缩文件解压
+ * @param zipPath 相对路径
+ * @return 相对路径
+ */
+ fun unzipFile(zipPath: String): String {
+ if (zipPath.isEmpty()) return ""
+ val unzipPath = FileUtils.getPath(
+ FileUtils.getFile(FileUtils.getCachePath()),
+ FileUtils.getNameExcludeExtension(zipPath)
+ )
+ FileUtils.deleteFile(unzipPath)
+ val zipFile = getFile(zipPath)
+ val unzipFolder = FileUtils.getFile(unzipPath)
+ ZipUtils.unzipFile(zipFile, unzipFolder)
+ FileUtils.deleteFile(zipFile.absolutePath)
+ return unzipPath.substring(FileUtils.getCachePath().length)
+ }
+
+ /**
+ * js实现文件夹内所有文件读取
+ */
+ fun getTxtInFolder(unzipPath: String): String {
+ if (unzipPath.isEmpty()) return ""
+ val unzipFolder = getFile(unzipPath)
+ val contents = StringBuilder()
+ unzipFolder.listFiles().let {
+ if (it != null) {
+ for (f in it) {
+ val charsetName = EncodingDetect.getJavaEncode(f)
+ contents.append(String(f.readBytes(), charset(charsetName)))
+ .append("\n")
+ }
+ contents.deleteCharAt(contents.length - 1)
+ }
+ }
+ FileUtils.deleteFile(unzipFolder.absolutePath)
+ return contents.toString()
+ }
+
+ /**
+ * 获取网络zip文件里面的数据
+ * @param url zip文件的链接或十六进制字符串
+ * @param path 所需获取文件在zip内的路径
+ * @return zip指定文件的数据
+ */
+ fun getZipStringContent(url: String, path: String): String {
+ val byteArray = getZipByteArrayContent(url, path) ?: return ""
+ val charsetName = EncodingDetect.getJavaEncode(byteArray)
+ return String(byteArray, Charset.forName(charsetName))
+ }
+
+ fun getZipStringContent(url: String, path: String, charsetName: String): String {
+ val byteArray = getZipByteArrayContent(url, path) ?: return ""
+ return String(byteArray, Charset.forName(charsetName))
+ }
+
+ /**
+ * 获取网络zip文件里面的数据
+ * @param url zip文件的链接或十六进制字符串
+ * @param path 所需获取文件在zip内的路径
+ * @return zip指定文件的数据
+ */
+ fun getZipByteArrayContent(url: String, path: String): ByteArray? {
+ val bytes = if (url.startsWith("http://") || url.startsWith("https://")) {
+ runBlocking {
+ return@runBlocking okHttpClient.newCallResponseBody { url(url) }.bytes()
+ }
+ } else {
+ StringUtils.hexStringToByte(url)
+ }
+ val bos = ByteArrayOutputStream()
+ val zis = ZipInputStream(ByteArrayInputStream(bytes))
+ var entry: ZipEntry? = zis.nextEntry
+ while (entry != null) {
+ if (entry.name.equals(path)) {
+ zis.use { it.copyTo(bos) }
+ return bos.toByteArray()
+ }
+ entry = zis.nextEntry
+ }
+ log("getZipContent 未发现内容")
+ return null
+ }
+
+ //******************文件操作************************//
+
+ /**
+ * 解析字体,返回字体解析类
+ */
+ fun queryBase64TTF(base64: String?): QueryTTF? {
+ base64DecodeToByteArray(base64)?.let {
+ return QueryTTF(it)
+ }
+ return null
+ }
+
+ /**
+ * 返回字体解析类
+ * @param str 支持url,本地文件,base64,自动判断,自动缓存
+ */
+ fun queryTTF(str: String?): QueryTTF? {
+ str ?: return null
+ val key = md5Encode16(str)
+ var qTTF = CacheManager.getQueryTTF(key)
+ if (qTTF != null) return qTTF
+ val font: ByteArray? = when {
+ str.isAbsUrl() -> runBlocking {
+ var x = CacheManager.getByteArray(key)
+ if (x == null) {
+ x = okHttpClient.newCallResponseBody { url(str) }.bytes()
+ x.let {
+ CacheManager.put(key, it)
+ }
+ }
+ return@runBlocking x
+ }
+ str.isContentScheme() -> DocumentUtil.readBytes(App.getmContext(), Uri.parse(str))
+ str.startsWith("/storage") -> File(str).readBytes()
+ else -> base64DecodeToByteArray(str)
+ }
+ font ?: return null
+ qTTF = QueryTTF(font)
+ CacheManager.put(key, qTTF)
+ return qTTF
+ }
+
+ /**
+ * @param text 包含错误字体的内容
+ * @param font1 错误的字体
+ * @param font2 正确的字体
+ */
+ fun replaceFont(
+ text: String,
+ font1: QueryTTF?,
+ font2: QueryTTF?
+ ): String {
+ if (font1 == null || font2 == null) return text
+ val contentArray = text.toCharArray()
+ contentArray.forEachIndexed { index, s ->
+ val oldCode = s.code
+ if (font1.inLimit(s)) {
+ val glyf = font1.getGlyfByCode(oldCode)
+ val code = font2.getCodeByGlyf(glyf)
+ if (code != 0) {
+ contentArray[index] = code.toChar()
+ }
+ }
+ }
+ return contentArray.joinToString("")
+ }
+
+ /**
+ * 输出调试日志
+ */
+ fun log(msg: String): String {
+ getSource()?.let {
+ Debug.log(it.getKey(), msg)
+ } ?: Debug.log(msg)
+ if (App.isDebug()) {
+ Log.d(TAG + "-" + getSource()?.getKey(), msg)
+ }
+ return msg
+ }
+
+ /**
+ * 生成UUID
+ */
+ fun randomUUID(): String {
+ return UUID.randomUUID().toString()
+ }
+
+ /**
+ * AES 解码为 ByteArray
+ * @param str 传入的AES加密的数据
+ * @param key AES 解密的key
+ * @param transformation AES加密的方式
+ * @param iv ECB模式的偏移向量
+ */
+ fun aesDecodeToByteArray(
+ str: String, key: String, transformation: String, iv: String
+ ): ByteArray? {
+ return try {
+ EncoderUtils.decryptAES(
+ data = str.encodeToByteArray(),
+ key = key.encodeToByteArray(),
+ transformation,
+ iv.encodeToByteArray()
+ )
+ } catch (e: Exception) {
+ Log.e(TAG, e.toString())
+ log(e.localizedMessage ?: "aesDecodeToByteArrayERROR")
+ null
+ }
+ }
+
+ /**
+ * AES 解码为 String
+ * @param str 传入的AES加密的数据
+ * @param key AES 解密的key
+ * @param transformation AES加密的方式
+ * @param iv ECB模式的偏移向量
+ */
+
+ fun aesDecodeToString(
+ str: String, key: String, transformation: String, iv: String
+ ): String? {
+ return aesDecodeToByteArray(str, key, transformation, iv)?.let { String(it) }
+ }
+
+ /**
+ * 已经base64的AES 解码为 ByteArray
+ * @param str 传入的AES Base64加密的数据
+ * @param key AES 解密的key
+ * @param transformation AES加密的方式
+ * @param iv ECB模式的偏移向量
+ */
+
+ fun aesBase64DecodeToByteArray(
+ str: String, key: String, transformation: String, iv: String
+ ): ByteArray? {
+ return try {
+ EncoderUtils.decryptBase64AES(
+ str.encodeToByteArray(),
+ key.encodeToByteArray(),
+ transformation,
+ iv.encodeToByteArray()
+ )
+ } catch (e: Exception) {
+ Log.e(TAG, e.toString())
+ log(e.localizedMessage ?: "aesDecodeToByteArrayERROR")
+ null
+ }
+ }
+
+ /**
+ * 已经base64的AES 解码为 String
+ * @param str 传入的AES Base64加密的数据
+ * @param key AES 解密的key
+ * @param transformation AES加密的方式
+ * @param iv ECB模式的偏移向量
+ */
+
+ fun aesBase64DecodeToString(
+ str: String, key: String, transformation: String, iv: String
+ ): String? {
+ return aesBase64DecodeToByteArray(str, key, transformation, iv)?.let { String(it) }
+ }
+
+ /**
+ * 加密aes为ByteArray
+ * @param data 传入的原始数据
+ * @param key AES加密的key
+ * @param transformation AES加密的方式
+ * @param iv ECB模式的偏移向量
+ */
+ fun aesEncodeToByteArray(
+ data: String, key: String, transformation: String, iv: String
+ ): ByteArray? {
+ return try {
+ EncoderUtils.encryptAES(
+ data.encodeToByteArray(),
+ key = key.encodeToByteArray(),
+ transformation,
+ iv.encodeToByteArray()
+ )
+ } catch (e: Exception) {
+ Log.e(TAG, e.toString())
+ log(e.localizedMessage ?: "aesEncodeToByteArrayERROR")
+ null
+ }
+ }
+
+ /**
+ * 加密aes为String
+ * @param data 传入的原始数据
+ * @param key AES加密的key
+ * @param transformation AES加密的方式
+ * @param iv ECB模式的偏移向量
+ */
+ fun aesEncodeToString(
+ data: String, key: String, transformation: String, iv: String
+ ): String? {
+ return aesEncodeToByteArray(data, key, transformation, iv)?.let { String(it) }
+ }
+
+ /**
+ * 加密aes后Base64化的ByteArray
+ * @param data 传入的原始数据
+ * @param key AES加密的key
+ * @param transformation AES加密的方式
+ * @param iv ECB模式的偏移向量
+ */
+ fun aesEncodeToBase64ByteArray(
+ data: String, key: String, transformation: String, iv: String
+ ): ByteArray? {
+ return try {
+ EncoderUtils.encryptAES2Base64(
+ data.encodeToByteArray(),
+ key.encodeToByteArray(),
+ transformation,
+ iv.encodeToByteArray()
+ )
+ } catch (e: Exception) {
+ Log.e(TAG, e.toString())
+ log(e.localizedMessage ?: "aesEncodeToBase64ByteArrayERROR")
+ null
+ }
+ }
+
+ /**
+ * 加密aes后Base64化的String
+ * @param data 传入的原始数据
+ * @param key AES加密的key
+ * @param transformation AES加密的方式
+ * @param iv ECB模式的偏移向量
+ */
+ fun aesEncodeToBase64String(
+ data: String, key: String, transformation: String, iv: String
+ ): String? {
+ return aesEncodeToBase64ByteArray(data, key, transformation, iv)?.let { String(it) }
+ }
+
+ fun android(): String {
+ return APPCONST.androidId
+ }
+
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/QueryTTF.java b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/QueryTTF.java
new file mode 100644
index 0000000..4a777d6
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/QueryTTF.java
@@ -0,0 +1,621 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see records = new LinkedList<>();
+ }
+
+ private static class NameRecord {
+ public int platformID; // 平台标识符<0:Unicode, 1:Mac, 2:ISO, 3:Windows, 4:Custom>
+ public int encodingID; // 编码标识符
+ public int languageID; // 语言标识符
+ public int nameID; // 名称标识符
+ public int length; // 名称字符串的长度
+ public int offset; // 名称字符串相对于stringOffset的字节偏移量
+ }
+
+ private static class HeadLayout {
+ public int majorVersion;
+ public int minorVersion;
+ public int fontRevision;
+ public int checkSumAdjustment;
+ public int magicNumber;
+ public int flags;
+ public int unitsPerEm;
+ public long created;
+ public long modified;
+ public short xMin;
+ public short yMin;
+ public short xMax;
+ public short yMax;
+ public int macStyle;
+ public int lowestRecPPEM;
+ public short fontDirectionHint;
+ public short indexToLocFormat; // <0:loca是2字节数组, 1:loca是4字节数组>
+ public short glyphDataFormat;
+ }
+
+ private static class MaxpLayout {
+ public int majorVersion;
+ public int minorVersion;
+ public int numGlyphs; // 字体中的字形数量
+ public int maxPoints;
+ public int maxContours;
+ public int maxCompositePoints;
+ public int maxCompositeContours;
+ public int maxZones;
+ public int maxTwilightPoints;
+ public int maxStorage;
+ public int maxFunctionDefs;
+ public int maxInstructionDefs;
+ public int maxStackElements;
+ public int maxSizeOfInstructions;
+ public int maxComponentElements;
+ public int maxComponentDepth;
+ }
+
+ private static class CmapLayout {
+ public int version;
+ public int numTables;
+ public List records = new LinkedList<>();
+ public Map tables = new HashMap<>();
+ }
+
+ private static class CmapRecord {
+ public int platformID;
+ public int encodingID;
+ public int offset;
+ }
+
+ private static class CmapFormat {
+ public int format;
+ public int length;
+ public int language;
+ public byte[] glyphIdArray;
+ }
+
+ private static class CmapFormat4 extends CmapFormat {
+ public int segCountX2;
+ public int searchRange;
+ public int entrySelector;
+ public int rangeShift;
+ public int[] endCode;
+ public int reservedPad;
+ public int[] startCode;
+ public short[] idDelta;
+ public int[] idRangeOffset;
+ public int[] glyphIdArray;
+ }
+
+ private static class CmapFormat6 extends CmapFormat {
+ public int firstCode;
+ public int entryCount;
+ public int[] glyphIdArray;
+ }
+
+ private static class CmapFormat12 extends CmapFormat {
+ public int reserved;
+ public int length;
+ public int language;
+ public int numGroups;
+ public List> groups;
+ }
+
+ private static class GlyfLayout {
+ public short numberOfContours; // 非负值为简单字型,负值为符合字型
+ public short xMin;
+ public short yMin;
+ public short xMax;
+ public short yMax;
+ public int[] endPtsOfContours; // length=numberOfContours
+ public int instructionLength;
+ public byte[] instructions; // length=instructionLength
+ public byte[] flags;
+ public short[] xCoordinates; // length = flags.length
+ public short[] yCoordinates; // length = flags.length
+ }
+
+ private static class ByteArrayReader {
+ public int index;
+ public byte[] buffer;
+
+ public ByteArrayReader(byte[] buffer, int index) {
+ this.buffer = buffer;
+ this.index = index;
+ }
+
+ public long ReadUIntX(long len) {
+ long result = 0;
+ for (long i = 0; i < len; ++i) {
+ result <<= 8;
+ result |= buffer[index++] & 0xFF;
+ }
+ return result;
+ }
+
+ public long ReadUInt64() {
+ return ReadUIntX(8);
+ }
+
+ public int ReadUInt32() {
+ return (int) ReadUIntX(4);
+ }
+
+ public int ReadUInt16() {
+ return (int) ReadUIntX(2);
+ }
+
+ public short ReadInt16() {
+ return (short) ReadUIntX(2);
+ }
+
+ public short ReadUInt8() {
+ return (short) ReadUIntX(1);
+ }
+
+
+ public String ReadStrings(int len, Charset charset) {
+ byte[] result = len > 0 ? new byte[len] : null;
+ for (int i = 0; i < len; ++i) result[i] = buffer[index++];
+ return new String(result, charset);
+ }
+
+ public byte GetByte() {
+ return buffer[index++];
+ }
+
+ public byte[] GetBytes(int len) {
+ byte[] result = len > 0 ? new byte[len] : null;
+ for (int i = 0; i < len; ++i) result[i] = buffer[index++];
+ return result;
+ }
+
+ public int[] GetUInt16Array(int len) {
+ int[] result = len > 0 ? new int[len] : null;
+ for (int i = 0; i < len; ++i) result[i] = ReadUInt16();
+ return result;
+ }
+
+ public short[] GetInt16Array(int len) {
+ short[] result = len > 0 ? new short[len] : null;
+ for (int i = 0; i < len; ++i) result[i] = ReadInt16();
+ return result;
+ }
+ }
+
+ private final ByteArrayReader fontReader;
+ private final Header fileHeader = new Header();
+ private final List directorys = new LinkedList<>();
+ private final NameLayout name = new NameLayout();
+ private final HeadLayout head = new HeadLayout();
+ private final MaxpLayout maxp = new MaxpLayout();
+ private final List loca = new LinkedList<>();
+ private final CmapLayout Cmap = new CmapLayout();
+ private final List glyf = new LinkedList<>();
+ @SuppressWarnings("unchecked")
+ private final Pair[] pps = new Pair[]{
+ Pair.of(3, 10),
+ Pair.of(0, 4),
+ Pair.of(3, 1),
+ Pair.of(1, 0),
+ Pair.of(0, 3),
+ Pair.of(0, 1)
+ };
+
+ public final Map codeToGlyph = new HashMap<>();
+ public final Map glyphToCode = new HashMap<>();
+ private int limitMix = 0;
+ private int limitMax = 0;
+
+ /**
+ * 构造函数
+ *
+ * @param buffer 传入TTF字体二进制数组
+ */
+ public QueryTTF(byte[] buffer) {
+ fontReader = new ByteArrayReader(buffer, 0);
+ // 获取文件头
+ fileHeader.majorVersion = fontReader.ReadUInt16();
+ fileHeader.minorVersion = fontReader.ReadUInt16();
+ fileHeader.numOfTables = fontReader.ReadUInt16();
+ fileHeader.searchRange = fontReader.ReadUInt16();
+ fileHeader.entrySelector = fontReader.ReadUInt16();
+ fileHeader.rangeShift = fontReader.ReadUInt16();
+ // 获取目录
+ for (int i = 0; i < fileHeader.numOfTables; ++i) {
+ Directory d = new Directory();
+ d.tag = fontReader.ReadStrings(4, StandardCharsets.US_ASCII);
+ d.checkSum = fontReader.ReadUInt32();
+ d.offset = fontReader.ReadUInt32();
+ d.length = fontReader.ReadUInt32();
+ directorys.add(d);
+ }
+ // 解析表 name (字体信息,包含版权、名称、作者等...)
+ for (Directory Temp : directorys) {
+ if (Temp.tag.equals("name")) {
+ fontReader.index = Temp.offset;
+ name.format = fontReader.ReadUInt16();
+ name.count = fontReader.ReadUInt16();
+ name.stringOffset = fontReader.ReadUInt16();
+ for (int i = 0; i < name.count; ++i) {
+ NameRecord record = new NameRecord();
+ record.platformID = fontReader.ReadUInt16();
+ record.encodingID = fontReader.ReadUInt16();
+ record.languageID = fontReader.ReadUInt16();
+ record.nameID = fontReader.ReadUInt16();
+ record.length = fontReader.ReadUInt16();
+ record.offset = fontReader.ReadUInt16();
+ name.records.add(record);
+ }
+ }
+ }
+ // 解析表 head (获取 head.indexToLocFormat)
+ for (Directory Temp : directorys) {
+ if (Temp.tag.equals("head")) {
+ fontReader.index = Temp.offset;
+ head.majorVersion = fontReader.ReadUInt16();
+ head.minorVersion = fontReader.ReadUInt16();
+ head.fontRevision = fontReader.ReadUInt32();
+ head.checkSumAdjustment = fontReader.ReadUInt32();
+ head.magicNumber = fontReader.ReadUInt32();
+ head.flags = fontReader.ReadUInt16();
+ head.unitsPerEm = fontReader.ReadUInt16();
+ head.created = fontReader.ReadUInt64();
+ head.modified = fontReader.ReadUInt64();
+ head.xMin = fontReader.ReadInt16();
+ head.yMin = fontReader.ReadInt16();
+ head.xMax = fontReader.ReadInt16();
+ head.yMax = fontReader.ReadInt16();
+ head.macStyle = fontReader.ReadUInt16();
+ head.lowestRecPPEM = fontReader.ReadUInt16();
+ head.fontDirectionHint = fontReader.ReadInt16();
+ head.indexToLocFormat = fontReader.ReadInt16();
+ head.glyphDataFormat = fontReader.ReadInt16();
+ }
+ }
+ // 解析表 maxp (获取 maxp.numGlyphs)
+ for (Directory Temp : directorys) {
+ if (Temp.tag.equals("maxp")) {
+ fontReader.index = Temp.offset;
+ maxp.majorVersion = fontReader.ReadUInt16();
+ maxp.minorVersion = fontReader.ReadUInt16();
+ maxp.numGlyphs = fontReader.ReadUInt16();
+ maxp.maxPoints = fontReader.ReadUInt16();
+ maxp.maxContours = fontReader.ReadUInt16();
+ maxp.maxCompositePoints = fontReader.ReadUInt16();
+ maxp.maxCompositeContours = fontReader.ReadUInt16();
+ maxp.maxZones = fontReader.ReadUInt16();
+ maxp.maxTwilightPoints = fontReader.ReadUInt16();
+ maxp.maxStorage = fontReader.ReadUInt16();
+ maxp.maxFunctionDefs = fontReader.ReadUInt16();
+ maxp.maxInstructionDefs = fontReader.ReadUInt16();
+ maxp.maxStackElements = fontReader.ReadUInt16();
+ maxp.maxSizeOfInstructions = fontReader.ReadUInt16();
+ maxp.maxComponentElements = fontReader.ReadUInt16();
+ maxp.maxComponentDepth = fontReader.ReadUInt16();
+ }
+ }
+ // 解析表 loca (轮廓数据偏移地址表)
+ for (Directory Temp : directorys) {
+ if (Temp.tag.equals("loca")) {
+ fontReader.index = Temp.offset;
+ int offset = head.indexToLocFormat == 0 ? 2 : 4;
+ for (long i = 0; i < Temp.length; i += offset) {
+ loca.add(offset == 2 ? fontReader.ReadUInt16() << 1 : fontReader.ReadUInt32());
+ }
+ }
+ }
+ // 解析表 cmap (Unicode编码轮廓索引对照表)
+ for (Directory Temp : directorys) {
+ if (Temp.tag.equals("cmap")) {
+ fontReader.index = Temp.offset;
+ Cmap.version = fontReader.ReadUInt16();
+ Cmap.numTables = fontReader.ReadUInt16();
+
+ for (int i = 0; i < Cmap.numTables; ++i) {
+ CmapRecord record = new CmapRecord();
+ record.platformID = fontReader.ReadUInt16();
+ record.encodingID = fontReader.ReadUInt16();
+ record.offset = fontReader.ReadUInt32();
+ Cmap.records.add(record);
+ }
+ for (int i = 0; i < Cmap.numTables; ++i) {
+ int fmtOffset = Cmap.records.get(i).offset;
+ fontReader.index = Temp.offset + fmtOffset;
+ int EndIndex = fontReader.index;
+
+ int format = fontReader.ReadUInt16();
+ if (Cmap.tables.containsKey(fmtOffset)) continue;
+ if (format == 0) {
+ CmapFormat f = new CmapFormat();
+ f.format = format;
+ f.length = fontReader.ReadUInt16();
+ f.language = fontReader.ReadUInt16();
+ f.glyphIdArray = fontReader.GetBytes(f.length - 6);
+ Cmap.tables.put(fmtOffset, f);
+ } else if (format == 4) {
+ CmapFormat4 f = new CmapFormat4();
+ f.format = format;
+ f.length = fontReader.ReadUInt16();
+ f.language = fontReader.ReadUInt16();
+ f.segCountX2 = fontReader.ReadUInt16();
+ int segCount = f.segCountX2 >> 1;
+ f.searchRange = fontReader.ReadUInt16();
+ f.entrySelector = fontReader.ReadUInt16();
+ f.rangeShift = fontReader.ReadUInt16();
+ f.endCode = fontReader.GetUInt16Array(segCount);
+ f.reservedPad = fontReader.ReadUInt16();
+ f.startCode = fontReader.GetUInt16Array(segCount);
+ f.idDelta = fontReader.GetInt16Array(segCount);
+ f.idRangeOffset = fontReader.GetUInt16Array(segCount);
+ f.glyphIdArray = fontReader.GetUInt16Array((EndIndex + f.length - fontReader.index) >> 1);
+ Cmap.tables.put(fmtOffset, f);
+ } else if (format == 6) {
+ CmapFormat6 f = new CmapFormat6();
+ f.format = format;
+ f.length = fontReader.ReadUInt16();
+ f.language = fontReader.ReadUInt16();
+ f.firstCode = fontReader.ReadUInt16();
+ f.entryCount = fontReader.ReadUInt16();
+ f.glyphIdArray = fontReader.GetUInt16Array(f.entryCount);
+ Cmap.tables.put(fmtOffset, f);
+ } else if (format == 12) {
+ CmapFormat12 f = new CmapFormat12();
+ f.format = format;
+ f.reserved = fontReader.ReadUInt16();
+ f.length = fontReader.ReadUInt32();
+ f.language = fontReader.ReadUInt32();
+ f.numGroups = fontReader.ReadUInt32();
+ f.groups = new ArrayList<>(f.numGroups);
+ for (int n = 0; n < f.numGroups; ++n) {
+ f.groups.add(Triple.of(fontReader.ReadUInt32(), fontReader.ReadUInt32(), fontReader.ReadUInt32()));
+ }
+ Cmap.tables.put(fmtOffset, f);
+ }
+ }
+ }
+ }
+ // 解析表 glyf (字体轮廓数据表)
+ for (Directory Temp : directorys) {
+ if (Temp.tag.equals("glyf")) {
+ fontReader.index = Temp.offset;
+ for (int i = 0; i < maxp.numGlyphs; ++i) {
+ fontReader.index = Temp.offset + loca.get(i);
+
+ short numberOfContours = fontReader.ReadInt16();
+ if (numberOfContours > 0) {
+ GlyfLayout g = new GlyfLayout();
+ g.numberOfContours = numberOfContours;
+ g.xMin = fontReader.ReadInt16();
+ g.yMin = fontReader.ReadInt16();
+ g.xMax = fontReader.ReadInt16();
+ g.yMax = fontReader.ReadInt16();
+ g.endPtsOfContours = fontReader.GetUInt16Array(numberOfContours);
+ g.instructionLength = fontReader.ReadUInt16();
+ g.instructions = fontReader.GetBytes(g.instructionLength);
+ int flagLength = g.endPtsOfContours[g.endPtsOfContours.length - 1] + 1;
+ // 获取轮廓点描述标志
+ g.flags = new byte[flagLength];
+ for (int n = 0; n < flagLength; ++n) {
+ g.flags[n] = fontReader.GetByte();
+ if ((g.flags[n] & 0x08) != 0x00) {
+ for (int m = fontReader.ReadUInt8(); m > 0; --m) {
+ g.flags[++n] = g.flags[n - 1];
+ }
+ }
+ }
+ // 获取轮廓点描述x轴相对值
+ g.xCoordinates = new short[flagLength];
+ for (int n = 0; n < flagLength; ++n) {
+ short same = (short) ((g.flags[n] & 0x10) != 0 ? 1 : -1);
+ if ((g.flags[n] & 0x02) != 0) {
+ g.xCoordinates[n] = (short) (same * fontReader.ReadUInt8());
+ } else {
+ g.xCoordinates[n] = same == 1 ? (short) 0 : fontReader.ReadInt16();
+ }
+ }
+ // 获取轮廓点描述y轴相对值
+ g.yCoordinates = new short[flagLength];
+ for (int n = 0; n < flagLength; ++n) {
+ short same = (short) ((g.flags[n] & 0x20) != 0 ? 1 : -1);
+ if ((g.flags[n] & 0x04) != 0) {
+ g.yCoordinates[n] = (short) (same * fontReader.ReadUInt8());
+ } else {
+ g.yCoordinates[n] = same == 1 ? (short) 0 : fontReader.ReadInt16();
+ }
+ }
+ /* 相对坐标转绝对坐标
+ for (int n = 1; n < flagLength; ++n) {
+ xCoordinates[n] += xCoordinates[n - 1];
+ yCoordinates[n] += yCoordinates[n - 1];
+ }*/
+ glyf.add(g);
+ } else {
+ // 复合字体暂未使用
+ }
+ }
+ }
+ }
+
+ // 建立Unicode&Glyph双向表
+ for (int key = 0; key < 130000; ++key) {
+ if (key == 0xFF) key = 0x3400;
+ int gid = getGlyfIndex(key);
+ if (gid == 0) continue;
+ StringBuilder sb = new StringBuilder();
+ // 字型数据转String，方便存HashMap
+ for (short b : glyf.get(gid).xCoordinates) sb.append(b);
+ for (short b : glyf.get(gid).yCoordinates) sb.append(b);
+ String val = sb.toString();
+ if (limitMix == 0) limitMix = key;
+ limitMax = key;
+ codeToGlyph.put(key, val);
+ if (glyphToCode.containsKey(val)) continue;
+ glyphToCode.put(val, key);
+ }
+ }
+
+ /**
+ * 获取字体信息 (1=字体名称)
+ *
+ * @param nameId 传入十进制字体信息索引
+ * @return 返回查询结果字符串
+ */
+ public String getNameById(int nameId) {
+ for (Directory Temp : directorys) {
+ if (!Temp.tag.equals("name")) continue;
+ fontReader.index = Temp.offset;
+ break;
+ }
+ for (NameRecord record : name.records) {
+ if (record.nameID != nameId) continue;
+ fontReader.index += name.stringOffset + record.offset;
+ return fontReader.ReadStrings(record.length, record.platformID == 1 ? StandardCharsets.UTF_8 : StandardCharsets.UTF_16BE);
+ }
+ return "error";
+ }
+
+ /**
+ * 使用Unicode值查找轮廓索引
+ *
+ * @param code 传入Unicode十进制值
+ * @return 返回十进制轮廓索引
+ */
+ private int getGlyfIndex(int code) {
+ if (code == 0) return 0;
+ int fmtKey = 0;
+ for (Pair item : pps) {
+ for (CmapRecord record : Cmap.records) {
+ if ((item.getLeft() == record.platformID) && (item.getRight() == record.encodingID)) {
+ fmtKey = record.offset;
+ break;
+ }
+ }
+ if (fmtKey > 0) break;
+ }
+ if (fmtKey == 0) return 0;
+
+ int glyfID = 0;
+ CmapFormat table = Cmap.tables.get(fmtKey);
+ assert table != null;
+ int fmt = table.format;
+ if (fmt == 0) {
+ if (code < table.glyphIdArray.length) glyfID = table.glyphIdArray[code] & 0xFF;
+ } else if (fmt == 4) {
+ CmapFormat4 tab = (CmapFormat4) table;
+ if (code > tab.endCode[tab.endCode.length - 1]) return 0;
+ // 二分法查找数值索引
+ int start = 0, middle, end = tab.endCode.length - 1;
+ while (start + 1 < end) {
+ middle = (start + end) / 2;
+ if (tab.endCode[middle] <= code) start = middle;
+ else end = middle;
+ }
+ if (tab.endCode[start] < code) ++start;
+ if (code < tab.startCode[start]) return 0;
+ if (tab.idRangeOffset[start] != 0) {
+ glyfID = tab.glyphIdArray[code - tab.startCode[start] + (tab.idRangeOffset[start] >> 1) - (tab.idRangeOffset.length - start)];
+ } else glyfID = code + tab.idDelta[start];
+ glyfID &= 0xFFFF;
+ } else if (fmt == 6) {
+ CmapFormat6 tab = (CmapFormat6) table;
+ int index = code - tab.firstCode;
+ if (index < 0 || index >= tab.glyphIdArray.length) glyfID = 0;
+ else glyfID = tab.glyphIdArray[index];
+ } else if (fmt == 12) {
+ CmapFormat12 tab = (CmapFormat12) table;
+ if (code > tab.groups.get(tab.numGroups - 1).getMiddle()) return 0;
+ // 二分法查找数值索引
+ int start = 0, middle, end = tab.numGroups - 1;
+ while (start + 1 < end) {
+ middle = (start + end) / 2;
+ if (tab.groups.get(middle).getLeft() <= code) start = middle;
+ else end = middle;
+ }
+ if (tab.groups.get(start).getLeft() <= code && code <= tab.groups.get(start).getMiddle()) {
+ glyfID = tab.groups.get(start).getRight() + code - tab.groups.get(start).getLeft();
+ }
+ }
+ return glyfID;
+ }
+
+ /**
+ * 判断Unicode值是否在字体范围内
+ *
+ * @param code 传入Unicode十进制值
+ * @return 返回bool查询结果
+ */
+ public boolean inLimit(char code) {
+ return (limitMix <= code) && (code < limitMax);
+ }
+
+ /**
+ * 使用Unicode值获取轮廓数据
+ *
+ * @param key 传入Unicode十进制值
+ * @return 返回轮廓数组的String值
+ */
+ public String getGlyfByCode(int key) {
+ return codeToGlyph.getOrDefault(key, "");
+ }
+
+ /**
+ * 使用轮廓数据获取Unicode值
+ *
+ * @param val 传入轮廓数组的String值
+ * @return 返回Unicode十进制值
+ */
+ public int getCodeByGlyf(String val) {
+ //noinspection ConstantConditions
+ return glyphToCode.getOrDefault(val, 0);
+ }
+}
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleAnalyzer.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleAnalyzer.kt
new file mode 100644
index 0000000..04576b9
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleAnalyzer.kt
@@ -0,0 +1,396 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see () //分割出的规则列表
+ private var step: Int = 0 //分割字符的长度
+ var elementsType = "" //当前分割字符串
+
+ fun trim() { // 修剪当前规则之前的"@"或者空白符
+ if (queue[pos] == '@' || queue[pos] < '!') { //在while里重复设置start和startX会拖慢执行速度，所以先来个判断是否存在需要修剪的字段，最后再一次性设置start和startX
+ pos++
+ while (queue[pos] == '@' || queue[pos] < '!') pos++
+ start = pos //开始点推移
+ startX = pos //规则起始点推移
+ }
+ }
+
+ //将pos重置为0，方便复用
+ fun reSetPos() {
+ pos = 0
+ startX = 0
+ }
+
+ /**
+ * 从剩余字串中拉出一个字符串，直到但不包括匹配序列
+ * @param seq 查找的字符串 **区分大小写**
+ * @return 是否找到相应字段。
+ */
+ private fun consumeTo(seq: String): Boolean {
+ start = pos //将处理到的位置设置为规则起点
+ val offset = queue.indexOf(seq, pos)
+ return if (offset != -1) {
+ pos = offset
+ true
+ } else false
+ }
+
+ /**
+ * 从剩余字串中拉出一个字符串，直到但不包括匹配序列（匹配参数列表中一项即为匹配），或剩余字串用完。
+ * @param seq 匹配字符串序列
+ * @return 成功返回true并设置间隔，失败则直接返回fasle
+ */
+ private fun consumeToAny(vararg seq: String): Boolean {
+
+ var pos = pos //声明新变量记录匹配位置，不更改类本身的位置
+
+ while (pos != queue.length) {
+
+ for (s in seq) {
+ if (queue.regionMatches(pos, s, 0, s.length)) {
+ step = s.length //间隔数
+ this.pos = pos //匹配成功, 同步处理位置到类
+ return true //匹配就返回 true
+ }
+ }
+
+ pos++ //逐个试探
+ }
+ return false
+ }
+
+ /**
+ * 从剩余字串中拉出一个字符串，直到但不包括匹配序列（匹配参数列表中一项即为匹配），或剩余字串用完。
+ * @param seq 匹配字符序列
+ * @return 返回匹配位置
+ */
+ private fun findToAny(vararg seq: Char): Int {
+
+ var pos = pos //声明新变量记录匹配位置，不更改类本身的位置
+
+ while (pos != queue.length) {
+
+ for (s in seq) if (queue[pos] == s) return pos //匹配则返回位置
+
+ pos++ //逐个试探
+
+ }
+
+ return -1
+ }
+
+ /**
+ * 拉出一个非内嵌代码平衡组，存在转义文本
+ */
+ private fun chompCodeBalanced(open: Char, close: Char): Boolean {
+
+ var pos = pos //声明临时变量记录匹配位置，匹配成功后才同步到类的pos
+
+ var depth = 0 //嵌套深度
+ var otherDepth = 0 //其他对称符合嵌套深度
+
+ var inSingleQuote = false //单引号
+ var inDoubleQuote = false //双引号
+
+ do {
+ if (pos == queue.length) break
+ val c = queue[pos++]
+ if (c != ESC) { //非转义字符
+ if (c == '\'' && !inDoubleQuote) inSingleQuote = !inSingleQuote //匹配具有语法功能的单引号
+ else if (c == '"' && !inSingleQuote) inDoubleQuote = !inDoubleQuote //匹配具有语法功能的双引号
+
+ if (inSingleQuote || inDoubleQuote) continue //语法单元未匹配结束，直接进入下个循环
+
+ if (c == '[') depth++ //开始嵌套一层
+ else if (c == ']') depth-- //闭合一层嵌套
+ else if (depth == 0) {
+ //处于默认嵌套中的非默认字符不需要平衡，仅depth为0时默认嵌套全部闭合，此字符才进行嵌套
+ if (c == open) otherDepth++
+ else if (c == close) otherDepth--
+ }
+
+ } else pos++
+
+ } while (depth > 0 || otherDepth > 0) //拉出一个平衡字串
+
+ return if (depth > 0 || otherDepth > 0) false else {
+ this.pos = pos //同步位置
+ true
+ }
+ }
+
+ /**
+ * 拉出一个规则平衡组，经过仔细测试xpath和jsoup中，引号内转义字符无效。
+ */
+ private fun chompRuleBalanced(open: Char, close: Char): Boolean {
+
+ var pos = pos //声明临时变量记录匹配位置，匹配成功后才同步到类的pos
+ var depth = 0 //嵌套深度
+ var inSingleQuote = false //单引号
+ var inDoubleQuote = false //双引号
+
+ do {
+ if (pos == queue.length) break
+ val c = queue[pos++]
+ if (c == '\'' && !inDoubleQuote) inSingleQuote = !inSingleQuote //匹配具有语法功能的单引号
+ else if (c == '"' && !inSingleQuote) inDoubleQuote = !inDoubleQuote //匹配具有语法功能的双引号
+
+ if (inSingleQuote || inDoubleQuote) continue //语法单元未匹配结束，直接进入下个循环
+ else if (c == '\\') { //不在引号中的转义字符才将下个字符转义
+ pos++
+ continue
+ }
+
+ if (c == open) depth++ //开始嵌套一层
+ else if (c == close) depth-- //闭合一层嵌套
+
+ } while (depth > 0) //拉出一个平衡字串
+
+ return if (depth > 0) false else {
+ this.pos = pos //同步位置
+ true
+ }
+ }
+
+ /**
+ * 不用正则,不到最后不切片也不用中间变量存储,只在序列中标记当前查找字段的开头结尾,到返回时才切片,高效快速准确切割规则
+ * 解决jsonPath自带的"&&"和"||"与阅读的规则冲突,以及规则正则或字符串中包含"&&"、"||"、"%%"、"@"导致的冲突
+ */
+ tailrec fun splitRule(vararg split: String): ArrayList { //首段匹配,elementsType为空
+
+ if (split.size == 1) {
+ elementsType = split[0] //设置分割字串
+ return if (!consumeTo(elementsType)) {
+ rule += queue.substring(startX)
+ rule
+ } else {
+ step = elementsType.length //设置分隔符长度
+ splitRule()
+ } //递归匹配
+ } else if (!consumeToAny(* split)) { //未找到分隔符
+ rule += queue.substring(startX)
+ return rule
+ }
+
+ val end = pos //记录分隔位置
+ pos = start //重回开始，启动另一种查找
+
+ do {
+ val st = findToAny('[', '(') //查找筛选器位置
+
+ if (st == -1) {
+
+ rule = arrayListOf(queue.substring(startX, end)) //压入分隔的首段规则到数组
+
+ elementsType = queue.substring(end, end + step) //设置组合类型
+ pos = end + step //跳过分隔符
+
+ while (consumeTo(elementsType)) { //循环切分规则压入数组
+ rule += queue.substring(start, pos)
+ pos += step //跳过分隔符
+ }
+
+ rule += queue.substring(pos) //将剩余字段压入数组末尾
+
+ return rule
+ }
+
+ if (st > end) { //先匹配到st1pos，表明分隔字串不在选择器中，将选择器前分隔字串分隔的字段依次压入数组
+
+ rule = arrayListOf(queue.substring(startX, end)) //压入分隔的首段规则到数组
+
+ elementsType = queue.substring(end, end + step) //设置组合类型
+ pos = end + step //跳过分隔符
+
+ while (consumeTo(elementsType) && pos < st) { //循环切分规则压入数组
+ rule += queue.substring(start, pos)
+ pos += step //跳过分隔符
+ }
+
+ return if (pos > st) {
+ startX = start
+ splitRule() //首段已匹配,但当前段匹配未完成,调用二段匹配
+ } else { //执行到此，证明后面再无分隔字符
+ rule += queue.substring(pos) //将剩余字段压入数组末尾
+ rule
+ }
+ }
+
+ pos = st //位置推移到筛选器处
+ val next = if (queue[pos] == '[') ']' else ')' //平衡组末尾字符
+
+ if (!chompBalanced(queue[pos], next)) throw Error(
+ queue.substring(0, start) + "后未平衡"
+ ) //拉出一个筛选器,不平衡则报错
+
+ } while (end > pos)
+
+ start = pos //设置开始查找筛选器位置的起始位置
+
+ return splitRule(* split) //递归调用首段匹配
+ }
+
+ @JvmName("splitRuleNext")
+ private tailrec fun splitRule(): ArrayList { //二段匹配被调用,elementsType非空(已在首段赋值),直接按elementsType查找,比首段采用的方式更快
+
+ val end = pos //记录分隔位置
+ pos = start //重回开始，启动另一种查找
+
+ do {
+ val st = findToAny('[', '(') //查找筛选器位置
+
+ if (st == -1) {
+
+ rule += arrayOf(queue.substring(startX, end)) //压入分隔的首段规则到数组
+ pos = end + step //跳过分隔符
+
+ while (consumeTo(elementsType)) { //循环切分规则压入数组
+ rule += queue.substring(start, pos)
+ pos += step //跳过分隔符
+ }
+
+ rule += queue.substring(pos) //将剩余字段压入数组末尾
+
+ return rule
+ }
+
+ if (st > end) { //先匹配到st1pos，表明分隔字串不在选择器中，将选择器前分隔字串分隔的字段依次压入数组
+
+ rule += arrayListOf(queue.substring(startX, end)) //压入分隔的首段规则到数组
+ pos = end + step //跳过分隔符
+
+ while (consumeTo(elementsType) && pos < st) { //循环切分规则压入数组
+ rule += queue.substring(start, pos)
+ pos += step //跳过分隔符
+ }
+
+ return if (pos > st) {
+ startX = start
+ splitRule() //首段已匹配,但当前段匹配未完成,调用二段匹配
+ } else { //执行到此，证明后面再无分隔字符
+ rule += queue.substring(pos) //将剩余字段压入数组末尾
+ rule
+ }
+ }
+
+ pos = st //位置推移到筛选器处
+ val next = if (queue[pos] == '[') ']' else ')' //平衡组末尾字符
+
+ if (!chompBalanced(queue[pos], next)) throw Error(
+ queue.substring(0, start) + "后未平衡"
+ ) //拉出一个筛选器,不平衡则报错
+
+ } while (end > pos)
+
+ start = pos //设置开始查找筛选器位置的起始位置
+
+ return if (!consumeTo(elementsType)) {
+ rule += queue.substring(startX)
+ rule
+ } else splitRule() //递归匹配
+
+ }
+
+ /**
+ * 替换内嵌规则
+ * @param inner 起始标志,如{$.
+ * @param startStep 不属于规则部分的前置字符长度，如{$.中{不属于规则的组成部分，故startStep为1
+ * @param endStep 不属于规则部分的后置字符长度
+ * @param fr 查找到内嵌规则时，用于解析的函数
+ *
+ * */
+ fun innerRule(
+ inner: String,
+ startStep: Int = 1,
+ endStep: Int = 1,
+ fr: (String) -> String?
+ ): String {
+ val st = StringBuilder()
+
+ while (consumeTo(inner)) { //拉取成功返回true，ruleAnalyzes里的字符序列索引变量pos后移相应位置，否则返回false,且isEmpty为true
+ val posPre = pos //记录consumeTo匹配位置
+ if (chompCodeBalanced('{', '}')) {
+ val frv = fr(queue.substring(posPre + startStep, pos - endStep))
+ if (!frv.isNullOrEmpty()) {
+ st.append(queue.substring(startX, posPre) + frv) //压入内嵌规则前的内容，及内嵌规则解析得到的字符串
+ startX = pos //记录下次规则起点
+ continue //获取内容成功，继续选择下个内嵌规则
+ }
+ }
+ pos += inner.length //拉出字段不平衡，inner只是个普通字串，跳到此inner后继续匹配
+ }
+
+ return if (startX == 0) "" else st.apply {
+ append(queue.substring(startX))
+ }.toString()
+ }
+
+ /**
+ * 替换内嵌规则
+ * @param fr 查找到内嵌规则时，用于解析的函数
+ *
+ * */
+ fun innerRule(
+ startStr: String,
+ endStr: String,
+ fr: (String) -> String?
+ ): String {
+
+ val st = StringBuilder()
+ while (consumeTo(startStr)) { //拉取成功返回true，ruleAnalyzes里的字符序列索引变量pos后移相应位置，否则返回false,且isEmpty为true
+ pos += startStr.length //跳过开始字符串
+ val posPre = pos //记录consumeTo匹配位置
+ if (consumeTo(endStr)) {
+ val frv = fr(queue.substring(posPre, pos))
+ st.append(
+ queue.substring(
+ startX,
+ posPre - startStr.length
+ ) + frv
+ ) //压入内嵌规则前的内容，及内嵌规则解析得到的字符串
+ pos += endStr.length //跳过结束字符串
+ startX = pos //记录下次规则起点
+ }
+ }
+
+ return if (startX == 0) queue else st.apply {
+ append(queue.substring(startX))
+ }.toString()
+ }
+
+ //设置平衡组函数，json或JavaScript时设置成chompCodeBalanced，否则为chompRuleBalanced
+ val chompBalanced = if (code) ::chompCodeBalanced else ::chompRuleBalanced
+
+ companion object {
+
+ /**
+ * 转义字符
+ */
+ private const val ESC = '\\'
+
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleData.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleData.kt
new file mode 100644
index 0000000..3424626
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleData.kt
@@ -0,0 +1,35 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see ()
+ }
+
+ override fun putVariable(key: String, value: String?) {
+ if (value != null) {
+ variableMap[key] = value
+ } else {
+ variableMap.remove(key)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleDataInterface.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleDataInterface.kt
new file mode 100644
index 0000000..ce8c76c
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/analyzeRule/RuleDataInterface.kt
@@ -0,0 +1,31 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see
+
+ fun putVariable(key: String, value: String?)
+
+ fun getVariable(key: String): String? {
+ return variableMap[key]
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/http/BackstageWebView.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/http/BackstageWebView.kt
new file mode 100644
index 0000000..2314efe
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/http/BackstageWebView.kt
@@ -0,0 +1,235 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see ? = null,
+ private val sourceRegex: String? = null,
+ private val javaScript: String? = null,
+) {
+
+ private val mHandler = Handler(Looper.getMainLooper())
+ private var callback: Callback? = null
+ private var mWebView: WebView? = null
+
+ suspend fun getStrResponse(): StrResponse = suspendCancellableCoroutine { block ->
+ block.invokeOnCancellation {
+ App.getHandler().post {
+ destroy()
+ }
+ }
+ callback = object : Callback() {
+ override fun onResult(response: StrResponse) {
+ if (!block.isCompleted)
+ block.resume(response)
+ }
+
+ override fun onError(error: Throwable) {
+ if (!block.isCompleted)
+ block.cancel(error)
+ }
+ }
+ App.getHandler().post {
+ try {
+ load()
+ } catch (error: Throwable) {
+ block.cancel(error)
+ }
+ }
+ }
+
+ private fun getEncoding(): String {
+ return encode ?: "utf-8"
+ }
+
+ @Throws(AndroidRuntimeException::class)
+ private fun load() {
+ val webView = createWebView()
+ mWebView = webView
+ try {
+ when {
+ !html.isNullOrEmpty() -> if (url.isNullOrEmpty()) {
+ webView.loadData(html, "text/html", getEncoding())
+ } else {
+ webView.loadDataWithBaseURL(url, html, "text/html", getEncoding(), url)
+ }
+ else -> if (headerMap == null) {
+ webView.loadUrl(url!!)
+ } else {
+ webView.loadUrl(url!!, headerMap)
+ }
+ }
+ } catch (e: Exception) {
+ callback?.onError(e)
+ }
+ }
+
+ @SuppressLint("SetJavaScriptEnabled", "JavascriptInterface")
+ private fun createWebView(): WebView {
+ val webView = WebView(App.getmContext())
+ val settings = webView.settings
+ settings.javaScriptEnabled = true
+ settings.domStorageEnabled = true
+ settings.blockNetworkImage = true
+ settings.userAgentString = headerMap?.get(APPCONST.UA_NAME)
+ settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
+ if (sourceRegex.isNullOrEmpty()) {
+ webView.webViewClient = HtmlWebViewClient()
+ } else {
+ webView.webViewClient = SnifferWebClient()
+ }
+ return webView
+ }
+
+ private fun destroy() {
+ mWebView?.destroy()
+ mWebView = null
+ }
+
+ private fun getJs(): String {
+ javaScript?.let {
+ if (it.isNotEmpty()) {
+ return it
+ }
+ }
+ return JS
+ }
+
+ private fun setCookie(url: String) {
+ tag?.let {
+ val cookie = CookieManager.getInstance().getCookie(url)
+ CookieStore.setCookie(it, cookie)
+ }
+ }
+
+ private inner class HtmlWebViewClient : WebViewClient() {
+
+ override fun onPageFinished(view: WebView, url: String) {
+ setCookie(url)
+ val runnable = EvalJsRunnable(view, url, getJs())
+ mHandler.postDelayed(runnable, 1000)
+ }
+
+ }
+
+ private inner class EvalJsRunnable(
+ webView: WebView,
+ private val url: String,
+ private val mJavaScript: String
+ ) : Runnable {
+ var retry = 0
+ private val mWebView: WeakReference = WeakReference(webView)
+ override fun run() {
+ mWebView.get()?.evaluateJavascript(mJavaScript) {
+ if (it.isNotEmpty() && it != "null") {
+ val content = StringEscapeUtils.unescapeJson(it)
+ .replace("^\"|\"$".toRegex(), "")
+ try {
+ val response = StrResponse(url, content)
+ callback?.onResult(response)
+ } catch (e: Exception) {
+ callback?.onError(e)
+ }
+ mHandler.removeCallbacks(this)
+ destroy()
+ return@evaluateJavascript
+ }
+ if (retry > 30) {
+ callback?.onError(NoStackTraceException("js执行超时"))
+ mHandler.removeCallbacks(this)
+ destroy()
+ return@evaluateJavascript
+ }
+ retry++
+ mHandler.removeCallbacks(this)
+ mHandler.postDelayed(this, 1000)
+ }
+ }
+ }
+
+ private inner class SnifferWebClient : WebViewClient() {
+
+ override fun onLoadResource(view: WebView, resUrl: String) {
+ sourceRegex?.let {
+ if (resUrl.matches(it.toRegex())) {
+ try {
+ val response = StrResponse(url!!, resUrl)
+ callback?.onResult(response)
+ } catch (e: Exception) {
+ callback?.onError(e)
+ }
+ destroy()
+ }
+ }
+ }
+
+ override fun onPageFinished(webView: WebView, url: String) {
+ setCookie(url)
+ val js = javaScript
+ if (!js.isNullOrEmpty()) {
+ val runnable = LoadJsRunnable(webView, javaScript)
+ mHandler.postDelayed(runnable, 1000L)
+ }
+ }
+
+ }
+
+ private class LoadJsRunnable(
+ webView: WebView,
+ private val mJavaScript: String?
+ ) : Runnable {
+ private val mWebView: WeakReference = WeakReference(webView)
+ override fun run() {
+ mWebView.get()?.loadUrl("javascript:${mJavaScript ?: ""}")
+ }
+ }
+
+ companion object {
+ const val JS = "document.documentElement.outerHTML"
+ }
+
+ abstract class Callback {
+ abstract fun onResult(response: StrResponse)
+ abstract fun onError(error: Throwable)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt
new file mode 100644
index 0000000..c7c79a7
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt
@@ -0,0 +1,131 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see by lazy {
+ ConcurrentHashMap()
+}
+
+val okHttpClient: OkHttpClient by lazy {
+ val specs = arrayListOf(
+ ConnectionSpec.MODERN_TLS,
+ ConnectionSpec.COMPATIBLE_TLS,
+ ConnectionSpec.CLEARTEXT
+ )
+
+ val builder = OkHttpClient.Builder()
+ .connectTimeout(15, TimeUnit.SECONDS)
+ .writeTimeout(15, TimeUnit.SECONDS)
+ .readTimeout(15, TimeUnit.SECONDS)
+ .callTimeout(60, TimeUnit.SECONDS)
+ .sslSocketFactory(SSLHelper.unsafeSSLSocketFactory, SSLHelper.unsafeTrustManager)
+ .retryOnConnectionFailure(true)
+ .hostnameVerifier(SSLHelper.unsafeHostnameVerifier)
+ .connectionSpecs(specs)
+ .followRedirects(true)
+ .followSslRedirects(true)
+ .addInterceptor(Interceptor { chain ->
+ val request = chain.request()
+ .newBuilder()
+ .addHeader("Keep-Alive", "300")
+ .addHeader("Connection", "Keep-Alive")
+ .addHeader("Cache-Control", "no-cache")
+ .build()
+ chain.proceed(request)
+ })
+ /*if (AppConfig.isCronet && CronetLoader.install() && !AppConfig.isGooglePlay) {
+ builder.addInterceptor(CronetInterceptor(null))
+ }*/
+ builder.build()
+}
+
+val globalProxy: String
+ get() {
+ val enableProxy = SharedPreUtils.getInstance().getBoolean("enableProxy")
+ if (!enableProxy) {
+ return ""
+ }
+ val type = if (SharedPreUtils.getInstance().getInt("proxyType") == 0) {
+ "http"
+ } else {
+ "socks5"
+ }
+ val host = SharedPreUtils.getInstance().getString("proxyHost")
+ val port = SharedPreUtils.getInstance().getString("proxyPort")
+ val username = SharedPreUtils.getInstance().getString("proxyUsername")
+ val password = SharedPreUtils.getInstance().getString("proxyPassword")
+ return "$type://$host:$port@$username@$password"
+ }
+
+/**
+ * 缓存代理okHttp
+ */
+fun getProxyClient(proxy0: String? = null, noProxy: Boolean = false): OkHttpClient {
+ var proxy = proxy0
+ if (proxy.isNullOrEmpty()) proxy = globalProxy
+ if (proxy.isNullOrBlank() || noProxy) {
+ return okHttpClient
+ }
+ proxyClientCache[proxy]?.let {
+ return it
+ }
+ val r = Regex("(http|socks4|socks5)://(.*):(\\d{2,5})(@.*@.*)?")
+ val ms = r.findAll(proxy)
+ val group = ms.first()
+ var username = "" //代理服务器验证用户名
+ var password = "" //代理服务器验证密码
+ val type = if (group.groupValues[1] == "http") "http" else "socks"
+ val host = group.groupValues[2]
+ val port = group.groupValues[3].toInt()
+ if (group.groupValues[4] != "") {
+ username = group.groupValues[4].split("@")[1]
+ password = group.groupValues[4].split("@")[2]
+ }
+ if (type != "direct" && host != "") {
+ val builder = okHttpClient.newBuilder()
+ if (type == "http") {
+ builder.proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress(host, port)))
+ } else {
+ builder.proxy(Proxy(Proxy.Type.SOCKS, InetSocketAddress(host, port)))
+ }
+ if (username != "" && password != "") {
+ builder.proxyAuthenticator { _, response -> //设置代理服务器账号密码
+ val credential: String = Credentials.basic(username, password)
+ response.request.newBuilder()
+ .header("Proxy-Authorization", credential)
+ .build()
+ }
+ }
+ val proxyClient = builder.build()
+ proxyClientCache[proxy] = proxyClient
+ return proxyClient
+ }
+ return okHttpClient
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/http/OkHttpUtils.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/http/OkHttpUtils.kt
new file mode 100644
index 0000000..c4f49e9
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/http/OkHttpUtils.kt
@@ -0,0 +1,204 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see ) {
+ headers.forEach {
+ if (it.key == APPCONST.UA_NAME) {
+ //防止userAgent重复
+ removeHeader(APPCONST.UA_NAME)
+ }
+ addHeader(it.key, it.value)
+ }
+}
+
+fun Request.Builder.get(url: String, queryMap: Map, encoded: Boolean = false) {
+ val httpBuilder = url.toHttpUrl().newBuilder()
+ queryMap.forEach {
+ if (encoded) {
+ httpBuilder.addEncodedQueryParameter(it.key, it.value)
+ } else {
+ httpBuilder.addQueryParameter(it.key, it.value)
+ }
+ }
+ url(httpBuilder.build())
+}
+
+fun Request.Builder.postForm(form: Map, encoded: Boolean = false) {
+ val formBody = FormBody.Builder()
+ form.forEach {
+ if (encoded) {
+ formBody.addEncoded(it.key, it.value.toString())
+ } else {
+ formBody.add(it.key, it.value.toString())
+ }
+ }
+ post(formBody.build())
+}
+
+fun Request.Builder.postMultipart(type: String?, form: Map) {
+ val multipartBody = MultipartBody.Builder()
+ type?.let {
+ multipartBody.setType(type.toMediaType())
+ }
+ form.forEach {
+ when (val value = it.value) {
+ is Map<*, *> -> {
+ val fileName = value["fileName"] as String
+ val file = value["file"]
+ val mediaType = (value["contentType"] as? String)?.toMediaType()
+ val requestBody = when (file) {
+ is File -> {
+ file.asRequestBody(mediaType)
+ }
+ is ByteArray -> {
+ file.toRequestBody(mediaType)
+ }
+ is String -> {
+ file.toRequestBody(mediaType)
+ }
+ else -> {
+ GSON.toJson(file).toRequestBody(mediaType)
+ }
+ }
+ multipartBody.addFormDataPart(it.key, fileName, requestBody)
+ }
+ else -> multipartBody.addFormDataPart(it.key, it.value.toString())
+ }
+ }
+ post(multipartBody.build())
+}
+
+fun Request.Builder.postJson(json: String?) {
+ json?.let {
+ val requestBody = json.toRequestBody("application/json; charset=UTF-8".toMediaType())
+ post(requestBody)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/http/RequestMethod.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/http/RequestMethod.kt
new file mode 100644
index 0000000..ae21e46
--- /dev/null
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/http/RequestMethod.kt
@@ -0,0 +1,23 @@
+/*
+ * This file is part of FYReader.
+ * FYReader is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FYReader is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FYReader. If not, see , authType: String) {
+ //do nothing，接受任意客户端证书
+ }
+
+ @SuppressLint("TrustAllX509TrustManager")
+ @Throws(CertificateException::class)
+ override fun checkServerTrusted(chain: Array, authType: String) {
+ //do nothing，接受任意客户端证书
+ }
+
+ override fun getAcceptedIssuers(): Array 
微信赞赏码
支付宝收款码
QQ收款码
