From 53e7ce65971e0204ff0c09f57614e055553abf7b Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Fri, 9 Aug 2019 20:48:01 +0200
Subject: [PATCH] Change plugin source to artifactory
---
.../scala/de/tobias/playpad/model/plugin/Plugin.scala | 4 +---
.../de/tobias/playpad/server/plugin/PluginRawGet.scala | 9 +++------
.../de/tobias/playpad/utils/settings/Settings.scala | 2 +-
3 files changed, 5 insertions(+), 10 deletions(-)
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 853d630..b1b477b 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 d5f487e..209bddc 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 92cca29..7a83d87 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/"
}
--
GitLab