Video player doesn't load or play movies #206

Movie source file doesn't get attached #207

grails-app/controllers/streama/MovieController.groovy

@@ -36,10 +36,8 @@ class MovieController {
     respond movieInstance, [status: CREATED]
   }
 
-  def show(Movie movieInstance) {
-    JSON.use('fullMovie') {
-      respond movieInstance, [status: OK]
-    }
+  def show(Movie movie) {
+    respond movie, [status: OK]
   }
 
   @Transactional

grails-app/controllers/streama/VideoController.groovy

@@ -92,7 +92,7 @@ class VideoController {
 
   def show(Video videoInstance){
     JSON.use('player') {
-      respond videoInstance, [status: OK]
+      render (videoInstance as JSON)
     }
   }
 
@@ -218,8 +218,9 @@ class VideoController {
     file.size = Files.size(givenPath)
     def extensionIndex = params.localFile.lastIndexOf('.')
     file.extension = params.localFile[extensionIndex..-1];
-    file.save()
+    file.save(failOnError: true, flush: true)
     videoInstance.addToFiles(file)
+    videoInstance.save(failOnError: true, flush: true)
     respond file
   }
 }

grails-app/domain/streama/Video.groovy

@@ -2,6 +2,8 @@ package streama
 
 class Video {
 
+  def springSecurityService
+
   Date dateCreated
   Date lastUpdated
 
@@ -39,4 +41,29 @@ class Video {
     }
     return false
   }
+
+  def getViewingStatus(){
+    ViewingStatus.findByVideoAndUser(this, springSecurityService.currentUser)
+  }
+
+  def getNextEpisode(){
+    if(!(this instanceof Episode)){
+      return
+    }
+
+    Episode episode = (Episode) this
+
+    Video nextEpisode = episode.show.episodes?.find{
+      return (it.episode_number == episode.episode_number+1 && it.season_number == episode.season_number)
+    }
+    if(!nextEpisode){
+      nextEpisode = episode.show.episodes?.find{
+        return (it.season_number == episode.season_number+1 && it.episode_number == 1)
+      }
+    }
+
+    if(nextEpisode && nextEpisode.files){
+      return nextEpisode
+    }
+  }
 }

grails-app/views/episode/_episode.gson

@@ -0,0 +1,7 @@
+import streama.Episode
+
+model {
+	Episode episode
+}
+
+json g.render(episode)

grails-app/views/episode/index.gson

@@ -0,0 +1,8 @@
+import streama.Episode
+
+model {
+	Iterable<Episode> episodeList
+}
+
+json tmpl.episode(episodeList ?: [])
+

grails-app/views/episode/show.gson

@@ -0,0 +1,13 @@
+import streama.Episode
+
+model {
+	Episode episode
+}
+
+json g.render(episode, [deep:true, excludes: ['files']]){
+	files episode.files.findAll{it.extension != '.srt' && it.extension != '.vtt'}
+	subtitles episode.files.findAll{it.extension == '.srt' || it.extension == '.vtt'}
+	hasFiles episode.files ? true : false
+	nextEpisode {id episode.getNextEpisode()?.id }
+	viewedStatus episode.getViewingStatus()
+}

grails-app/views/file/_file.gson

@@ -0,0 +1,10 @@
+import streama.File
+
+model {
+	File file
+}
+
+json g.render(file){
+
+	src file.getSrc()
+}

grails-app/views/file/index.gson

@@ -0,0 +1,8 @@
+import streama.File
+
+model {
+	Iterable<File> fileList
+}
+
+json tmpl.file(fileList ?: [])
+

grails-app/views/file/show.gson

@@ -0,0 +1,7 @@
+import streama.File
+
+model {
+	File file
+}
+
+json tmpl.file(file)

grails-app/views/movie/_movie.gson

@@ -4,4 +4,6 @@ model {
 	Movie movie
 }
 
-json g.render(movie, [deep:true])
+json g.render(movie, [deep:true]){
+	hasFiles movie.files ? true : false
+}

grails-app/views/movie/show.gson

@@ -4,4 +4,8 @@ model {
 	Movie movie
 }
 
-json tmpl.movie(movie)
+json g.render(movie, [deep: true, excludes: ['files']]){
+	hasFiles movie.files ? true : false
+	files movie.files.findAll{it.extension != '.srt' && it.extension != '.vtt'}
+	subtitles movie.files.findAll{it.extension == '.srt' || it.extension == '.vtt'}
+}

grails-app/views/video/_video.gson

@@ -0,0 +1,7 @@
+import streama.Video
+
+model {
+	Video video
+}
+
+json g.render(video)

grails-app/views/video/index.gson

@@ -0,0 +1,8 @@
+import streama.Video
+
+model {
+	Iterable<Video> videoList
+}
+
+json tmpl.video(videoList ?: [])
+

grails-app/views/video/show.gson

@@ -0,0 +1,20 @@
+import streama.Episode
+import streama.Video
+
+model {
+	Video video
+}
+
+json g.render(video, [deep:true, excludes: ['files']]){
+	files video.files.findAll{it.extension != '.srt' && it.extension != '.vtt'}
+	subtitles video.files.findAll{it.extension == '.srt' || it.extension == '.vtt'}
+	hasFiles video.files ? true : false
+	viewedStatus video.getViewingStatus()
+
+//	if(video instanceof Episode){
+////		nextEpisode {
+////			id video.nextEpisode?.id
+////		}
+//	}
+}
+