diff --git a/src/main/scala/de/tobias/playpad/model/plugin/Plugin.scala b/src/main/scala/de/tobias/playpad/model/plugin/Plugin.scala index 853d630ab9a13404fdad1b7868bb530cd507464e..b1b477b8bf48eec2002260b663a18237a18620bc 100644 --- a/src/main/scala/de/tobias/playpad/model/plugin/Plugin.scala +++ b/src/main/scala/de/tobias/playpad/model/plugin/Plugin.scala @@ -11,17 +11,15 @@ import com.j256.ormlite.table.DatabaseTable @DatabaseField var name: String = _ @DatabaseField var displayName: String = _ @DatabaseField var description: String = _ - @DatabaseField var path: String = _ @DatabaseField var version: String = _ @DatabaseField var build: Int = _ @DatabaseField var icon: String = _ @DatabaseField var category: String = _ - def this(name: String, displayName: String, path: String, description: String, version: String, build: Int, icon: String, category: String) { + def this(name: String, displayName: String, description: String, version: String, build: Int, icon: String, category: String) { this() this.name = name this.displayName = displayName - this.path = path this.description = description this.version = version this.build = build diff --git a/src/main/scala/de/tobias/playpad/server/plugin/PluginRawGet.scala b/src/main/scala/de/tobias/playpad/server/plugin/PluginRawGet.scala index d5f487e49a15a1a3415cfaee78901878285f305e..209bddcd41cb3b109977a53b9ad164743c22a785 100644 --- a/src/main/scala/de/tobias/playpad/server/plugin/PluginRawGet.scala +++ b/src/main/scala/de/tobias/playpad/server/plugin/PluginRawGet.scala @@ -1,9 +1,9 @@ package de.tobias.playpad.server.plugin -import java.nio.file.{Files, Paths} +import java.net.URL -import com.google.gson.Gson import com.j256.ormlite.dao.Dao +import de.thecodelabs.utils.io.IOUtils import de.tobias.playpad.model.plugin.Plugin import de.tobias.playpad.server.{Result, Status} import de.tobias.playpad.utils.settings.Settings @@ -14,14 +14,11 @@ import spark.{Request, Response, Route} */ class PluginRawGet(dao: Dao[Plugin, Int], settings: Settings) extends Route { - val gson = new Gson() - override def handle(request: Request, response: Response): AnyRef = { val plugin = dao.queryForId(request.params(":id").toInt) if (plugin == null) { return new Result(Status.ERROR, "Bad request") } - val path = Paths.get(settings.download_folder, plugin.path) - Files.readAllBytes(path) + IOUtils.urlToByteArray(new URL(s"${settings.plugin_source}/${plugin.name}/${plugin.version}/${plugin.name}-${plugin.version}.jar")) } } diff --git a/src/main/scala/de/tobias/playpad/utils/settings/Settings.scala b/src/main/scala/de/tobias/playpad/utils/settings/Settings.scala index 92cca291c70ba6a939c3fed9558b6e628e331e86..7a83d8744a82c294529c2a621c125ba9dfc2e8f2 100644 --- a/src/main/scala/de/tobias/playpad/utils/settings/Settings.scala +++ b/src/main/scala/de/tobias/playpad/utils/settings/Settings.scala @@ -16,5 +16,5 @@ class Settings { var db_password: String = "password" var db_database: String = "PlayWall" - var download_folder: String = "./" + var plugin_source: String = "https://maven.thecodelabs.de/artifactory/TheCodeLabs-release/de/tobias/playpad/" }