Merge pull request #116 from JasonHHouse/improvement/fixing_titles

Improvement/fixing titles
2026-02-11 21:28:37 -06:00 · 2020-04-15 14:24:31 +09:00
parent 4c800ca876 6bfa04b14a
commit e1178ec476
16 changed files with 27 additions and 26 deletions
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>Gaps</artifactId>
        <groupId>com.jasonhhouse</groupId>
-        <version>0.3.0</version>
+        <version>0.3.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/Dockerfile.no-ssl
+++ b/Dockerfile.no-ssl
@@ -12,6 +12,6 @@ RUN mkdir -p /usr/app

 WORKDIR /usr/app

-COPY GapsWeb/target/GapsWeb-0.3.0.jar /usr/app/
+COPY GapsWeb/target/GapsWeb-0.3.1.jar /usr/app/

-ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=no-ssl", "GapsWeb-0.3.0.jar"]
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=no-ssl", "GapsWeb-0.3.1.jar"]
--- a/Dockerfile.ssl
+++ b/Dockerfile.ssl
@@ -12,6 +12,6 @@ RUN mkdir -p /usr/app

 WORKDIR /usr/app

-COPY GapsWeb/target/GapsWeb-0.3.0.jar /usr/app/
+COPY GapsWeb/target/GapsWeb-0.3.1.jar /usr/app/

-ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=ssl", "GapsWeb-0.3.0.jar"]
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=ssl", "GapsWeb-0.3.1.jar"]
--- a/GapsOnWindows/GapsOnWindows.xml
+++ b/GapsOnWindows/GapsOnWindows.xml
@@ -2,8 +2,8 @@
 <launch4jConfig>
  <dontWrapJar>false</dontWrapJar>
  <headerType>console</headerType>
-  <jar>/Users/jhouse/Code/Gaps/GapsWeb/target/GapsWeb-0.3.0.jar</jar>
-  <outfile>/Users/jhouse/Desktop/Gaps-v0.3.0.exe</outfile>
+  <jar>/Users/jhouse/Code/Gaps/GapsWeb/target/GapsWeb-0.3.1.jar</jar>
+  <outfile>/Users/jhouse/Desktop/Gaps-v0.3.1.exe</outfile>
  <errTitle></errTitle>
  <cmdLine></cmdLine>
  <chdir>.</chdir>
@@ -28,16 +28,16 @@
    <runtimeBits>64/32</runtimeBits>
  </jre>
  <versionInfo>
-    <fileVersion>0.3.0.0</fileVersion>
+    <fileVersion>0.3.1.0</fileVersion>
    <txtFileVersion>Free Form</txtFileVersion>
    <fileDescription>Gaps</fileDescription>
    <copyright>2019</copyright>
-    <productVersion>0.3.0.0</productVersion>
+    <productVersion>0.3.1.0</productVersion>
    <txtProductVersion>Free Form</txtProductVersion>
    <productName>Gaps</productName>
    <companyName></companyName>
    <internalName>Gaps</internalName>
-    <originalFilename>Gaps-v0.3.0.exe</originalFilename>
+    <originalFilename>Gaps-v0.3.1.exe</originalFilename>
    <trademarks></trademarks>
    <language>ENGLISH_US</language>
  </versionInfo>
--- a/GapsWeb/pom.xml
+++ b/GapsWeb/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>Gaps</artifactId>
        <groupId>com.jasonhhouse</groupId>
-        <version>0.3.0</version>
+        <version>0.3.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -19,7 +19,7 @@
        <dependency>
            <groupId>com.jasonhhouse</groupId>
            <artifactId>Core</artifactId>
-            <version>0.3.0</version>
+            <version>0.3.1</version>
        </dependency>

        <dependency>
--- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
+++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
@@ -188,10 +188,10 @@ public class GapsSearchService implements GapsSearch {

        for (Movie movie : ownedMovies) {

-            String languageCode = "en";
-            if (movie.getLanguage() != null) {
-                languageCode = new Locale(movie.getLanguage(), "").getLanguage();
-            }
+            String languageCode = "en-US";
+//            if (StringUtils.isNotBlank(movie.getLanguage())) {
+//                languageCode = new Locale(movie.getLanguage(), "").getLanguage();
+//            }

            //Cancel search if needed
            if (cancelSearch.get()) {
--- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/IoService.java
+++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/IoService.java
@@ -379,7 +379,7 @@ public class IoService {
            properties.setProperty(PlexSearch.MOVIE_DB_API_KEY, plexSearch.getMovieDbApiKey());
        }

-        properties.setProperty("version", "v0.3.0");
+        properties.setProperty("version", "v0.3.1");

        try (FileOutputStream fileOutputStream = new FileOutputStream(STORAGE_FOLDER + PROPERTIES)) {
            try (OutputStreamWriter outputStreamWriter = new OutputStreamWriter(fileOutputStream, StandardCharsets.UTF_8)) {
--- a/GapsWeb/src/main/resources/application.yaml
+++ b/GapsWeb/src/main/resources/application.yaml
@@ -45,7 +45,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.3.0
+    version: 0.3.1

 ---
 spring:
@@ -75,5 +75,5 @@ 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.3.0
+    version: 0.3.1

--- a/GapsWeb/src/main/resources/templates/about.html
+++ b/GapsWeb/src/main/resources/templates/about.html
@@ -48,7 +48,7 @@
 <div class="container">

    <h3 class="top-margin">About Gaps</h3>
-    <h4 class="top-margin text-primary">v0.3.0</h4>
+    <h4 class="top-margin text-primary">v0.3.1</h4>

    <p class="text-muted">Gaps searches through your Plex Server. It then queries
        for known
--- a/GapsWeb/src/main/resources/templates/folder.html
+++ b/GapsWeb/src/main/resources/templates/folder.html
@@ -155,7 +155,7 @@
    <div class="container">
        <div class="row">
            <div class="col l6 s12">
-                <h5 class="white-text">Gaps v0.3.0</h5>
+                <h5 class="white-text">Gaps v0.3.1/h5>
            </div>
        </div>
    </div>
--- a/GapsWeb/src/main/resources/templates/index.html
+++ b/GapsWeb/src/main/resources/templates/index.html
@@ -48,7 +48,7 @@
 <div class="container">

    <h3 class="top-margin">About Gaps</h3>
-    <h4 class="top-margin text-primary">v0.3.0</h4>
+    <h4 class="top-margin text-primary">v0.3.1</h4>

    <p class="text-muted">Gaps searches through your Plex Server. It then queries
        for known
--- a/GapsWeb/src/main/resources/templates/recommended.html
+++ b/GapsWeb/src/main/resources/templates/recommended.html
@@ -151,6 +151,7 @@
            <div class="col-12 col-md">
                <div class="card-body">
                    <h5 class="card-title">{{name}} ({{year}})</h5>
+                    <h6 class="card-title">{{collection}}</h6>
                    <p class="card-text text-muted">{{overview}}</p>
                    <p class="card-text"><small class="text-info">English</small></p>
                </div>
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 read -n 1 -s -r -p "Are the ports set correctly?"
-VERSION=0.3.0
+VERSION=0.3.1
 DOCKER_SSL_LATEST="housewrecker/gaps:latest"
 DOCKER_NO_SSL_LATEST="housewrecker/gaps:latest-no-ssl"
 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
--- a/buildVersion.sh
+++ b/buildVersion.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 read -n 1 -s -r -p "Are the ports set correctly?"
-VERSION="0.3.0"
+VERSION="0.3.1"
 DOCKER_SSL_VERSION="housewrecker/gaps:v$VERSION"
 DOCKER_NO_SSL_VERSION="housewrecker/gaps:v$VERSION-no-ssl"
 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "gaps",
-  "version": "0.3.0",
+  "version": "0.3.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": {},
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
    </parent>
    <groupId>com.jasonhhouse</groupId>
    <artifactId>Gaps</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
    <name>Gaps</name>
    <description>Demo project for Spring Boot</description>