From 5d2de4958a63a434b3b76711cd1e9c1ec33bd689 Mon Sep 17 00:00:00 2001 From: Jason House Date: Wed, 16 Mar 2022 12:02:17 -0400 Subject: [PATCH 1/2] Fixed non-released movies showing up when released --- .../gaps/service/GapsSearchService.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 c86a1d8d..18a5a2cf 100755 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java @@ -494,14 +494,17 @@ private void handleCollection(PlexProperties plexProperties, String machineIdent LOGGER.warn("Could not parse date"); } } - Integer tmdbId = jsonNode.get(ID).intValue(); + if((movieStatusService.getRawMovieStatus().equals(MovieStatus.RELEASED) && year != 0) || + movieStatusService.getRawMovieStatus().equals(MovieStatus.ALL)) { + Integer tmdbId = jsonNode.get(ID).intValue(); - BasicMovie collectionBasicMovie = new BasicMovie.Builder(title, year).build(); - collectionBasicMovie.setTmdbId(tmdbId); - LOGGER.info(collectionBasicMovie.toString()); + BasicMovie collectionBasicMovie = new BasicMovie.Builder(title, year).build(); + collectionBasicMovie.setTmdbId(tmdbId); + LOGGER.info(collectionBasicMovie.toString()); - Boolean owned = ownedBasicMovies.contains(collectionBasicMovie); - moviesInCollection.add(new MovieFromCollection(title, tmdbId, owned, year)); + Boolean owned = ownedBasicMovies.contains(collectionBasicMovie); + moviesInCollection.add(new MovieFromCollection(title, tmdbId, owned, year)); + } }); } @@ -629,7 +632,7 @@ private void handleCollection(PlexProperties plexProperties, String machineIdent continue; } - if(movieStatusService.getRawMovieStatus().equals(MovieStatus.RELEASED) && + if (movieStatusService.getRawMovieStatus().equals(MovieStatus.RELEASED) && movieDet.has("status") && !movieDet.get("status").textValue().equalsIgnoreCase("Released")) { LOGGER.warn("Movie '{} ({})' not released yet. Not adding the movie to recommended list.", title, movieDet.get(RELEASE_DATE)); From be3efde52593d74c887050079ee64b9cfa7be3bb Mon Sep 17 00:00:00 2001 From: Jason House Date: Wed, 16 Mar 2022 12:14:21 -0400 Subject: [PATCH 2/2] 0.10.2 --- Core/pom.xml | 2 +- Dockerfile | 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 | 5 +++++ Plex/pom.xml | 2 +- RadarrV3/pom.xml | 2 +- application-custom.yml | 2 +- build | 2 +- cypress/integration/about/about.spec.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- pom.xml | 4 ++-- 17 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Core/pom.xml b/Core/pom.xml index d2a49d37..036f7bb7 100755 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.10.2 + 0.10.3 4.0.0 diff --git a/Dockerfile b/Dockerfile index db537b99..0e0f3f18 100755 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/app WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.10.2.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.10.3.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index a7288fac..125190c2 100755 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/app WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.10.2.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.10.3.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/GapsAsJar/gaps.nsi b/GapsAsJar/gaps.nsi index 2e26eacf..2e312c48 100644 --- a/GapsAsJar/gaps.nsi +++ b/GapsAsJar/gaps.nsi @@ -48,4 +48,4 @@ RMDIR /r $INSTDIR SectionEnd # name the installer -OutFile "gaps-0.10.2-installer.exe" \ No newline at end of file +OutFile "gaps-0.10.3-installer.exe" \ No newline at end of file diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml index 91a66719..45ac3165 100755 --- a/GapsWeb/pom.xml +++ b/GapsWeb/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.10.2 + 0.10.3 4.0.0 diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml index 53849672..2f559bd0 100755 --- a/GapsWeb/src/main/resources/application.yaml +++ b/GapsWeb/src/main/resources/application.yaml @@ -42,7 +42,7 @@ info: app: name: Gaps description: Gaps searches through your Plex Server 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.10.2 + version: 0.10.3 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 33035de3..e0f16de7 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.10.2

+

v0.10.3

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

Gaps Logo -

v0.10.2

+

v0.10.3

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 549f8840..d8b4d186 100755 --- a/GapsWeb/src/main/resources/templates/updates.html +++ b/GapsWeb/src/main/resources/templates/updates.html @@ -28,6 +28,11 @@ Gaps Logo

Updates

+

v0.10.2

+
    +
  • Fixed non-released movies showing up when released
    • +
+

v0.10.2

  • Updating spring boot and cypress
    • diff --git a/Plex/pom.xml b/Plex/pom.xml index 2606e280..1090391f 100755 --- a/Plex/pom.xml +++ b/Plex/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.10.2 + 0.10.3 4.0.0 diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml index f1f7205d..df110e4b 100755 --- a/RadarrV3/pom.xml +++ b/RadarrV3/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.10.2 + 0.10.3 4.0.0 diff --git a/application-custom.yml b/application-custom.yml index 4d31a322..3a08b68f 100644 --- a/application-custom.yml +++ b/application-custom.yml @@ -35,7 +35,7 @@ info: app: name: Gaps description: Gaps searches through your Plex Server 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.10.2 + version: 0.10.3 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 336a2bfc..efe22c57 100755 --- a/build +++ b/build @@ -11,7 +11,7 @@ ## set -e -VERSION=0.10.2 +VERSION=0.10.3 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar" ZIP_VERSION="GapsAsJar-$VERSION.zip" npm ci diff --git a/cypress/integration/about/about.spec.js b/cypress/integration/about/about.spec.js index 8bae2336..6b85bf56 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.10.2'); + .should('have.text', 'v0.10.3'); cy.get('.container > :nth-child(6)') .should('have.text', 'Software'); diff --git a/package-lock.json b/package-lock.json index 03d99588..c7be8922 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gaps", - "version": "0.10.2", + "version": "0.10.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "gaps", - "version": "0.10.2", + "version": "0.10.3", "license": "ISC", "dependencies": { "cssnano": "^5.0.14", diff --git a/package.json b/package.json index 53293a3e..07dc8163 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gaps", - "version": "0.10.2", + "version": "0.10.3", "description": "Gaps searches through your Plex Server 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 d26cca32..c48b6804 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ com.jasonhhouse Gaps - 0.10.2 + 0.10.3 Gaps Demo project for Spring Boot @@ -26,7 +26,7 @@ 3.9 1.9 2.11.0 - 0.10.2 + 0.10.3 3.0.0 31.0.1-jre 6.1.5.Final