Fix db validation movie

.env.local

@@ -0,0 +1,4 @@
+SERVER_PORT=3000
+SERVER_HOST=http://localhost
+SERVER_SUB_FOLDER=
+NEXT_PUBLIC_SERVER_URL=$SERVER_HOST:$SERVER_PORT$SERVER_SUB_FOLDER

.gitignore

@@ -24,7 +24,6 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-.env.local
 .env.development.local
 .env.test.local
 .env.production.local

MovieServer/movieserver/lib/ffmpeg-presets/1080P.js

@@ -1,9 +1,8 @@
 exports.load = function(ffmpeg) {
   ffmpeg
-  //.withVideoCodec('h264_nvenc')
-  .withVideoBitrate(8000)
-  .withAudioCodec('libmp3lame')
-  .withVideoCodec('h264_nvenc')
+  .withVideoCodec('libx264')
+  .withVideoBitrate(6000)
+  .withAudioCodec('aac')
   .inputOption([
     '-re'
   ])
@@ -23,4 +22,4 @@ exports.load = function(ffmpeg) {
     '-max_muxing_queue_size 9999'
   ])
   .outputFormat('mp4')
-};
+};

MovieServer/movieserver/lib/ffmpeg-presets/720P.js

@@ -1,12 +1,12 @@
 exports.load = function(ffmpeg) {
-    ffmpeg
-    .withVideoCodec('h264_nvenc')
+ffmpeg
+    .withVideoCodec('libx264')
     .withVideoBitrate(4000)
     .withAudioCodec('libmp3lame')
     .inputOption([
       '-re'
     ])
-    .outputOption([
+   /* .outputOption([
       '-g 52',
       '-map 0',
       '-map -v',
@@ -20,6 +20,29 @@ exports.load = function(ffmpeg) {
       '-vf scale=-1:720',
       '-movflags frag_keyframe+empty_moov+faststart',
       '-pix_fmt yuv420p'
+    ])*/
+    .outputOption([
+/*
+'-movflags frag_keyframe+empty_moov+faststart',
+'-pix_fmt yuv420p',
+'-preset ultrafast',
+ '-deadline realtime',
+'-crf 30'
+*/
+      '-g 52',
+      '-map 0',
+      '-map -v',
+      '-map 0:V',
+      '-sn',
+      '-deadline realtime',
+      '-lag-in-frames 0',
+      '-static-thresh 0',
+      '-frame-parallel 1',
+      '-crf 25',
+      '-movflags frag_keyframe+empty_moov+faststart',
+      '-pix_fmt yuv420p',
+'-preset ultrafast'
+
     ])
     .outputFormat('mp4')
-  };
+  };

MovieServer/movieserver/lib/library/library.js

@@ -145,6 +145,7 @@ class Library {
                                 ])
                                 .output(outputPath)
                                 .on('start', function(commandLine) {
+console.log(commandLine);
                                 })
                                 .on('error', function(err, stdout, stderr) {
                                     console.log('an error happened converting subtitle: ' + err.message);
@@ -241,4 +242,4 @@ class Library {
     }
 }
 
-module.exports = Library;
+module.exports = Library;

MovieServer/movieserver/lib/library/movieLibrary.js

@@ -32,31 +32,27 @@ class MovieLibrary extends Library {
                 if (result.length === 0) {
                     console.log(` > Found a new movie (${path} for library: '${this.name}')`);
 
-                    // Try to convert the subtitles from the movie
-                    //new Promise(async (resolve, reject) => {
-                     //   resolve();
-                    //});
-
-
-
                     // Insert to the movie table (contining the path of the movie)
                     db.one('INSERT INTO movie (path, library, name) VALUES ($1, $2, $3) RETURNING id', [path, this.id, movieName]).then(async (internal_movie_id) => {
                         internal_movie_id = internal_movie_id.id;
 
-                        console.log(` > Trying to convert subtitles, this may take a while...`);
-                        let subtitleConvertionResult = await this.convertSubtitles(movieName, path);
+			            // CURRENTLY DISABLED
+                        //console.log(` > Trying to convert subtitles, this may take a while...`);
+                        //let subtitleConvertionResult = await this.convertSubtitles(movieName, path);
 
                         // If the conversion failed (because the file was busy), try again.
-                        while(!subtitleConvertionResult) {
-                            await new Promise(r => setTimeout(r, 2000));
-                            subtitleConvertionResult = await this.convertSubtitles(movieName, path);
-                        }
+                        //while(!subtitleConvertionResult) {
+                        //    await new Promise(r => setTimeout(r, 2000));
+                        //    subtitleConvertionResult = await this.convertSubtitles(movieName, path);
+                        //}
 
                         // Find all the audio streams (languages) for the movie
+
                         let audio_streams = await this.findAudioStreams(movieName, path);
-                        console.log(audio_streams);
-                        for (let stream of audio_streams) {
-                            db.none('INSERT INTO movie_language (movie_id, language, stream_index) VALUES ($1, $2, $3)', [internal_movie_id, stream.language, stream.stream]);
+                        if (audio_streams) {
+                            for (let stream of audio_streams) {
+                                db.none('INSERT INTO movie_language (movie_id, language, stream_index) VALUES ($1, $2, $3)', [internal_movie_id, stream.language, stream.stream]);
+                            }
                         }
 
                         db.one('SELECT id FROM movie WHERE path = $1 AND library = $2', [path, this.id]).then(result => {
@@ -148,17 +144,14 @@ class MovieLibrary extends Library {
             return;
         }
         let t = this;
-        lock.acquire("abcdefg", async function(done) {
-
-        if (type === 'MOVIE') {
-            await t.addMovieIfNotSaved(movieName, path);
-        } else if (type === 'SUBTITLE') {
-            t.addSubtitleIfNotSaved(movieName, path, parentFolder);
-        }
-        done();
-    }, function() {
-
-    });
+	    lock.enter(async function (token) {
+            if (type === 'MOVIE') {
+                await t.addMovieIfNotSaved(movieName, path);
+            } else if (type === 'SUBTITLE') {
+                t.addSubtitleIfNotSaved(movieName, path, parentFolder);
+            }
+            lock.leave(token);
+        });
     }
 
     /**
@@ -184,4 +177,4 @@ class MovieLibrary extends Library {
     }
 }
 
-module.exports = MovieLibrary;
+module.exports = MovieLibrary;

MovieServer/movieserver/lib/library/tvLibrary.js

@@ -175,19 +175,20 @@ class TvLibrary extends Library {
                     let internal_episode_id = await t.one('INSERT INTO serie_episode (season_number, serie_id, episode, path) VALUES ($1, (SELECT id FROM serie WHERE name = $2 AND path = $3), $4, $5) RETURNING id', [seasonNumber, serieName, showPath, episodeNumber, episodePath]);
                     internal_episode_id = internal_episode_id.id;
 
-                    console.log(` > Trying to convert subtitles, this may take a while...`);
+		// CURENTLY DISABLED
+                    //console.log(` > Trying to convert subtitles, this may take a while...`);
                     // Try to convert the subtitles from the movie
-                    let subtitleConvertionResult = await this.convertSubtitles(serieName, episodePath, episodeNumber, seasonNumber);
+                    //let subtitleConvertionResult = await this.convertSubtitles(serieName, episodePath, episodeNumber, seasonNumber);
 
                     // If the conversion failed (because the file was busy), try again.
-                    while(!subtitleConvertionResult) {
-                        subtitleConvertionResult = await this.convertSubtitles(serieName, episodePath, episodeNumber, seasonNumber);
-                    }
+                    //while(!subtitleConvertionResult) {
+                    //    subtitleConvertionResult = await this.convertSubtitles(serieName, episodePath, episodeNumber, seasonNumber);
+                    //}
 
                     let audio_streams = await this.findAudioStreams(serieName, episodePath);
                     console.log(audio_streams);
                     for (let stream of audio_streams) {
-                        db.none('INSERT INTO serie_episode_language (serie_episode_id, language, stream_index) VALUES ($1, $2, $3)', [internal_episode_id, stream.language, stream.stream]);
+                        t.none('INSERT INTO serie_episode_language (serie_episode_id, language, stream_index) VALUES ($1, $2, $3)', [internal_episode_id, stream.language, stream.stream]);
                     }
 
                     // Get the internal serie id for the episode
@@ -339,7 +340,7 @@ class TvLibrary extends Library {
     async removeEntry(path) {
         return new Promise(async (resolve, reject) => {
             let t = this;
-            lock.acquire(this.id, async function(done) {
+	    lock.enter(async function (token) {
                 // Remove the subtitle if that is what we are removing
                 db.any('SELECT * FROM serie_episode_subtitle WHERE path = $1 AND library_id = $2', [path, t.id])
                 .then(result => {
@@ -378,21 +379,19 @@ class TvLibrary extends Library {
                                         await db.none('DELETE FROM serie WHERE id = $1', [episodeInformation[0].serie_id]);
                                         await db.none('DELETE FROM serie_metadata WHERE serie_id = $1', [episodeInformation[0].serie_id]);
                                     }
-                                    done();
+					lock.leave(token);
                                 });
                             } else {
-                                done();
+lock.leave(token);
                             }
                         });
                     } else {
-                        done();
+lock.leave(token);
                     }
                 });
-            }, function() {
-                resolve();
             });
         });
     }
 }
 
-module.exports = TvLibrary;
+module.exports = TvLibrary;

MovieServer/movieserver/lib/watcher.js

@@ -140,7 +140,7 @@ class Watcher {
                 await library.newEntry(filePath);
                 //console.log("mer efter")
             } else {
-                //library.newEntry(filePath);
+                library.newEntry(filePath);
             }
         })
         .on('unlink', (filePath) => {
@@ -175,4 +175,4 @@ class Watcher {
     }
 }
 
-module.exports = Watcher;
+module.exports = Watcher;