diff --git a/Core/pom.xml b/Core/pom.xml index e0b6d273..fdf4103a 100755 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.8.3 + 0.8.4 4.0.0 @@ -15,7 +15,7 @@ com.jasonhhouse Plex - 0.8.3 + 0.8.4 diff --git a/Dockerfile b/Dockerfile index 4ccc5138..0ed08d98 100755 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.3.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.4.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index f61e7969..ed179fae 100755 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -26,7 +26,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.3.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.4.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.debug b/Dockerfile.debug index 74a6acbe..d8fbd772 100755 --- a/Dockerfile.debug +++ b/Dockerfile.debug @@ -18,7 +18,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.3.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.4.jar /usr/app/gaps.jar COPY startDebug.sh /usr/app/ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 94996f97..4f9e5e6f 100755 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -22,7 +22,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.3.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.4.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian index 19ad2083..d3b4cb73 100755 --- a/Dockerfile.raspbian +++ b/Dockerfile.raspbian @@ -20,7 +20,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.3.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.4.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index 9bbeafe0..affdc518 100755 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -24,7 +24,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.3.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.4.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml index 9f530fe2..ea315cef 100755 --- a/GapsWeb/pom.xml +++ b/GapsWeb/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.8.3 + 0.8.4 4.0.0 @@ -21,19 +21,19 @@ com.jasonhhouse Core - 0.8.3 + 0.8.4 com.jasonhhouse Plex - 0.8.3 + 0.8.4 com.jasonhhouse RadarrV3 - 0.8.3 + 0.8.4 diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SchedulerController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SchedulerController.java index 3b2c0f12..c0ee025b 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SchedulerController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SchedulerController.java @@ -74,4 +74,17 @@ public ResponseEntity> getAllSchedules() { LOGGER.info("getAllSchedules()"); return ResponseEntity.ok().body(schedulerService.getAllSchedules()); } + + @GetMapping(value = "/test", + produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity getTestSchedule() { + LOGGER.info("getTestSchedule()"); + new Runnable() { + @Override + public void run() { + schedulerService.test(); + } + }; + return ResponseEntity.ok().body("{\"message\":\"Test schedule started\"}"); + } } 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 bf7bfb19..98da7c2b 100755 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java @@ -110,11 +110,6 @@ public GapsSearchService(@Qualifier("real") UrlGenerator urlGenerator, SimpMessa public void run(@NotNull String machineIdentifier,@NotNull Integer key) { LOGGER.info("run( {}, {} )", machineIdentifier, key); - //ToDo - if(key.equals(1)) { - return; - } - PlexProperties plexProperties = fileIoService.readProperties(); Optional optionalPlexServer = plexProperties.getPlexServers().stream().filter(tempPlexServer -> tempPlexServer.getMachineIdentifier().equals(machineIdentifier)).findFirst(); PlexServer plexServer; diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/SchedulerService.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/SchedulerService.java index ac0b311e..6b9eea73 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/SchedulerService.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/SchedulerService.java @@ -73,6 +73,11 @@ public String getJsonSchedule() throws IOException { return objectMapper.writeValueAsString(fileIoService.readProperties().getSchedule()); } + public void test() { + LOGGER.info("test()"); + searchGapsTask.run(); + } + private void setTaskForScheduler(Schedule schedule) { if (scheduledFuture != null) { scheduledFuture.cancel(true); diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml index ee2765c0..a4a623c8 100755 --- 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.8.3 + version: 0.8.4 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 832b4a06..0a0e9c54 100755 --- a/GapsWeb/src/main/resources/templates/about.html +++ b/GapsWeb/src/main/resources/templates/about.html @@ -78,7 +78,7 @@ Gaps Logo

About

-

v0.8.3

+

v0.8.4

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 356eb3bd..9c1d9d70 100755 --- a/GapsWeb/src/main/resources/templates/index.html +++ b/GapsWeb/src/main/resources/templates/index.html @@ -77,7 +77,7 @@

Gaps Logo -

v0.8.3

+

v0.8.4

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 874091b2..b89ef0b5 100755 --- a/GapsWeb/src/main/resources/templates/updates.html +++ b/GapsWeb/src/main/resources/templates/updates.html @@ -78,6 +78,11 @@ Gaps Logo

Updates

+

v0.8.4

+
    +
  • Adding endpoint for testing scheduled runs
  • +
+

v0.8.3

  • Adding more Cypress tests and unit tests
  • diff --git a/GapsWeb/src/test/resources/application.yaml b/GapsWeb/src/test/resources/application.yaml index 951485d7..b5028d29 100755 --- 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.8.3 + version: 0.8.4 loginEnabled: false storageFolder: /usr/data properties: diff --git a/Plex/pom.xml b/Plex/pom.xml index 65d62b53..edd82550 100755 --- a/Plex/pom.xml +++ b/Plex/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.8.3 + 0.8.4 4.0.0 diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml index be528322..2f600cd0 100755 --- a/RadarrV3/pom.xml +++ b/RadarrV3/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.8.3 + 0.8.4 4.0.0 diff --git a/application-custom.yml b/application-custom.yml index 8abc8092..fa58655c 100644 --- a/application-custom.yml +++ b/application-custom.yml @@ -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.8.3 + version: 0.8.4 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 c4ab2070..3e8af51f 100755 --- a/build +++ b/build @@ -1,6 +1,6 @@ #!/bin/bash set -e -VERSION=0.8.3 +VERSION=0.8.4 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar" ZIP_VERSION="GapsAsJar-$VERSION.zip" npm ci diff --git a/build.bat b/build.bat index 482725f5..171c89e9 100644 --- a/build.bat +++ b/build.bat @@ -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.8.3.jar GapsOnWindows\gaps.jar +copy GapsWeb\target\GapsWeb-0.8.4.jar GapsOnWindows\gaps.jar copy README.md GapsOnWindows\ cd GapsOnWindows makensis gaps.nsi \ No newline at end of file diff --git a/cypress/integration/about/about.spec.js b/cypress/integration/about/about.spec.js index 3c2ed953..a16e75dc 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.8.3'); + .should('have.text', 'v0.8.4'); cy.get('.container > :nth-child(6)') .should('have.text', 'Software'); diff --git a/package-lock.json b/package-lock.json index 9119d244..7af58139 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "gaps", - "version": "0.8.3", + "version": "0.8.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5d101b99..3d4daa93 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gaps", - "version": "0.8.3", + "version": "0.8.4", "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": { diff --git a/pom.xml b/pom.xml index 7894ebb7..552a54ad 100755 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ com.jasonhhouse Gaps - 0.8.3 + 0.8.4 Gaps Demo project for Spring Boot