This commit is contained in:
Jason House
2020-09-18 11:52:24 +09:00
parent acacc35694
commit 72e59eed12
21 changed files with 46 additions and 45 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.7.5</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -15,7 +15,7 @@
<dependency>
<groupId>com.jasonhhouse</groupId>
<artifactId>Plex</artifactId>
<version>0.7.5</version>
<version>0.8.0</version>
</dependency>
<dependency>

View File

@@ -24,7 +24,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
WORKDIR /usr/app
COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar
COPY GapsWeb/target/GapsWeb-0.8.0.jar /usr/app/gaps.jar
COPY start.sh /usr/app/

View File

@@ -22,7 +22,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
WORKDIR /usr/app
COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar
COPY GapsWeb/target/GapsWeb-0.8.0.jar /usr/app/gaps.jar
COPY start.sh /usr/app/

View File

@@ -22,7 +22,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
WORKDIR /usr/app
COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar
COPY GapsWeb/target/GapsWeb-0.8.0.jar /usr/app/gaps.jar
COPY start.sh /usr/app/

View File

@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
SectionEnd
# name the installer
OutFile "gaps-0.7.5-installer.exe"
OutFile "gaps-0.8.0-installer.exe"

View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.7.5</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -21,13 +21,13 @@
<dependency>
<groupId>com.jasonhhouse</groupId>
<artifactId>Core</artifactId>
<version>0.7.5</version>
<version>0.8.0</version>
</dependency>
<dependency>
<groupId>com.jasonhhouse</groupId>
<artifactId>Plex</artifactId>
<version>0.7.5</version>
<version>0.8.0</version>
</dependency>
<dependency>

View File

@@ -47,7 +47,7 @@ info:
app:
name: Gaps
description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
version: 0.7.5
version: 0.8.0
storageFolder: /usr/data
properties:
rssFeed: rssFeed.json

View File

@@ -53,7 +53,7 @@ export async function saveDiscordNotifications() {
body: JSON.stringify(body)
})
const put = await response.json();
if (put.code && put.code === Payload.SLACK_NOTIFICATION_UPDATE_SUCCEEDED) {
if (put.code && put.code === Payload.DISCORD_NOTIFICATION_UPDATE_SUCCEEDED) {
hideAllAlertsAndSpinners();
document.getElementById('discordSaveSuccess').style.display = 'block';
} else {

View File

@@ -78,7 +78,7 @@
<img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
<h3 class="top-margin">About</h3>
<h4 class="top-margin text-primary">v0.7.5</h4>
<h4 class="top-margin text-primary">v0.8.0</h4>
<p class="text-muted">Gaps searches through your Plex Server. It then queries
for known

View File

@@ -77,7 +77,7 @@
<div class="container bottom-margin">
<img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
<h3 class="top-margin">v0.7.5</h3>
<h3 class="top-margin">v0.8.0</h3>
<p class="text-muted">Gaps searches through your Plex Server. It then queries
for known

View File

@@ -78,15 +78,16 @@
<img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
<h3 class="top-margin">Updates</h3>
<h4 class="top-margin text-primary">v0.7.5</h4>
<ul class="text-muted">
<li>Updating About page</li>
</ul>
<h4 class="top-margin text-primary">v0.8.0</h4>
<ul class="text-muted">
<li>Added Discord Notifications</li>
</ul>
<h4 class="top-margin text-primary">v0.7.5</h4>
<ul class="text-muted">
<li>Updating About page</li>
</ul>
<h4 class="top-margin text-primary">v0.7.4</h4>
<ul class="text-muted">
<li>Added auto restart to scheduler</li>

View File

@@ -13,7 +13,7 @@ info:
app:
name: Gaps
description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
version: 0.7.5
version: 0.8.0
loginEnabled: false
storageFolder: /usr/data
properties:

View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.7.5</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
build
View File

@@ -1,5 +1,5 @@
#!/bin/bash
VERSION=0.7.5
VERSION=0.8.0
JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
ZIP_VERSION="Gaps-$VERSION.zip"
./minify

View File

@@ -19,7 +19,7 @@ call npm run uglifyjs-schedule-js
call mvn clean install
del GapsOnWindows\*.jar
del GapsOnWindows\README.md
copy GapsWeb\target\GapsWeb-0.7.5.jar GapsOnWindows\gaps.jar
copy GapsWeb\target\GapsWeb-0.8.0.jar GapsOnWindows\gaps.jar
copy README.md GapsOnWindows\
cd GapsOnWindows
makensis gaps.nsi

View File

@@ -9,7 +9,7 @@ describe('Verify About Page', function () {
.should('have.text', 'About');
cy.get('.container > :nth-child(3)')
.should('have.text', 'v0.7.5');
.should('have.text', 'v0.8.0');
cy.get('.container > :nth-child(6)')
.should('have.text', 'Software');

View File

@@ -8,7 +8,7 @@ describe('Check Discord Notification Agent', function () {
cy.request('/notifications/discord')
.then((resp) => {
let body = resp.body;
expect(body.code).to.eq(92);
expect(body.code).to.eq(142);
expect(body.extras.enabled).to.eq(false);
expect(body.extras.notificationTypes.length).to.eq(0);
expect(body.extras.webHookUrl).to.eq("");
@@ -52,13 +52,13 @@ describe('Check Discord Notification Agent', function () {
cy.request('PUT', '/notifications/discord', object)
.then((resp) => {
let body = resp.body;
expect(body.code).to.eq(90);
expect(body.code).to.eq(140);
expect(body.extras).to.eq(null);
})
.request('/notifications/discord')
.then((resp) => {
let body = resp.body;
expect(body.code).to.eq(92);
expect(body.code).to.eq(142);
expect(body.extras.webHookUrl).to.eq("webHookUrl");
})
.visit('/configuration')
@@ -100,13 +100,13 @@ describe('Check Discord Notification Agent', function () {
cy.request('PUT', '/notifications/discord', object)
.then((resp) => {
let body = resp.body;
expect(body.code).to.eq(90);
expect(body.code).to.eq(140);
expect(body.extras).to.eq(null);
})
.request('/notifications/discord')
.then((resp) => {
let body = resp.body;
expect(body.code).to.eq(92);
expect(body.code).to.eq(142);
expect(body.extras.webHookUrl).to.eq("webHookUrl");
})
.visit('/configuration')

26
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "gaps",
"version": "0.7.5",
"version": "0.8.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -141,9 +141,9 @@
"dev": true
},
"ajv": {
"version": "6.12.4",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
"integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
"version": "6.12.5",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
"integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -830,9 +830,9 @@
}
},
"cypress": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/cypress/-/cypress-5.1.0.tgz",
"integrity": "sha512-craPRO+Viu4268s7eBvX5VJW8aBYcAQT+EwEccQSMY+eH1ZPwnxIgyDlmMWvxLVX9SkWxOlZbEycPyzanQScBQ==",
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/cypress/-/cypress-5.2.0.tgz",
"integrity": "sha512-9S2spcrpIXrQ+CQIKHsjRoLQyRc2ehB06clJXPXXp1zyOL/uZMM3Qc20ipNki4CcNwY0nBTQZffPbRpODeGYQg==",
"dev": true,
"requires": {
"@cypress/listr-verbose-renderer": "^0.4.1",
@@ -2091,9 +2091,9 @@
}
},
"moment": {
"version": "2.27.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
"integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==",
"version": "2.28.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz",
"integrity": "sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw==",
"dev": true
},
"ms": {
@@ -3026,9 +3026,9 @@
"integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
},
"rxjs": {
"version": "6.6.2",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
"integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
"version": "6.6.3",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
"integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
"dev": true,
"requires": {
"tslib": "^1.9.0"

View File

@@ -1,6 +1,6 @@
{
"name": "gaps",
"version": "0.7.5",
"version": "0.8.0",
"description": "Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.",
"main": "/",
"dependencies": {
@@ -10,7 +10,7 @@
"uglify-js": "^3.10.0"
},
"devDependencies": {
"cypress": "^5.1.0"
"cypress": "^5.2.0"
},
"scripts": {
"e2e": "cypress open",

View File

@@ -16,7 +16,7 @@
</parent>
<groupId>com.jasonhhouse</groupId>
<artifactId>Gaps</artifactId>
<version>0.7.5</version>
<version>0.8.0</version>
<name>Gaps</name>
<description>Demo project for Spring Boot</description>

View File

@@ -12,8 +12,8 @@ else
if [ $ENABLE_LOGIN == true ]; then
java -jar -Dspring.profiles.active=no-ssl $JAR_FILE
else
java -jar -Dspring.profiles.active=no-ssl-no-login $JAR_FILE
#java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar -Dspring.profiles.active=no-ssl-no-login $JAR_FILE
#java -jar -Dspring.profiles.active=no-ssl-no-login $JAR_FILE
java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar -Dspring.profiles.active=no-ssl-no-login $JAR_FILE
fi
fi