Northern_Lights/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-19 14:40:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat:allow choosing directory for appdata (#582)

Browse Source
This commit is contained in:
tdjnodj 2023-05-14 14:30:51 +08:00 committed by GitHub
parent ee43609561
commit 44f96af680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -57,8 +57,8 @@ https://matsuridayo.github.io
## 运行参数 ## 运行参数
- `-many` 无视同目录正在运行的实例，强行开启新的实例 (0.11+) - `-many` 无视同目录正在运行的实例，强行开启新的实例 (0.11+)。
- `-appdata` 开启后配置文件会放在共享目录，无法多开和自动升级 (0.11+) - `-appdata` 开启后配置文件会指定目录，未指定目录则使用共享目录，无法多开和自动升级 (0.11+)。
## Windows 运行 ## Windows 运行

1
main/NekoRay_DataStore.hpp
View File

@ -71,6 +71,7 @@ namespace NekoRay {
bool spmode_vpn = false; bool spmode_vpn = false;
bool spmode_system_proxy = false; bool spmode_system_proxy = false;
bool need_keep_vpn_off = false; bool need_keep_vpn_off = false;
QString appdataDir = "";
QStringList ignoreConnTag = {}; QStringList ignoreConnTag = {};
Routing *routing = new Routing; Routing *routing = new Routing;

16
main/main.cpp
View File

@ -78,7 +78,13 @@ int main(int argc, char* argv[]) {
// Flags // Flags
NekoRay::dataStore->argv = QApplication::arguments(); NekoRay::dataStore->argv = QApplication::arguments();
if (NekoRay::dataStore->argv.contains("-many")) NekoRay::dataStore->flag_many = true; if (NekoRay::dataStore->argv.contains("-many")) NekoRay::dataStore->flag_many = true;
if (NekoRay::dataStore->argv.contains("-appdata")) NekoRay::dataStore->flag_use_appdata = true; if (NekoRay::dataStore->argv.contains("-appdata")) {
NekoRay::dataStore->flag_use_appdata = true;
int appdataIndex = NekoRay::dataStore->argv.indexOf("-appdata");
if (NekoRay::dataStore->argv.size() > appdataIndex + 1 && !NekoRay::dataStore->argv.at(appdataIndex + 1).startsWith("-")) {
NekoRay::dataStore->appdataDir = NekoRay::dataStore->argv.at(appdataIndex + 1);
}
}
if (NekoRay::dataStore->argv.contains("-tray")) NekoRay::dataStore->flag_tray = true; if (NekoRay::dataStore->argv.contains("-tray")) NekoRay::dataStore->flag_tray = true;
if (NekoRay::dataStore->argv.contains("-debug")) NekoRay::dataStore->flag_debug = true; if (NekoRay::dataStore->argv.contains("-debug")) NekoRay::dataStore->flag_debug = true;
if (NekoRay::dataStore->argv.contains("-flag_linux_run_core_as_admin")) NekoRay::dataStore->flag_linux_run_core_as_admin = true; if (NekoRay::dataStore->argv.contains("-flag_linux_run_core_as_admin")) NekoRay::dataStore->flag_linux_run_core_as_admin = true;
@ -93,9 +99,13 @@ int main(int argc, char* argv[]) {
auto wd = QDir(QApplication::applicationDirPath()); auto wd = QDir(QApplication::applicationDirPath());
if (NekoRay::dataStore->flag_use_appdata) { if (NekoRay::dataStore->flag_use_appdata) {
QApplication::setApplicationName("nekoray"); QApplication::setApplicationName("nekoray");
wd.setPath(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)); if (!NekoRay::dataStore->appdataDir.isEmpty()) {
wd.setPath(NekoRay::dataStore->appdataDir);
} else {
wd.setPath(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
}
} }
if (!wd.exists()) wd.mkdir(wd.absolutePath()); if (!wd.exists()) wd.mkpath(wd.absolutePath());
if (!wd.exists("config")) wd.mkdir("config"); if (!wd.exists("config")) wd.mkdir("config");
QDir::setCurrent(wd.absoluteFilePath("config")); QDir::setCurrent(wd.absoluteFilePath("config"));
QDir("temp").removeRecursively(); QDir("temp").removeRecursively();