Merge pull request #603 from dularion/main/AE/improve-error-for-movie…

…DB-limit-bulk improve error for movie db limit bulk
streamaserver · Apr 5, 2018 · 9542621 · 9542621
2 parents c99bd2d + 5e9b15e
commit 9542621
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 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
@@ -43,6 +43,9 @@
     <span ng-if="vm.getMatchForPath(file.path) && vm.getMatchForPath(file.path).status == 0">
       {{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
+    </span>
 
     <br>
 

diff --git a/grails-app/assets/javascripts/streama/templates/modal--video.tpl.htm b/grails-app/assets/javascripts/streama/templates/modal--video.tpl.htm
@@ -2,7 +2,7 @@
 
   <div class="modal-body">
     <legend>
-      Episode
+      Episode &nbsp;<span ng-if="episode.id" class="text-muted text-sm">(id: {{episode.id}})</span>
     </legend>
 
     <div class="form-group">

diff --git a/grails-app/controllers/streama/TheMovieDbController.groovy b/grails-app/controllers/streama/TheMovieDbController.groovy
@@ -104,6 +104,7 @@ class TheMovieDbController {
       if(Episode.findByShowAndSeason_numberAndEpisode_numberAndDeletedNotEqual(tvShow, season, episodeData.episode_number, true)){
         return
       }
+      episodeData.apiId = episodeData.id
       result.add(episodeData)
     }
 

diff --git a/grails-app/services/streama/BulkCreateService.groovy b/grails-app/services/streama/BulkCreateService.groovy
@@ -16,7 +16,8 @@ class BulkCreateService {
     NO_MATCH: 0,
     MATCH_FOUND: 1,
     EXISTING: 2,
-    CREATED: 3
+    CREATED: 3,
+    LIMIT_REACHED: 4
   ]
   final static STREAMA_ROUTES = [
     movie: 'movie',
@@ -91,6 +92,7 @@ class BulkCreateService {
       }
     } catch (Exception ex) {
       log.error("Error occured while trying to retrieve data from TheMovieDB. Please check your API-Key.")
+      fileResult.status = MATCHER_STATUS.LIMIT_REACHED
       fileResult.title = name
     }
     fileResult.status = fileResult.status ?: MATCHER_STATUS.MATCH_FOUND
@@ -149,6 +151,7 @@ class BulkCreateService {
       }
     } catch (Exception ex) {
       log.error("Error occured while trying to retrieve data from TheMovieDB. Please check your API-Key.")
+      fileResult.status = MATCHER_STATUS.LIMIT_REACHED
       fileResult.name = name
     }
     fileResult.status = fileResult.status ?: MATCHER_STATUS.MATCH_FOUND
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,6 +104,7 @@ class TheMovieDbController { @@
           if(Episode.findByShowAndSeason_numberAndEpisode_numberAndDeletedNotEqual(tvShow, season, episodeData.episode_number, true)){
             return
           }
+          episodeData.apiId = episodeData.id
           result.add(episodeData)
         }
@@ Expand Down @@