mirror/gaps
1
0
Fork 0
mirror of https://github.com/JasonHHouse/gaps.git synced 2026-02-11 13:18:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up code

Browse Source
This commit is contained in:
jhouse
2019-12-23 16:12:15 +09:00
parent 2264cf63c3
commit 1c968f69c2
18 changed files with 68 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java
View File

@@ -8,12 +8,9 @@ package com.jasonhhouse.gaps;/*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
import java.util.List;
import okhttp3.HttpUrl;
import org.jetbrains.annotations.NotNull;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
public interface GapsSearch {

3
Core/src/main/java/com/jasonhhouse/gaps/GapsService.java
View File

@@ -1,8 +1,9 @@
package com.jasonhhouse.gaps;
import java.util.List;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public interface GapsService {
PlexSearch getPlexSearch();

4
Core/src/main/java/com/jasonhhouse/gaps/Movie.java
View File

@@ -8,12 +8,12 @@ package com.jasonhhouse.gaps;/*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.json.JSONObject;
import java.util.Objects;
public final class Movie implements Comparable<Movie>, Jsonify<Movie> {
public static final String TVDB_ID = "tvdbId";

3
Core/src/main/java/com/jasonhhouse/gaps/PlexQuery.java
View File

@@ -1,8 +1,9 @@
package com.jasonhhouse.gaps;
import java.util.List;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public interface PlexQuery {
@NotNull List<PlexLibrary> getLibraries(@NotNull PlexSearch plexSearch);

5
GapsWeb/src/main/java/com/jasonhhouse/gaps/GapsApplication.java
View File

@@ -11,10 +11,8 @@
package com.jasonhhouse.gaps;
import com.jasonhhouse.gaps.service.GapsServiceImpl;
import java.util.concurrent.Executor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
@@ -25,7 +23,8 @@ import org.springframework.format.FormatterRegistry;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import java.util.concurrent.Executor;
/**
* Search for all missing movies in your plex collection by MovieDB collection.

3
GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchEditor.java
View File

@@ -2,10 +2,11 @@ package com.jasonhhouse.gaps;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.beans.PropertyEditorSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.beans.PropertyEditorSupport;
public class PlexSearchEditor extends PropertyEditorSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(PropertyEditorSupport.class);

5
GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchFormatter.java
View File

@@ -2,13 +2,14 @@ package com.jasonhhouse.gaps;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.text.ParseException;
import java.util.Locale;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.format.Formatter;
import java.text.ParseException;
import java.util.Locale;
public class PlexSearchFormatter implements Formatter<PlexSearch> {
private static final Logger LOGGER = LoggerFactory.getLogger(PlexSearchFormatter.class);

3
GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/GapsController.java
View File

@@ -1,9 +1,6 @@
package com.jasonhhouse.gaps.controller;
import com.jasonhhouse.gaps.GapsService;
import com.jasonhhouse.gaps.PlexSearchEditor;
import com.jasonhhouse.gaps.PlexSearch;
import com.jasonhhouse.gaps.PlexSearchFormatter;
import com.jasonhhouse.gaps.PlexSearchValidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

7
GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexConfigurationController.java
View File

@@ -1,12 +1,9 @@
package com.jasonhhouse.gaps.controller;
import com.jasonhhouse.gaps.GapsService;
import com.jasonhhouse.gaps.PlexSearchEditor;
import com.jasonhhouse.gaps.PlexSearchFormatter;
import com.jasonhhouse.gaps.PlexSearchValidator;
import com.jasonhhouse.gaps.PlexSearch;
import com.jasonhhouse.gaps.PlexSearchFormatter;
import com.jasonhhouse.gaps.service.BindingErrorsService;
import javax.validation.Valid;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import javax.validation.Valid;
@Controller
@RequestMapping(value = "/plexConfiguration")
public class PlexConfigurationController {

11
GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexLibrariesController.java
View File

@@ -1,13 +1,7 @@
package com.jasonhhouse.gaps.controller;
import com.jasonhhouse.gaps.GapsService;
import com.jasonhhouse.gaps.PlexLibrary;
import com.jasonhhouse.gaps.PlexSearch;
import com.jasonhhouse.gaps.PlexSearchFormatter;
import com.jasonhhouse.gaps.PlexQuery;
import com.jasonhhouse.gaps.*;
import com.jasonhhouse.gaps.service.BindingErrorsService;
import java.util.List;
import javax.validation.Valid;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import javax.validation.Valid;
import java.util.List;
@Controller
@RequestMapping(value = "/plexLibraries")
public class PlexLibrariesController {

7
GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexMovieListController.java
View File

@@ -2,11 +2,9 @@ package com.jasonhhouse.gaps.controller;
import com.jasonhhouse.gaps.GapsService;
import com.jasonhhouse.gaps.PlexLibrary;
import com.jasonhhouse.gaps.PlexSearch;
import com.jasonhhouse.gaps.PlexQuery;
import com.jasonhhouse.gaps.PlexSearch;
import com.jasonhhouse.gaps.service.BindingErrorsService;
import java.util.List;
import javax.validation.Valid;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import javax.validation.Valid;
import java.util.List;
@Controller
@RequestMapping(value = "/plexMovieList")
public class PlexMovieListController {

4
GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java
View File

@@ -1,12 +1,8 @@
package com.jasonhhouse.gaps.controller;
import com.jasonhhouse.gaps.service.IoService;
import java.io.IOException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;

2
GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RecommendedController.java
View File

@@ -7,8 +7,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import java.io.IOException;
@RestController
public class RecommendedController {

4
GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SearchController.java
View File

@@ -4,7 +4,6 @@ import com.jasonhhouse.gaps.Gaps;
import com.jasonhhouse.gaps.GapsSearch;
import com.jasonhhouse.gaps.Movie;
import com.jasonhhouse.gaps.service.IoService;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
@@ -12,7 +11,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.messaging.handler.annotation.MessageMapping;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.server.ResponseStatusException;
import java.util.List;
@Controller
public class SearchController {

59
GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
View File

@@ -10,45 +10,8 @@
package com.jasonhhouse.gaps.service;
import com.jasonhhouse.gaps.Gaps;
import com.jasonhhouse.gaps.GapsSearch;
import com.jasonhhouse.gaps.Movie;
import com.jasonhhouse.gaps.SearchCancelledException;
import com.jasonhhouse.gaps.SearchResults;
import com.jasonhhouse.gaps.UrlGenerator;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.Year;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import okhttp3.HttpUrl;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import com.jasonhhouse.gaps.*;
import okhttp3.*;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.StopWatch;
@@ -72,7 +35,23 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import static com.jasonhhouse.gaps.service.IoService.RSS_FEED_JSON_FILE;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import java.io.*;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.Year;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@Service
public class GapsSearchService implements GapsSearch {

3
GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsServiceImpl.java
View File

@@ -3,11 +3,12 @@ package com.jasonhhouse.gaps.service;
import com.jasonhhouse.gaps.GapsService;
import com.jasonhhouse.gaps.PlexLibrary;
import com.jasonhhouse.gaps.PlexSearch;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class GapsServiceImpl implements GapsService {

12
GapsWeb/src/main/java/com/jasonhhouse/gaps/service/IoService.java
View File

@@ -2,12 +2,6 @@ package com.jasonhhouse.gaps.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jasonhhouse.gaps.Movie;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.json.JSONException;
@@ -16,6 +10,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
@Service
public class IoService {

27
GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java
View File

@@ -1,20 +1,8 @@
package com.jasonhhouse.gaps.service;
import com.jasonhhouse.gaps.PlexLibrary;
import com.jasonhhouse.gaps.PlexSearch;
import com.jasonhhouse.gaps.PlexQuery;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import com.jasonhhouse.gaps.PlexSearch;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -32,6 +20,19 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@Service
public class PlexQueryImpl implements PlexQuery {