mirror/gaps
1
0
Fork 0
mirror of https://github.com/JasonHHouse/gaps.git synced 2026-05-07 00:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #229 from JasonHHouse/bugfix/fixing_collection_matcing

Browse Source 
Bugfix/fixing collection matcing
This commit is contained in:
Jason House
2021-05-30 06:02:08 -04:00
committed by GitHub
parent 9b7dd43fb2 cc94afc704
commit c308a5905b
24 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hound.yml
+2
View File
@@ -0,0 +1,2 @@
eslint:
enabled: true
Core/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.9.0</version>
<version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Dockerfile
+1 -1
View File
@@ -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/
Dockerfile.arm64
+1 -1
View File
@@ -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/
Dockerfile.ppc64le
+1 -1
View File
@@ -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/
Dockerfile.raspbian
+1 -1
View File
@@ -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/
Dockerfile.riscv64
+1 -1
View File
@@ -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/
GapsAsJar/gaps.nsi
+1 -1
View File
@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
SectionEnd
# name the installer
OutFile "gaps-0.9.0-installer.exe"
OutFile "gaps-0.9.1-installer.exe"
GapsWeb/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.9.0</version>
<version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
+1
View File
@@ -468,6 +468,7 @@ public class GapsSearchService implements GapsSearch {
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);
GapsWeb/src/main/resources/application.yaml
+1 -1
View File
@@ -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
GapsWeb/src/main/resources/templates/about.html
+1 -1
View File
@@ -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.9.0</h4>
<h4 class="top-margin text-primary">v0.9.1</h4>
<p class="text-muted">Gaps searches through your Plex Server. It then queries
for known
GapsWeb/src/main/resources/templates/index.html
+1 -1
View File
@@ -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.9.0</h3>
<h3 class="top-margin">v0.9.1</h3>
<p class="text-muted">Gaps searches through your Plex Server. It then queries
for known
GapsWeb/src/main/resources/templates/updates.html
+6
View File
@@ -28,6 +28,12 @@
<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.9.1</h4>
<ul class="text-muted">
<li>Fixed bug in matching names in collections to use IDs</li>
</ul>
<h4 class="top-margin text-primary">v0.9.0</h4>
<ul class="text-muted">
<li>Updated Cypress to 7.2.0</li>
Plex/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.9.0</version>
<version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
RadarrV3/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.9.0</version>
<version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
application-custom.yml
+1 -1
View File
@@ -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
build
+1 -1
View File
@@ -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
build.bat
+1 -1
View File
@@ -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
cypress/integration/about/about.spec.js
+1 -1
View File
@@ -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');
cypress/integration/common.spec.js
+2 -2
View File
@@ -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',
package-lock.json
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "gaps",
"version": "0.9.0",
"version": "0.9.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
package.json
+1 -1
View File
@@ -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": {
pom.xml
+2 -2
View File
@@ -17,7 +17,7 @@
</parent>
<groupId>com.jasonhhouse</groupId>
<artifactId>Gaps</artifactId>
<version>0.9.0</version>
<version>0.9.1</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.8.0</commons.io>
<gaps.version>0.9.0</gaps.version>
<gaps.version>0.9.1</gaps.version>
<google.findbugs>3.0.0</google.findbugs>
<guava>30.1-jre</guava>
<hibernate.core>5.2.12.Final</hibernate.core>