Merge pull request #302 from JasonHHouse/bugfix/released_movies_showi…

…ng_up_wrongly Bugfix/released movies showing up wrongly
JasonHHouse · Mar 16, 2022 · 6f9e90d · 6f9e90d
2 parents 38fecbd + be3efde
commit 6f9e90d
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 25 deletions.
diff --git a/Core/pom.xml b/Core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.10.2</version>
+        <version>0.10.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git 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
@@ -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
@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
 SectionEnd
 
 # name the installer
-OutFile "gaps-0.10.2-installer.exe"
+OutFile "gaps-0.10.3-installer.exe"
diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.10.2</version>
+        <version>0.10.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git 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));

diff --git 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
@@ -29,7 +29,7 @@
     <img loading="lazy" th: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.10.2</h4>
+    <h4 class="top-margin text-primary">v0.10.3</h4>
 
     <p class="text-muted">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
@@ -27,7 +27,7 @@
 <div class="container bottom-margin">
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
-    <h3 class="top-margin">v0.10.2</h3>
+    <h3 class="top-margin">v0.10.3</h3>
 
     <p class="text-muted">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
@@ -28,6 +28,11 @@
     <img loading="lazy" th: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.10.2</h4>
+    <ul class="text-muted">
+        <li>Fixed non-released movies showing up when released</li>
+    </ul>
+
     <h4 class="top-margin text-primary">v0.10.2</h4>
     <ul class="text-muted">
         <li>Updating spring boot and cypress</li>

diff --git a/Plex/pom.xml b/Plex/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.10.2</version>
+        <version>0.10.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.10.2</version>
+        <version>0.10.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -17,7 +17,7 @@
     </parent>
     <groupId>com.jasonhhouse</groupId>
     <artifactId>Gaps</artifactId>
-    <version>0.10.2</version>
+    <version>0.10.3</version>
     <name>Gaps</name>
     <description>Demo project for Spring Boot</description>
 
@@ -26,7 +26,7 @@
         <apache.commons.lang3>3.9</apache.commons.lang3>
         <apache.commons.text>1.9</apache.commons.text>
         <commons.io>2.11.0</commons.io>
-        <gaps.version>0.10.2</gaps.version>
+        <gaps.version>0.10.3</gaps.version>
         <google.findbugs>3.0.0</google.findbugs>
         <guava>31.0.1-jre</guava>
         <hibernate.validator>6.1.5.Final</hibernate.validator>