add improved error messages for BulkCreation

streamaserver · May 9, 2019 · 7091255 · 7091255
1 parent b3f8e45
commit 7091255
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/...s-app/assets/javascripts/streama/templates/modal--create-from-file-recursive-item.tpl.htm b/...s-app/assets/javascripts/streama/templates/modal--create-from-file-recursive-item.tpl.htm
@@ -30,7 +30,7 @@
   <div class="col-md-8">
     <i class="ion-document"></i> {{ file.name }}
   </div>
-  <div class="col-md-3">
+  <div class="col-md-3" style="padding-right: 0;">
     <i class="ion-load-c spin column-loading" ng-show="vm.isMatcherLoading && vm.isSelected(file) && (!vm.getMatchForPath(file.path) || vm.getMatchForPath(file.path).status == 1)"></i>
      <span ng-if="vm.getMatchForPath(file.path) && vm.getMatchForPath(file.path).status == 1">
       <a ng-click="vm.openMediaDetail(vm.getMatchForPath(file.path))"><i class="ion-ios-eye"></i> Match: {{vm.getMatchDisplay(file)}}</a>
@@ -45,7 +45,7 @@
       {{vm.getMatchForPath(file.path).message}}
     </span>
     <span class="text-danger" ng-if="vm.getMatchForPath(file.path) && vm.getMatchForPath(file.path).status == 4">
-      TheMovieDB Limit reached
+      TheMovieDB Error: &nbsp;<i class="ion-help-circled" title="{{vm.getMatchForPath(file.path).errorMessage}}"></i>
     </span>
 
     <br>

diff --git a/grails-app/services/streama/BulkCreateService.groovy b/grails-app/services/streama/BulkCreateService.groovy
@@ -106,8 +106,9 @@ class BulkCreateService {
         fileResult.genres = movieResult.genres
       }
     } catch (Exception ex) {
-      log.error("Error occured while trying to retrieve data from TheMovieDB. Please check your API-Key.")
+      log.error("Error occured while trying to retrieve data from TheMovieDB. Please check your API-Key.", ex)
       fileResult.status = MATCHER_STATUS.LIMIT_REACHED
+      fileResult.errorMessage = ex.message
       fileResult.title = name
     }
     fileResult.status = fileResult.status ?: MATCHER_STATUS.MATCH_FOUND
@@ -149,8 +150,9 @@ class BulkCreateService {
         fileResult = extractDataForEpisode(existingTvShow, seasonNumber, episodeNumber, fileResult, tvShowId)
       }
     } catch (ex) {
-      log.error("Error occured while trying to retrieve data from TheMovieDB. Please check your API-Key.")
+      log.error("Error occured while trying to retrieve data from TheMovieDB. Please check your API-Key.", ex)
       fileResult.status = MATCHER_STATUS.LIMIT_REACHED
+      fileResult.errorMessage = ex.message
       fileResult.name = name
     }
     fileResult.status = fileResult.status ?: MATCHER_STATUS.MATCH_FOUND

diff --git a/grails-app/services/streama/TheMovieDbService.groovy b/grails-app/services/streama/TheMovieDbService.groovy
@@ -127,7 +127,12 @@ class TheMovieDbService {
   }
 
   def getEpisodeMeta(tvApiId, seasonNumber, episodeNumber){
-    def JsonContent = new URL(BASE_URL + "/tv/$tvApiId/season/$seasonNumber/episode/$episodeNumber?$API_PARAMS").getText("UTF-8")
+    URL url = new URL(BASE_URL + "/tv/$tvApiId/season/$seasonNumber/episode/$episodeNumber?$API_PARAMS")
+    HttpURLConnection conn = url.openConnection()
+    if(conn.responseCode != 200){
+      throw new Exception("TMDB request failed with statusCode: " + conn?.responseCode + ", responseMessage: " + conn?.responseMessage)
+    }
+    def JsonContent = url.getText("UTF-8")
     return new JsonSlurper().parseText(JsonContent)
   }
 
@@ -139,7 +144,14 @@ class TheMovieDbService {
     }
     def query = URLEncoder.encode(name, "UTF-8")
 
-    def JsonContent = new URL(BASE_URL + '/search/' + type + '?query=' + query + '&api_key=' + API_KEY).getText("UTF-8")
+
+    URL url = new URL(BASE_URL + '/search/' + type + '?query=' + query + '&api_key=' + API_KEY)
+    HttpURLConnection conn = url.openConnection()
+    log.debug("conn.responseCode: ${conn.responseCode}")
+    if(conn.responseCode != 200){
+      throw new Exception("TMDB request failed with statusCode: " + conn?.responseCode + ", responseMessage: " + conn?.responseMessage)
+    }
+    def JsonContent = url.getText("UTF-8")
     def data = new JsonSlurper().parseText(JsonContent)
     apiCacheData["$type:$name"] = data