add year handling for movies during bulkCreate

so that "Aladdin.1992.mp4" actually matches the old aladdin and not the
2019 one.

Author: dularion

grails-app/conf/application.yml

@@ -152,7 +152,7 @@ grails:
 
 streama:
   regex:
-    movies: ^(?<Name>.*)?[._ \(]+\d{4}.*
+    movies: ^(?<Name>.*)?[._ \(]+(?<Year>\d{4}).*
     shows:
       - ^(?<Name>.+)[._ ][Ss](?<Season>\d{2})[Ee](?<Episode>\d{2,3}).*      # example:  "House.MD.S03E04.h264.mp4"
       - ^(?<Name>.+)[._ ](?<Season>\d{1,2})x(?<Episode>\d{2,3}).*           # example:  "House.MD.03x04.h264.mp4"

grails-app/services/streama/BulkCreateService.groovy

@@ -67,7 +67,7 @@ class BulkCreateService {
 
     def movieMatcher = fileName =~ '(?i)' + movieRegex
     if (movieMatcher.matches()) {
-      matchMovieFromFile(movieMatcher, fileResult)
+      matchMovieFromFile(movieMatcher, fileResult, movieRegex)
       foundMatch = true
       return fileResult
     }
@@ -78,12 +78,13 @@ class BulkCreateService {
   }
 
 
-  private void matchMovieFromFile(Matcher movieMatcher, LinkedHashMap<String, Object> fileResult) {
+  private void matchMovieFromFile(Matcher movieMatcher, LinkedHashMap<String, Object> fileResult, movieRegex) {
     def name = movieMatcher.group('Name').replaceAll(/[._]/, " ")
+    def year = movieRegex.contains('<Year>') ? movieMatcher.group('Year') : null
     def type = "movie"
 
     try {
-      def json = theMovieDbService.searchForEntry(type, name)
+      def json = theMovieDbService.searchForEntry(type, name, year)
       def movieDbResults = json?.results
 
       if (movieDbResults) {

grails-app/services/streama/TheMovieDbService.groovy

@@ -137,10 +137,10 @@ class TheMovieDbService {
     return new JsonSlurper().parseText(JsonContent)
   }
 
-  def searchForEntry(type, name) {
+  def searchForEntry(type, name, String year = null) {
 
     def cachedApiData = apiCacheData."$type:$name"
-    if(cachedApiData){
+    if(false && cachedApiData){
       return cachedApiData
     }
     def query = URLEncoder.encode(name, "UTF-8")
@@ -155,6 +155,9 @@ class TheMovieDbService {
     }
     def JsonContent = url.getText("UTF-8")
     def data = new JsonSlurper().parseText(JsonContent)
+    if(data.results?.size() > 1 && year){
+      data.results = data.results.findAll{it.release_date.take(4) == year}
+    }
     apiCacheData["$type:$name"] = data
 
     return data