diff --git a/Core/pom.xml b/Core/pom.xml index f85723a..b775809 100755 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.7.5 + 0.8.0 4.0.0 @@ -15,7 +15,7 @@ com.jasonhhouse Plex - 0.7.5 + 0.8.0 diff --git a/Dockerfile b/Dockerfile index 2d4b804..795dac2 100755 --- a/Dockerfile +++ b/Dockerfile @@ -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/ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index caf3a15..18543e9 100755 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -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/ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f0e4822..b4aebd8 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -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/ diff --git a/GapsOnWindows/gaps.nsi b/GapsOnWindows/gaps.nsi index dce4b7f..5fc9bc7 100644 --- a/GapsOnWindows/gaps.nsi +++ b/GapsOnWindows/gaps.nsi @@ -48,4 +48,4 @@ RMDIR /r $INSTDIR SectionEnd # name the installer -OutFile "gaps-0.7.5-installer.exe" \ No newline at end of file +OutFile "gaps-0.8.0-installer.exe" \ No newline at end of file diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml index c792546..407ebda 100755 --- a/GapsWeb/pom.xml +++ b/GapsWeb/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.7.5 + 0.8.0 4.0.0 @@ -21,13 +21,13 @@ com.jasonhhouse Core - 0.7.5 + 0.8.0 com.jasonhhouse Plex - 0.7.5 + 0.8.0 diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml index 1cc6952..530b58b 100755 --- a/GapsWeb/src/main/resources/application.yaml +++ b/GapsWeb/src/main/resources/application.yaml @@ -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 diff --git a/GapsWeb/src/main/resources/static/js/modules/discord-notifications.js b/GapsWeb/src/main/resources/static/js/modules/discord-notifications.js index 2e5f0de..c6edf58 100644 --- a/GapsWeb/src/main/resources/static/js/modules/discord-notifications.js +++ b/GapsWeb/src/main/resources/static/js/modules/discord-notifications.js @@ -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 { diff --git a/GapsWeb/src/main/resources/templates/about.html b/GapsWeb/src/main/resources/templates/about.html index b5a5831..38ef970 100755 --- a/GapsWeb/src/main/resources/templates/about.html +++ b/GapsWeb/src/main/resources/templates/about.html @@ -78,7 +78,7 @@ Gaps Logo

About

-

v0.7.5

+

v0.8.0

Gaps searches through your Plex Server. It then queries for known diff --git a/GapsWeb/src/main/resources/templates/index.html b/GapsWeb/src/main/resources/templates/index.html index 22aa823..1b000d2 100755 --- a/GapsWeb/src/main/resources/templates/index.html +++ b/GapsWeb/src/main/resources/templates/index.html @@ -77,7 +77,7 @@

Gaps Logo -

v0.7.5

+

v0.8.0

Gaps searches through your Plex Server. It then queries for known diff --git a/GapsWeb/src/main/resources/templates/updates.html b/GapsWeb/src/main/resources/templates/updates.html index 02808a8..acf6ab2 100755 --- a/GapsWeb/src/main/resources/templates/updates.html +++ b/GapsWeb/src/main/resources/templates/updates.html @@ -78,15 +78,16 @@ Gaps Logo

Updates

-

v0.7.5

-
    -
  • Updating About page
  • -

v0.8.0

  • Added Discord Notifications
+

v0.7.5

+
    +
  • Updating About page
  • +
+

v0.7.4

  • Added auto restart to scheduler
  • diff --git a/GapsWeb/src/test/resources/application.yaml b/GapsWeb/src/test/resources/application.yaml index 49c2254..71c2f7b 100755 --- a/GapsWeb/src/test/resources/application.yaml +++ b/GapsWeb/src/test/resources/application.yaml @@ -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: diff --git a/Plex/pom.xml b/Plex/pom.xml index f0a3f74..5d1b41f 100755 --- a/Plex/pom.xml +++ b/Plex/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.7.5 + 0.8.0 4.0.0 diff --git a/build b/build index 3bbd0c6..28ed66e 100755 --- a/build +++ b/build @@ -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 diff --git a/build.bat b/build.bat index 6a52ce6..cb48c53 100644 --- a/build.bat +++ b/build.bat @@ -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 \ No newline at end of file diff --git a/cypress/integration/about/about.js b/cypress/integration/about/about.js index cf9edb1..c635de6 100644 --- a/cypress/integration/about/about.js +++ b/cypress/integration/about/about.js @@ -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'); diff --git a/cypress/integration/notifications/discord.spec.js b/cypress/integration/notifications/discord.spec.js index ec05962..6fab269 100644 --- a/cypress/integration/notifications/discord.spec.js +++ b/cypress/integration/notifications/discord.spec.js @@ -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') diff --git a/package-lock.json b/package-lock.json index 13fa81b..9c34e6b 100755 --- a/package-lock.json +++ b/package-lock.json @@ -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" diff --git a/package.json b/package.json index 32d7c5e..bee57c9 100755 --- a/package.json +++ b/package.json @@ -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", diff --git a/pom.xml b/pom.xml index a87c6b3..8ac1336 100755 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ com.jasonhhouse Gaps - 0.7.5 + 0.8.0 Gaps Demo project for Spring Boot diff --git a/start.sh b/start.sh index 4397b51..08b3ebe 100755 --- a/start.sh +++ b/start.sh @@ -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