Merge branch 'master' into improvement/radarrV3

2026-01-07 03:19:46 -06:00 · 2020-09-10 20:27:44 +09:00
parent 30af58fca5 da785908e6
commit 3529aab3d0
19 changed files with 44 additions and 22 deletions
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>Gaps</artifactId>
        <groupId>com.jasonhhouse</groupId>
-        <version>0.7.4</version>
+        <version>0.7.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -15,7 +15,7 @@
        <dependency>
            <groupId>com.jasonhhouse</groupId>
            <artifactId>Plex</artifactId>
-            <version>0.7.4</version>
+            <version>0.7.5</version>
        </dependency>

        <dependency>
--- a/2
+++ b/2
@@ -24,7 +24,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data

 WORKDIR /usr/app

-COPY GapsWeb/target/GapsWeb-0.7.4.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar

 COPY start.sh /usr/app/

--- 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.4.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar

 COPY start.sh /usr/app/

--- 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.4.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar

 COPY start.sh /usr/app/

--- a/GapsOnWindows/gaps.nsi
+++ b/GapsOnWindows/gaps.nsi
@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
 SectionEnd

 # name the installer
-OutFile "gaps-0.7.4-installer.exe"
+OutFile "gaps-0.7.5-installer.exe"
--- a/GapsWeb/pom.xml
+++ b/GapsWeb/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>Gaps</artifactId>
        <groupId>com.jasonhhouse</groupId>
-        <version>0.7.4</version>
+        <version>0.7.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -21,13 +21,13 @@
        <dependency>
            <groupId>com.jasonhhouse</groupId>
            <artifactId>Core</artifactId>
-            <version>0.7.4</version>
+            <version>0.7.5</version>
        </dependency>

        <dependency>
            <groupId>com.jasonhhouse</groupId>
            <artifactId>Plex</artifactId>
-            <version>0.7.4</version>
+            <version>0.7.5</version>
        </dependency>

        <dependency>
--- 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.4
+    version: 0.7.5
    storageFolder: /usr/data
    properties:
      rssFeed: rssFeed.json
--- a/GapsWeb/src/main/resources/templates/about.html
+++ b/GapsWeb/src/main/resources/templates/about.html
@@ -78,7 +78,7 @@
    <img 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.7.4</h4>
+    <h4 class="top-margin text-primary">v0.7.5</h4>

    <p class="text-muted">Gaps searches through your Plex Server. It then queries
        for known
@@ -103,8 +103,13 @@
    <p class="text-muted">Gaps license can be found <a href="https://github.com/JasonHHouse/Gaps/blob/master/LICENSE">here</a>.</p>

    <h4 class="top-margin text-primary">Support</h4>
-    <p class="text-muted">While Gaps is free to use, donations are greatly appreciated. Any donations can be done through <a
-            href="https://paypal.me/thehousewrecker?locale.x=en_US">PayPal.</a></p>
+    <p class="text-muted">While Gaps is free to use, donations are greatly appreciated. Any donations can be sent through a few different options.</p>
+    <ul>
+        <li><a href="https://paypal.me/thehousewrecker?locale.x=en_US" target="_blank">PayPal</a></li>
+        <li><a href="https://opencollective.com/gaps" target="_blank">Become a Sponsor</a></li>
+        <li><a href="https://pay.google.com/" target="_blank">Google Pay via jh5975@gmail.com</a></li>
+    </ul>
+
 </div>

 <script src="/js/libraries/jquery-3.4.1.min.js" type="text/javascript"></script>
--- a/GapsWeb/src/main/resources/templates/index.html
+++ b/GapsWeb/src/main/resources/templates/index.html
@@ -77,7 +77,7 @@
 <div class="container bottom-margin">
    <img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">

-    <h3 class="top-margin">v0.7.4</h3>
+    <h3 class="top-margin">v0.7.5</h3>

    <p class="text-muted">Gaps searches through your Plex Server. It then queries
        for known
--- a/GapsWeb/src/main/resources/templates/updates.html
+++ b/GapsWeb/src/main/resources/templates/updates.html
@@ -78,6 +78,11 @@
    <img 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.7.5</h4>
+    <ul class="text-muted">
+        <li>Updating About page</li>
+    </ul>
+
    <h4 class="top-margin text-primary">v0.7.4</h4>
    <ul class="text-muted">
        <li>Added auto restart to scheduler</li>
--- 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.4
+    version: 0.7.5
    loginEnabled: false
    storageFolder: /usr/data
    properties:
--- a/Plex/pom.xml
+++ b/Plex/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>Gaps</artifactId>
        <groupId>com.jasonhhouse</groupId>
-        <version>0.7.4</version>
+        <version>0.7.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/README.md
+++ b/README.md
@@ -180,6 +180,18 @@ Once you've completed at least one search of your plex libraries, you can then v
 - [Spring Boot](https://spring.io/projects/spring-boot) - Server Framework
 - [NodeJs](https://nodejs.org/en/) - Testing and Build Environment

+## Supporters
+
+This project would not be possible without the support by these amazing folks. [**Become a sponsor or backer**](https://opencollective.com/gaps) to help us out!
+
+### Sponsors
+
+[![Sponsors](https://opencollective.com/gaps/tiers/sponsor.svg)](https://opencollective.com/gaps/order/3851)
+
+### Backers
+
+[![Backers](https://opencollective.com/gaps/tiers/backer.svg?avatarHeight=48)](https://opencollective.com/gaps/order/3850)
+
 ## ✍️ Authors <a name = "authors"></a>
 - [@JasonHHouse](https://github.com/JasonHHouse) - Idea & Initial work

--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=0.7.4
+VERSION=0.7.5
 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
 ZIP_VERSION="Gaps-$VERSION.zip"
 ./minify
--- a/build.bat
+++ b/build.bat
@@ -18,7 +18,7 @@ call npm run uglifyjs-schedule-js
 call mvn clean install
 del GapsOnWindows\*.jar
 del GapsOnWindows\README.md
-copy GapsWeb\target\GapsWeb-0.7.4.jar GapsOnWindows\gaps.jar
+copy GapsWeb\target\GapsWeb-0.7.5.jar GapsOnWindows\gaps.jar
 copy README.md GapsOnWindows\
 cd GapsOnWindows
 makensis gaps.nsi
--- 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.4');
+            .should('have.text', 'v0.7.5');

        cy.get('.container > :nth-child(6)')
            .should('have.text', 'Software');
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "gaps",
-  "version": "0.7.4",
+  "version": "0.7.5",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "gaps",
-  "version": "0.7.4",
+  "version": "0.7.5",
  "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
@@ -17,7 +17,7 @@
    </parent>
    <groupId>com.jasonhhouse</groupId>
    <artifactId>Gaps</artifactId>
-    <version>0.7.4</version>
+    <version>0.7.5</version>
    <name>Gaps</name>
    <description>Demo project for Spring Boot</description>