temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-03 10:54:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix python path

Browse Source
This commit is contained in:
Aria Moradi
2023-04-25 10:47:21 +03:30
parent f37d7c841b
commit 62ee91ff0e
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
View File

@@ -89,6 +89,7 @@ object CloudflareBypasser {
py.exec("options.add_argument('--proxy-server=$proxy')") py.exec("options.add_argument('--proxy-server=$proxy')")
} }
py.exec("driver = uc.Chrome(options=options)") py.exec("driver = uc.Chrome(options=options)")
py.exec("driver = uc.Chrome(options=options, driver_executable_path='${py.chromedriverPath.replace("\\","\\\\")}')")
// TODO: handle custom userAgent // TODO: handle custom userAgent
// val userAgent = originalRequest.header("User-Agent") // val userAgent = originalRequest.header("User-Agent")
@@ -155,6 +156,7 @@ object CloudflareBypasser {
py.exec("options.add_argument('--headless')") py.exec("options.add_argument('--headless')")
py.exec("options.add_argument('--disable-gpu')") py.exec("options.add_argument('--disable-gpu')")
py.exec("driver = uc.Chrome(options=options)") py.exec("driver = uc.Chrome(options=options)")
// py.exec("driver = uc.Chrome(options=options, driver_executable_path='${py.chromedriverPath.replace("\\","\\\\")}')")
py.exec("userAgent = driver.execute_script('return navigator.userAgent')") py.exec("userAgent = driver.execute_script('return navigator.userAgent')")
val userAgent = py.getValue("userAgent") val userAgent = py.getValue("userAgent")
@@ -232,7 +234,8 @@ object CloudflareBypasser {
} }
private class CloudflareBypassException(message: String?) : Exception(message) private class CloudflareBypassException(message: String?) : Exception(message)
class PythonInterpreter private constructor(private val process: Process) : Closeable { class PythonInterpreter
private constructor(private val process: Process, val chromedriverPath: String) : Closeable {
private val logger = KotlinLogging.logger {} private val logger = KotlinLogging.logger {}
private val stdin = process.outputStream private val stdin = process.outputStream
@@ -300,29 +303,39 @@ class PythonInterpreter private constructor(private val process: Process) : Clos
destroy() destroy()
} }
companion object { companion object {
fun create(pythonPath: String, workingDir: String, pythonStartupFile: String? = null): PythonInterpreter { fun create(pythonPath: String, workingDir: String, pythonStartupFile: String, chromedriverPath: String): PythonInterpreter {
val processBuilder = ProcessBuilder() val processBuilder = ProcessBuilder()
.command(pythonPath, "-i", "-q") .command(pythonPath, "-i", "-q")
processBuilder.directory(File(workingDir)) processBuilder.directory(File(workingDir))
if (pythonStartupFile != null) { val environment = processBuilder.environment()
val environment = processBuilder.environment() environment["PYTHONSTARTUP"] = pythonStartupFile
environment["PYTHONSTARTUP"] = pythonStartupFile
}
val process = processBuilder.start() val process = processBuilder.start()
val pythonInterpreter = PythonInterpreter(process) return PythonInterpreter(process, chromedriverPath)
return pythonInterpreter
} }
fun create(): PythonInterpreter { fun create(): PythonInterpreter {
val uc = serverConfig.undetectedChromePath val uc = serverConfig.undetectedChromePath
val pythonPath = if (System.getProperty("os.name").startsWith("Windows")) {
"$uc\\venv\\Scripts\\python.exe"
} else {
"$uc/venv/bin/python"
}
val chromedriverPath = if (System.getProperty("os.name").startsWith("Windows")) {
"$uc\\chromedriver.exe"
} else {
"$uc/chromedriver"
}
return create( return create(
"$uc/venv/bin/python", pythonPath,
uc, uc,
"$uc/console.py" "$uc/console.py",
chromedriverPath
) )
} }
} }