Video Convertor

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security issues to dularion@gmail.com

build.gradle

@@ -14,7 +14,7 @@ buildscript {
  }
 }
 
-version "1.9.3"
+version "1.10.5"
 group "streama"
 
 
@@ -95,8 +95,45 @@ dependencies {
  console "org.grails:grails-console"
  profile "org.grails.profiles:angular"
  runtime "org.grails.plugins:async:4.0.0"
- compile "org.apache.tika:tika-parsers:1.12"
+ compile ("org.apache.tika:tika-parsers:1.12") {
+ exclude group: 'org.ow2.asm', module: 'asm'
+ exclude group: 'com.healthmarketscience.jackcess'
+ exclude group: 'net.sourceforge.jmatio'
+ exclude group: 'org.tukaani', module: 'xz'
+ exclude group: 'org.apache.pdfbox'
+ exclude group: 'org.apache.poi'
+ exclude group: 'org.codelibs', module: 'jhighlight'
+ exclude group: 'com.pff', module: 'java-libpst'
+ exclude group: 'com.github.junrar'
+ exclude group: 'org.apache.cxf'
+ exclude group: 'org.apache.opennlp'
+ exclude group: 'de.l3s.boilerpipe'
+ exclude group: 'com.rometools'
+ exclude group: 'org.bouncycastle'
+ exclude group: 'org.ccil.cowan.tagsoup'
+ exclude group: 'com.googlecode.json-simple'
+ exclude group: 'com.googlecode.juniversalchardet'
+ exclude group: 'edu.ucar', module: 'netcdf4'
+ exclude group: 'edu.ucar', module: 'grib'
+ exclude group: 'edu.ucar', module: 'cdm'
+ exclude group: 'edu.ucar', module: 'httpservices'
+ exclude group: 'org.apache.commons', module: 'commons-csv'
+ exclude group: 'org.apache.commons', module: 'commons-exec'
+ exclude group: 'org.apache.sis.storage'
+ exclude group: 'org.apache.sis.core'
+ exclude group: 'org.json', module: 'json'
+ exclude group: 'com.google.code.gson'
+ exclude group: 'org.apache.commons', module: 'commons-compress'
+ exclude group: 'org.opengis', module: 'geoapi'
+ exclude group: 'org.apache.james'
+ }
 
+ // Fix Log4Shell
+ compile 'org.apache.logging.log4j:log4j-api:2.17.1'
+ compile 'org.apache.logging.log4j:log4j-core:2.17.1'
+ compile 'org.apache.logging.log4j:log4j-to-slf4j:2.17.1'
+ compile 'ch.qos.logback:logback-classic:1.2.8'
+ compile 'ch.qos.logback:logback-core:1.2.8'
 
  // test
  testCompile "org.grails:grails-plugin-testing"

docker/docker-compose.yml

@@ -2,6 +2,7 @@ version: "3"
 
 services:
  mysql:
+ platform: linux/x86_64
  image: mysql:5.7
  restart: always
  container_name: mysql

gradle.properties

@@ -1,2 +1,2 @@
 grailsVersion=3.2.6
-gradleWrapperVersion=3.0
+gradleWrapperVersion=3.1

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

grails-app/assets/javascripts/streama/controllers/admin-genres-ctrl.js

@@ -0,0 +1,42 @@
+//= wrapped
+
+angular.module('streama').controller('adminGenresCtrl', [
+ 'apiService', '$state', '$rootScope', '$filter', function (apiService, $state, $rootScope, $filter) {
+ var vm = this;
+
+ vm.addGenre = addGenre;
+ vm.deleteGenre = deleteGenre;
+
+ apiService.genres.list().then(function (response){
+ vm.genres = response.data;
+ });
+
+
+ function addGenre(){
+ alertify.set({ buttonReverse: true, labels: {ok: "Create", cancel : "Cancel"}});
+ alertify.prompt('Add a new custom genre.', function (confirmed, name) {
+ if(confirmed){
+ apiService.genres.create(name).then(function (response) {
+ alertify.success('The Genre was created.');
+ vm.genres.push(response.data);
+ });
+ }
+ })
+ }
+
+ function deleteGenre(id){
+ alertify.set({ buttonReverse: true, labels: {ok: "Yes", cancel : "Cancel"}});
+ alertify.confirm("Are you sure, you want to delete this Genre?", function (confirmed) {
+ if(confirmed){
+ apiService.genres.delete(id).then(function () {
+ _.remove(vm.genres, {id: id});
+ }, function (){
+ alertify.error('Genre is probably used in a video / tvShow or liked by a user. Delete all usages first, then try again.')
+ });
+ }
+ })
+ }
+
+ }]);
+
+

grails-app/assets/javascripts/streama/controllers/admin-movie-ctrl.js

@@ -85,7 +85,7 @@ angular.module('streama').controller('adminMovieCtrl', [
  };
 
  $scope.manageFiles = function(movie){
- modalService.fileManagerModal(movie, function (data) {
+ modalService.fileManagerModal(movie, null, function (data) {
  movie.hasFiles = !!movie.files.length;
  });
  };

grails-app/assets/javascripts/streama/controllers/admin-show-ctrl.js

@@ -11,9 +11,7 @@ angular.module('streama').controller('adminShowCtrl', [
  $scope.showLoading = true;
  $scope.hasMovieDBKey = true;
 
- $scope.listEpisodesForSeason = listEpisodesForSeason;
-
- apiService.theMovieDb.hasKey().then(function (response) {
+ apiService.theMovieDb.hasKey().then(function (response) {
  if (!response.data.key) {
  $scope.hasMovieDBKey = false;
  }
@@ -91,6 +89,7 @@ angular.module('streama').controller('adminShowCtrl', [
 
  $scope.setCurrentSeason = function (index) {
  $scope.currentSeason = index;
+ $scope.currentEpisodesForSeason = listEpisodesForSeason(index);
  if(index){
  if($scope.hasMovieDBKey){
  apiService.theMovieDb.countNewEpisodesForSeason({apiId: $scope.show.apiId, showId: $stateParams.showId, season: index})

grails-app/assets/javascripts/streama/controllers/admin-video-ctrl.js

@@ -4,73 +4,83 @@ angular.module('streama').controller('adminVideoCtrl', [
  '$scope', 'apiService', '$stateParams', 'modalService', '$state', 'uploadService',
  function ($scope, apiService, $stateParams, modalService, $state, uploadService) {
  $scope.loading = true;
+ $scope.uploadStatus = {};
+
+ $scope.openVideoModal = openVideoModal;
+ $scope.manageFiles = manageFiles;
+ $scope.delete = doDelete;
+ $scope.addSimilarMovieToStreama = addSimilarMovieToStreama;
+ $scope.addToCurrentNotification = addToCurrentNotification;
+
+ $scope.upload = initUpload();
+
+ init();
+
+ function init(){
+ apiService.genericVideo.get($stateParams.videoId).then(function (response) {
+ var data = response.data;
+ $scope.video = data;
+ $scope.loading = false;
+ $scope.highlightOnDashboard = modalService.newReleaseModal.bind(modalService, $scope.video, 'genericVideo');
+ });
+ }
 
- apiService.genericVideo.get($stateParams.videoId).then(function (response) {
- var data = response.data;
- $scope.video = data;
- $scope.loading = false;
- });
+ function initUpload(){
+ uploadService.doUpload.bind(uploadService, $scope.uploadStatus, 'video/uploadFile.json?id=' + $stateParams.movieId, function (data) {
+ $scope.uploadStatus.percentage = null;
 
- $scope.openVideoModal = function () {
+ if(data.error) return
+
+ $scope.video.files = $scope.video.files || [];
+ $scope.video.files.push(data);
+ }, function () {})
+ }
+
+ function addToCurrentNotification(){
+ apiService.notification.addMovieToCurrentNotification($stateParams.movieId).then(function () {
+ alertify.success('The movie was added to the current notification queue.');
+ });
+ }
+
+ function doDelete(){
+ alertify.set({ buttonReverse: true, labels: {ok: "Yes", cancel : "Cancel"}});
+ alertify.confirm("Are you sure, you want to delete this Video?", function (confirmed) {
+ if(confirmed){
+ apiService.genericVideo.delete($stateParams.videoId).then(function () {
+ $state.go('admin.videos');
+ });
+ }
+ })
+ }
+
+ function openVideoModal() {
  modalService.genericVideoModal($scope.video, function (data) {
  angular.merge($scope.video, data)
  });
- };
+ }
 
- $scope.delete = function(){
- alertify.set({ buttonReverse: true, labels: {ok: "Yes", cancel : "Cancel"}});
- alertify.confirm("Are you sure, you want to delete this Video?", function (confirmed) {
- if(confirmed){
- apiService.genericVideo.delete($stateParams.videoId).then(function () {
- $state.go('admin.videos');
- });
- }
- })
- };
-
- $scope.addToCurrentNotification = function(){
- apiService.notification.addMovieToCurrentNotification($stateParams.movieId).then(function () {
- alertify.success('The movie was added to the current notification queue.');
- });
- };
-
- $scope.manageFiles = function(video){
- modalService.fileManagerModal(video);
- };
 
+ function manageFiles(video){
+ modalService.fileManagerModal(video);
+ }
 
- $scope.addSimilarMovieToStreama = function(movie, redirect){
+ function addSimilarMovieToStreama(movie, redirect){
  alertify.set({ buttonReverse: true, labels: {ok: "Yes", cancel : "Cancel"}});
 
- alertify.confirm("Do you want to add \""+ movie.title +"\" to the Streama library?", function (confirmed) {
- if(confirmed){
+ alertify.confirm("Do you want to add \""+ movie.title +"\" to the Streama library?", function (confirmed) {
+ if(confirmed){
 
  var apiId = movie.id;
  delete movie.id;
  movie.apiId = apiId;
 
  apiService.movie.save(movie).then(function (data) {
- if(redirect){
- $state.go('admin.movie', {movieId: data.data.id});
- }
+ if(redirect){
+ $state.go('admin.movie', {movieId: data.data.id});
+ }
  });
- }
- })
- };
-
- $scope.uploadStatus = {};
-
- $scope.upload = uploadService.doUpload.bind(uploadService, $scope.uploadStatus, 'video/uploadFile.json?id=' + $stateParams.movieId, function (data) {
- $scope.uploadStatus.percentage = null;
-
- if(data.error) return
-
- $scope.video.files = $scope.video.files || [];
- $scope.video.files.push(data);
- }, function () {});
-
-
-
-
+ }
+ })
+ }
 
 }]);

grails-app/assets/javascripts/streama/controllers/createFromFileCtrl.modal.js

@@ -139,14 +139,27 @@ function modalCreateFromFileCtrl($scope, $uibModalInstance, apiService, uploadSe
  directory.isSelected = !directory.isSelected;
  if(directory.isSelected){
  openLocalDirectory(directory, true, function () {
- _.forEach(directory.localFiles, function (file) {
- toggleSelection(file);
+ _.forEach(directory.localFiles, function (content) {
+ if(content.path.split('\\').pop().split('.').length > 1){
+ toggleSelection(content);
+ }else{
+ openLocalDirectory(content, true, function () {
+ _.forEach(content.localFiles, function (file) {
+ toggleSelection(file);
+ });
+ });
+ };
  });
  });
  }else{
  _.forEach(directory.localFiles, function (file) {
  deselect(file);
  directory.showFiles = false;
+ file.showFiles = false;
+ _.forEach(file.localFiles, function (subfile) {
+ deselect(subfile);
+ subfile.showFiles = false;
+ });
  });
  }