From 29c9bfcf881eec7b950a777112e541085f090110 Mon Sep 17 00:00:00 2001 From: dularion Date: Mon, 4 Jul 2016 22:29:18 +0200 Subject: [PATCH] fix Error when attempting to view manually-added videos #169 --- README.md | 2 +- grails-app/controllers/streama/TheMovieDbController.groovy | 6 +++++- grails-app/views/layouts/main.gsp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 260d74056..3b78ab650 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# streama v0.3.1 +# streama v0.3.2 [![Build Status](https://travis-ci.org/dularion/streama.svg?branch=master)](https://travis-ci.org/dularion/streama) [![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/dularion/streama/blob/master/LICENSE.md) [![Join the chat at https://gitter.im/dularion/streama](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dularion/streama?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) diff --git a/grails-app/controllers/streama/TheMovieDbController.groovy b/grails-app/controllers/streama/TheMovieDbController.groovy index 1e6eaf080..6fe6d0f62 100644 --- a/grails-app/controllers/streama/TheMovieDbController.groovy +++ b/grails-app/controllers/streama/TheMovieDbController.groovy @@ -59,12 +59,16 @@ class TheMovieDbController { String apiId = params.apiId String season = params.season TvShow tvShow = TvShow.get(params.getInt('showId')) + def result = [] + + if(!apiId){ + return result + } def JsonContent = new URL(theMovieDbService.BASE_URL + '/tv/' + apiId + '/season/' + season + '?api_key=' + theMovieDbService.API_KEY).text def json = new JsonSlurper().parseText(JsonContent) def episodes = json?.episodes - def result = [] episodes?.each{ episodeData -> if(Episode.findByShowAndSeason_numberAndEpisode_numberAndDeletedNotEqual(tvShow, season, episodeData.episode_number, true)){ diff --git a/grails-app/views/layouts/main.gsp b/grails-app/views/layouts/main.gsp index 9e4b98488..cd5e2040f 100644 --- a/grails-app/views/layouts/main.gsp +++ b/grails-app/views/layouts/main.gsp @@ -24,7 +24,7 @@