mirror/gaps
1
0
Fork 0
mirror of https://github.com/JasonHHouse/gaps.git synced 2026-02-09 12:18:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing 404

Browse Source 
Changing RSS check to anchors to copy
This commit is contained in:
Jason House
2020-03-22 11:38:58 +09:00
parent 91b3621fa5
commit 10b3eebae2
4 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java
View File

@@ -43,12 +43,9 @@ public class RSSController {
}
@RequestMapping(method = RequestMethod.GET,
path = "/rss")
public String getRss(@RequestParam("library") String library) {
LOGGER.info("getRss( " + library + " )");
String[] keys = library.split("_");
String machineIdentifier = keys[0];
int libraryKey = Integer.parseInt(keys[1]);
path = "/rss/{machineIdentifier}/{libraryKey}")
public String getRss(@PathVariable("machineIdentifier") String machineIdentifier, @PathVariable("libraryKey") Integer libraryKey) {
LOGGER.info("getRss( " + machineIdentifier + ", " + libraryKey + " )");
String rss = null;
if (ioService.doesRssFileExist(machineIdentifier, libraryKey)) {

12
GapsWeb/src/main/resources/templates/error/404.html
View File

@@ -14,15 +14,15 @@
<title>Gaps</title>
<meta content="#3f51b5" name="theme-color"/>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
<link href="images/gaps.ico" rel="shortcut icon"/>
<link href="css/bootstrap.min.css" rel="stylesheet"/>
<link href="css/input.min.css" rel="stylesheet">
<link href="/images/gaps.ico" rel="shortcut icon"/>
<link href="/css/bootstrap.min.css" rel="stylesheet"/>
<link href="/css/input.min.css" rel="stylesheet">
<!--Let browser know website is optimized for mobile-->
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
</head>
<body onload="onStart()">
<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<a class="navbar-brand" href="/">Gaps</a>
@@ -61,7 +61,7 @@
</div>
<script src="js/jquery-3.4.1.min.js" type="text/javascript"></script>
<script src="js/bootstrap.bundle.min.js" type="text/javascript"></script>
<script src="/js/jquery-3.4.1.min.js" type="text/javascript"></script>
<script src="/js/bootstrap.bundle.min.js" type="text/javascript"></script>
</body>
</html>

10
GapsWeb/src/main/resources/templates/rssCheck.html
View File

@@ -68,13 +68,9 @@
<form action="/rss" class="top-margin" method="get">
<div th:each="instance : ${plexServerMap}" class="form-check">
<input class="form-check-input" id="library" name="library" type="radio"
th:value="${instance.value.getMachineIdentifier() + '_' + instance.key.getKey()}">
<label class="form-check-label" for="library"
th:text="${instance.value.getFriendlyName() + ' - ' + instance.key.getTitle()}">
</label>
</div>
<button class="btn btn-primary top-margin" type="submit">Open</button>
<a th:href="'/rss/' + ${instance.value.getMachineIdentifier() + '/' + instance.key.getKey()}"
th:text="${instance.value.getFriendlyName() + ' - ' + instance.key.getTitle()}">
</a>
</form>
</div>

6
buildVersion.sh
View File

@@ -1,12 +1,12 @@
#!/bin/bash
read -n 1 -s -r -p "Are the ports set correctly?"
VERSION="0.2.2"
DOCKER_SSL_VERSION="housewrecker/gaps:v$VERSION-alpha"
DOCKER_NO_SSL_VERSION="housewrecker/gaps:v$VERSION-alpha-no-ssl"
DOCKER_SSL_VERSION="housewrecker/gaps:v$VERSION"
DOCKER_NO_SSL_VERSION="housewrecker/gaps:v$VERSION-no-ssl"
JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
ZIP_VERSION="Gaps-$VERSION.zip"
mvn clean install
cypress run
#cypress run
docker build -f Dockerfile.ssl -t $DOCKER_SSL_VERSION .
docker push $DOCKER_SSL_VERSION
docker build -f Dockerfile.no-ssl -t $DOCKER_NO_SSL_VERSION .