Skip to content
Snippets Groups Projects
Commit 02f4932a authored by Nindouja's avatar Nindouja
Browse files

Correct tautulli port

parent 11643ac3
Branches
Tags v-0.0.8
No related merge requests found
Pipeline #2296 canceled
...@@ -11,9 +11,9 @@ import java.nio.charset.StandardCharsets ...@@ -11,9 +11,9 @@ import java.nio.charset.StandardCharsets
@RestController @RestController
@RequestMapping("fs-proxy") @RequestMapping("/fs")
class FilesystemProxyController { class FilesystemProxyController {
@GetMapping() @GetMapping("/proxy")
fun getFsProxyRoot( fun getFsProxyRoot(
@RequestParam(value = "path", required = false, defaultValue = "/") path: String = "/", @RequestParam(value = "path", required = false, defaultValue = "/") path: String = "/",
@RequestParam(value = "format", required = false) format: String?, @RequestParam(value = "format", required = false) format: String?,
......
...@@ -9,15 +9,15 @@ import ovh.vba.vizbab.vizbabapi.components.monitoring.tautulli.TautulliWrapper ...@@ -9,15 +9,15 @@ import ovh.vba.vizbab.vizbabapi.components.monitoring.tautulli.TautulliWrapper
@RestController @RestController
@RequestMapping("monitoring") @RequestMapping("/monitoring")
class MonitoringController() { class MonitoringController() {
@GetMapping(path = ["tautulli/history"]) @GetMapping("/tautulli/history")
fun getTautulliHistory(): TautulliHistory { fun getTautulliHistory(): TautulliHistory {
return TautulliWrapper.getHistory() return TautulliWrapper.getHistory()
} }
@GetMapping(path = ["tautulli/activity"]) @GetMapping("/tautulli/activity")
fun getTautulliActivity(): TautulliActivity { fun getTautulliActivity(): TautulliActivity {
return TautulliWrapper.getActivity() return TautulliWrapper.getActivity()
} }
......
...@@ -16,10 +16,10 @@ import java.io.IOException ...@@ -16,10 +16,10 @@ import java.io.IOException
@RestController @RestController
@RequestMapping("stream") @RequestMapping("/stream")
class StreamApi(private val mediaLoaderService: MediaStreamLoader) { class StreamApi(private val mediaLoaderService: MediaStreamLoader) {
@GetMapping(value = ["play"]) @GetMapping("play")
fun playMediaV02( fun playMediaV02(
@PathParam("path") path: String?, @PathParam("path") path: String?,
@PathParam("file") file: String?, @PathParam("file") file: String?,
......
...@@ -9,7 +9,7 @@ import ovh.vba.vizbab.vizbabapi.components.tasks.dummy.RepeatingTask ...@@ -9,7 +9,7 @@ import ovh.vba.vizbab.vizbabapi.components.tasks.dummy.RepeatingTask
@RestController @RestController
@RequestMapping("tasks") @RequestMapping("/tasks")
class TasksController { class TasksController {
@PutMapping() @PutMapping()
fun startDummyTask(): VizTaskInfos { fun startDummyTask(): VizTaskInfos {
......
...@@ -20,7 +20,7 @@ import java.nio.file.Path ...@@ -20,7 +20,7 @@ import java.nio.file.Path
import java.nio.file.Paths import java.nio.file.Paths
@RestController @RestController
@RequestMapping("ygg/requests") @RequestMapping("/ygg/requests")
class YggTorrentRequestsController(@Autowired var repo: YggRequestRepository) { class YggTorrentRequestsController(@Autowired var repo: YggRequestRepository) {
@GetMapping @GetMapping
fun listRequestedTorrents(): MutableIterable<YggRequest?> { fun listRequestedTorrents(): MutableIterable<YggRequest?> {
...@@ -35,7 +35,7 @@ class YggTorrentRequestsController(@Autowired var repo: YggRequestRepository) { ...@@ -35,7 +35,7 @@ class YggTorrentRequestsController(@Autowired var repo: YggRequestRepository) {
} }
@PostMapping(path = ["torrent"]) @PostMapping("/torrent")
fun uploadTorrent(@RequestParam("file") file: MultipartFile, @RequestParam(value = "uuid", required = true) uuid: String): ResponseEntity<Void> { fun uploadTorrent(@RequestParam("file") file: MultipartFile, @RequestParam(value = "uuid", required = true) uuid: String): ResponseEntity<Void> {
val findById = repo.findById(uuid).get() val findById = repo.findById(uuid).get()
val filepath = VizbabConfig.yggRequests.dir.resolve(uuid).resolve(file.originalFilename) val filepath = VizbabConfig.yggRequests.dir.resolve(uuid).resolve(file.originalFilename)
...@@ -51,7 +51,7 @@ class YggTorrentRequestsController(@Autowired var repo: YggRequestRepository) { ...@@ -51,7 +51,7 @@ class YggTorrentRequestsController(@Autowired var repo: YggRequestRepository) {
return ResponseEntity<Void>(HttpStatus.NO_CONTENT) return ResponseEntity<Void>(HttpStatus.NO_CONTENT)
} }
@GetMapping(path = ["torrent"]) @GetMapping("/torrent")
fun downloadTorrent(@RequestParam(value = "uuid", required = true) uuid: String): ResponseEntity<Resource> { fun downloadTorrent(@RequestParam(value = "uuid", required = true) uuid: String): ResponseEntity<Resource> {
val findById = repo.findById(uuid) val findById = repo.findById(uuid)
val path: Path = Paths.get(findById.get().fsPath!!) val path: Path = Paths.get(findById.get().fsPath!!)
......
...@@ -8,10 +8,11 @@ import ovh.vba.vizbab.vizbabapi.components.monitoring.tautulli.TautulliWrapper ...@@ -8,10 +8,11 @@ import ovh.vba.vizbab.vizbabapi.components.monitoring.tautulli.TautulliWrapper
@RestController @RestController
@RequestMapping("config") @RequestMapping("/config")
class ConfigController { class ConfigController {
@GetMapping("alt")
fun getConfig2(): TautulliHistory { @GetMapping("/alt")
fun getTautulliHistory(): TautulliHistory {
return TautulliWrapper.getHistory() return TautulliWrapper.getHistory()
} }
...@@ -20,7 +21,7 @@ class ConfigController { ...@@ -20,7 +21,7 @@ class ConfigController {
return ClientConfig() return ClientConfig()
} }
@GetMapping(path = ["reload"]) @GetMapping("/reload")
fun reloadConfig(): ClientConfig { fun reloadConfig(): ClientConfig {
VizbabConfig.readDisk() VizbabConfig.readDisk()
return ClientConfig() return ClientConfig()
......
...@@ -5,5 +5,5 @@ import com.fasterxml.jackson.annotation.JsonProperty ...@@ -5,5 +5,5 @@ import com.fasterxml.jackson.annotation.JsonProperty
class Tautulli { class Tautulli {
@JsonProperty @JsonProperty
var url: String = "http://tautulli" var url: String = "http://tautulli:8181"
} }
...@@ -9,7 +9,7 @@ tasks: ...@@ -9,7 +9,7 @@ tasks:
monitoring: monitoring:
tautulli: tautulli:
url: url:
http://tautulli http://tautulli:8181
fs-proxy: fs-proxy:
dir: /vizbab/config/config.yml dir: /vizbab/config/config.yml
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment