From a9f2c7f8d0ca0f682812941906719c12d312dcd4 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 29 May 2021 20:55:37 +0900 Subject: [PATCH 1/5] Adding tmdbId to movie collection check to fix mismatched names --- .../java/com/jasonhhouse/gaps/service/GapsSearchService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java index 34e771d9..25d78ba6 100755 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java @@ -468,6 +468,7 @@ private void handleCollection(PlexProperties plexProperties, String machineIdent Integer tmdbId = jsonNode.get(ID).intValue(); BasicMovie collectionBasicMovie = new BasicMovie.Builder(title, year).build(); + collectionBasicMovie.setTmdbId(tmdbId); LOGGER.info(collectionBasicMovie.toString()); Boolean owned = ownedBasicMovies.contains(collectionBasicMovie); From 989f1bcea62543d208650227b746e14dccccb4e9 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 29 May 2021 20:55:44 +0900 Subject: [PATCH 2/5] 0.9.1 --- Core/pom.xml | 2 +- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.ppc64le | 2 +- Dockerfile.raspbian | 2 +- Dockerfile.riscv64 | 2 +- GapsAsJar/gaps.nsi | 2 +- GapsWeb/pom.xml | 2 +- GapsWeb/src/main/resources/application.yaml | 2 +- GapsWeb/src/main/resources/templates/about.html | 2 +- GapsWeb/src/main/resources/templates/index.html | 2 +- GapsWeb/src/main/resources/templates/updates.html | 6 ++++++ Plex/pom.xml | 2 +- RadarrV3/pom.xml | 2 +- application-custom.yml | 2 +- build | 2 +- build.bat | 2 +- cypress/integration/about/about.spec.js | 2 +- cypress/integration/common.spec.js | 4 ++-- package-lock.json | 2 +- package.json | 2 +- pom.xml | 4 ++-- 22 files changed, 29 insertions(+), 23 deletions(-) diff --git a/Core/pom.xml b/Core/pom.xml index 9823dcea..008374b6 100755 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.9.0 + 0.9.1 4.0.0 diff --git a/Dockerfile b/Dockerfile index 34933f42..812f64c0 100755 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.9.1.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 5536ec9d..a8ebf7c5 100755 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.9.1.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 60e55c82..4179c34a 100755 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.9.1.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian index 5bc3e94b..f565f722 100755 --- a/Dockerfile.raspbian +++ b/Dockerfile.raspbian @@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.9.1.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index fde60bc4..2113def8 100755 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.9.1.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/GapsAsJar/gaps.nsi b/GapsAsJar/gaps.nsi index 5c95d60a..669f0516 100644 --- a/GapsAsJar/gaps.nsi +++ b/GapsAsJar/gaps.nsi @@ -48,4 +48,4 @@ RMDIR /r $INSTDIR SectionEnd # name the installer -OutFile "gaps-0.9.0-installer.exe" \ No newline at end of file +OutFile "gaps-0.9.1-installer.exe" \ No newline at end of file diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml index 8d90e4a0..0d6ee245 100755 --- a/GapsWeb/pom.xml +++ b/GapsWeb/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.9.0 + 0.9.1 4.0.0 diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml index 48af2eb2..5c0019da 100755 --- a/GapsWeb/src/main/resources/application.yaml +++ b/GapsWeb/src/main/resources/application.yaml @@ -50,7 +50,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.9.0 + version: 0.9.1 storageFolder: /usr/data properties: rssFeed: rssFeed.json diff --git a/GapsWeb/src/main/resources/templates/about.html b/GapsWeb/src/main/resources/templates/about.html index e6673f15..35456fc5 100755 --- a/GapsWeb/src/main/resources/templates/about.html +++ b/GapsWeb/src/main/resources/templates/about.html @@ -29,7 +29,7 @@ Gaps Logo

About

-

v0.9.0

+

v0.9.1

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 fad1abc7..5702c75e 100755 --- a/GapsWeb/src/main/resources/templates/index.html +++ b/GapsWeb/src/main/resources/templates/index.html @@ -27,7 +27,7 @@

Gaps Logo -

v0.9.0

+

v0.9.1

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 f4ac0328..cb01152a 100755 --- a/GapsWeb/src/main/resources/templates/updates.html +++ b/GapsWeb/src/main/resources/templates/updates.html @@ -28,6 +28,12 @@ Gaps Logo

Updates

+

v0.9.1

+
    +
  • Fixed bug in matching names in collections to use IDs
    • +
+ +

v0.9.0

  • Updated Cypress to 7.2.0
    • diff --git a/Plex/pom.xml b/Plex/pom.xml index 9f44f1ad..36f9a3f6 100755 --- a/Plex/pom.xml +++ b/Plex/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.9.0 + 0.9.1 4.0.0 diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml index 5831c5ae..c383a0bd 100755 --- a/RadarrV3/pom.xml +++ b/RadarrV3/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.9.0 + 0.9.1 4.0.0 diff --git a/application-custom.yml b/application-custom.yml index 72f3af79..9d47bb75 100644 --- a/application-custom.yml +++ b/application-custom.yml @@ -44,7 +44,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.9.0 + version: 0.9.1 storageFolder: /{CUSTOM_FOLDER} #Change to folder that gaps has permission to read, write, and delete in. properties: rssFeed: rssFeed.json diff --git a/build b/build index 5594323f..e2896635 100755 --- a/build +++ b/build @@ -11,7 +11,7 @@ ## set -e -VERSION=0.9.0 +VERSION=0.9.1 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar" ZIP_VERSION="GapsAsJar-$VERSION.zip" npm ci diff --git a/build.bat b/build.bat index 1f782d8b..b5a01391 100644 --- a/build.bat +++ b/build.bat @@ -7,7 +7,7 @@ call npm run uglifyjs-pages call mvn clean install del GapsOnWindows\*.jar del GapsOnWindows\README.md -copy GapsWeb\target\GapsWeb-0.9.0.jar GapsOnWindows\gaps.jar +copy GapsWeb\target\GapsWeb-0.9.1.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.spec.js b/cypress/integration/about/about.spec.js index 21ed4646..997b7415 100644 --- a/cypress/integration/about/about.spec.js +++ b/cypress/integration/about/about.spec.js @@ -21,7 +21,7 @@ describe('Verify About Page', () => { .should('have.text', 'About'); cy.get('.container > :nth-child(3)') - .should('have.text', 'v0.9.0'); + .should('have.text', 'v0.9.1'); cy.get('.container > :nth-child(6)') .should('have.text', 'Software'); diff --git a/cypress/integration/common.spec.js b/cypress/integration/common.spec.js index b12f2013..5df13678 100755 --- a/cypress/integration/common.spec.js +++ b/cypress/integration/common.spec.js @@ -11,8 +11,8 @@ /* global cy, expect */ /* eslint no-undef: "error" */ -// export const BASE_URL = ''; -export const BASE_URL = '/gaps'; +export const BASE_URL = ''; +// export const BASE_URL = '/gaps'; export const CYPRESS_VALUES = { notBeChecked: 'not.be.checked', diff --git a/package-lock.json b/package-lock.json index b6b82945..e35a3dec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "gaps", - "version": "0.9.0", + "version": "0.9.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e8d01ad1..7307d4e8 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gaps", - "version": "0.9.0", + "version": "0.9.1", "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": { diff --git a/pom.xml b/pom.xml index bbb79607..1a925363 100755 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ com.jasonhhouse Gaps - 0.9.0 + 0.9.1 Gaps Demo project for Spring Boot @@ -26,7 +26,7 @@ 3.9 1.9 2.8.0 - 0.9.0 + 0.9.1 3.0.0 30.1-jre 5.2.12.Final From 69f58f452d7eaf6ee82d6f022615b1e1c2f6c498 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 30 May 2021 18:53:51 +0900 Subject: [PATCH 3/5] Adding hound configuration --- .hound.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .hound.yml diff --git a/.hound.yml b/.hound.yml new file mode 100644 index 00000000..6728a4cb --- /dev/null +++ b/.hound.yml @@ -0,0 +1,3 @@ +eslint: + enabled: true + config_file: .eslintrc.json \ No newline at end of file From 6930cf4cbb5ab91c7552c6ea987de46d0211e8d5 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 30 May 2021 18:57:38 +0900 Subject: [PATCH 4/5] Hound uses older eslint --- .eslintrc | 25 +++++++++++++++++++++++++ .hound.yml | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 .eslintrc diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 00000000..92a17a54 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,25 @@ +{ + "env": { + "browser": true, + "es6": true, + "jquery": true + }, + "extends": [ + "airbnb-base" + ], + "parserOptions": { + "ecmaVersion": 2020, + "sourceType": "module" + }, + "rules": { + "max-len": 0, + "import/extensions": [ + "error", + "ignorePackages", + { + "js": "always" + } + ], + "prefer-rest-params": 0 + } +} diff --git a/.hound.yml b/.hound.yml index 6728a4cb..33c398d8 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,3 +1,3 @@ eslint: enabled: true - config_file: .eslintrc.json \ No newline at end of file + config_file: .eslintrc \ No newline at end of file From cc94afc70480dd0d7168cb1d3732fbcca5009898 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 30 May 2021 18:58:42 +0900 Subject: [PATCH 5/5] Removing custom lint reference --- .eslintrc | 25 ------------------------- .hound.yml | 3 +-- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 .eslintrc diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 92a17a54..00000000 --- a/.eslintrc +++ /dev/null @@ -1,25 +0,0 @@ -{ - "env": { - "browser": true, - "es6": true, - "jquery": true - }, - "extends": [ - "airbnb-base" - ], - "parserOptions": { - "ecmaVersion": 2020, - "sourceType": "module" - }, - "rules": { - "max-len": 0, - "import/extensions": [ - "error", - "ignorePackages", - { - "js": "always" - } - ], - "prefer-rest-params": 0 - } -} diff --git a/.hound.yml b/.hound.yml index 33c398d8..7dfcbe09 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,3 +1,2 @@ eslint: - enabled: true - config_file: .eslintrc \ No newline at end of file + enabled: true \ No newline at end of file