Mirrors/tachiyomi-extensions-inspector
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi-extensions-inspector.git synced 2025-03-01 06:45:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor proxy

Browse Source
This commit is contained in:
Aria Moradi 2021-03-28 20:41:39 +04:30
parent e6ba2a0066
commit b1b1abad1d
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/kotlin/ir/armor/tachidesk/server/ServerConfig.kt
View File

@ -16,7 +16,7 @@ class ServerConfig(config: Config) : ConfigModule(config) {
val port: Int by config val port: Int by config
// proxy // proxy
val socksProxy: Boolean by config val socksProxyEnabled: Boolean by config
val socksProxyHost: String by config val socksProxyHost: String by config
val socksProxyPort: String by config val socksProxyPort: String by config

18
server/src/main/kotlin/ir/armor/tachidesk/server/ServerSetup.kt
View File

@ -40,7 +40,7 @@ val androidCompat by lazy { AndroidCompat() }
fun applicationSetup() { fun applicationSetup() {
// register server config // register server config
GlobalConfigManager.registerModule( GlobalConfigManager.registerModule(
ServerConfig.register(GlobalConfigManager.config) ServerConfig.register(GlobalConfigManager.config)
) )
// set application wide logging level // set application wide logging level
@ -50,10 +50,10 @@ fun applicationSetup() {
// make dirs we need // make dirs we need
listOf( listOf(
applicationDirs.dataRoot, applicationDirs.dataRoot,
applicationDirs.extensionsRoot, applicationDirs.extensionsRoot,
"${applicationDirs.extensionsRoot}/icon", "${applicationDirs.extensionsRoot}/icon",
applicationDirs.thumbnailsRoot applicationDirs.thumbnailsRoot
).forEach { ).forEach {
File(it).mkdirs() File(it).mkdirs()
} }
@ -95,7 +95,9 @@ fun applicationSetup() {
System.setProperty("org.eclipse.jetty.LEVEL", "OFF") System.setProperty("org.eclipse.jetty.LEVEL", "OFF")
// socks proxy settings // socks proxy settings
System.getProperties()["proxySet"] = serverConfig.socksProxy.toString() if (serverConfig.socksProxyEnabled) {
System.getProperties()["socksProxyHost"] = serverConfig.socksProxyHost System.getProperties()["proxySet"] = "true"
System.getProperties()["socksProxyPort"] = serverConfig.socksProxyPort System.getProperties()["socksProxyHost"] = serverConfig.socksProxyHost
System.getProperties()["socksProxyPort"] = serverConfig.socksProxyPort
}
} }

2
server/src/main/resources/server-reference.conf
View File

@ -3,7 +3,7 @@ server.ip = "0.0.0.0"
server.port = 4567 server.port = 4567
# Socks5 proxy # Socks5 proxy
server.socksProxy = false server.socksProxyEnabled = false
server.socksProxyHost = "" server.socksProxyHost = ""
server.socksProxyPort = "" server.socksProxyPort = ""