diff --git a/Kyoo.Transcoder/src/Stream.h b/Kyoo.Transcoder/src/Stream.h index 5f6ce62f..536157d4 100644 --- a/Kyoo.Transcoder/src/Stream.h +++ b/Kyoo.Transcoder/src/Stream.h @@ -25,8 +25,11 @@ extern "C" struct Stream { if(title != NULL) this->title= _strdup(title); - if(languageCode != NULL) + + if (languageCode != NULL) language = _strdup(languageCode); + else + language = _strdup("und"); if (codec != NULL) this->codec = _strdup(codec); diff --git a/Kyoo.Transcoder/src/Transcoder.cpp b/Kyoo.Transcoder/src/Transcoder.cpp index dbb7b635..3e8e6a9d 100644 --- a/Kyoo.Transcoder/src/Transcoder.cpp +++ b/Kyoo.Transcoder/src/Transcoder.cpp @@ -226,9 +226,11 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount { *subtitleCount += 1; + AVDictionaryEntry *languagePtr = av_dict_get(inputStream->metadata, "language", NULL, 0); + //Get metadata for file name streams[i] = Stream(NULL, //title - av_dict_get(inputStream->metadata, "language", NULL, 0)->value, //language + languagePtr ? languagePtr->value : NULL, //language avcodec_get_name(inputCodecpar->codec_id), //format inputStream->disposition & AV_DISPOSITION_DEFAULT, //isDefault inputStream->disposition & AV_DISPOSITION_FORCED); //isForced diff --git a/Kyoo/InternalAPI/ThumbnailsManager/ThumbnailsManager.cs b/Kyoo/InternalAPI/ThumbnailsManager/ThumbnailsManager.cs index 896f694a..b213d804 100644 --- a/Kyoo/InternalAPI/ThumbnailsManager/ThumbnailsManager.cs +++ b/Kyoo/InternalAPI/ThumbnailsManager/ThumbnailsManager.cs @@ -68,7 +68,7 @@ namespace Kyoo.InternalAPI.ThumbnailsManager Directory.CreateDirectory(root); string localThumb = root + "/" + people[i].slug + ".jpg"; - if (!File.Exists(localThumb)) + if (people[i].imgPrimary != null && !File.Exists(localThumb)) { using (WebClient client = new WebClient()) { @@ -85,7 +85,7 @@ namespace Kyoo.InternalAPI.ThumbnailsManager { //string localThumb = Path.ChangeExtension(episode.Path, "jpg"); string localThumb = episode.Path.Replace(Path.GetExtension(episode.Path), "-thumb.jpg"); - if (!File.Exists(localThumb)) + if (episode.ImgPrimary != null && !File.Exists(localThumb)) { using (WebClient client = new WebClient()) { diff --git a/Kyoo/Program.cs b/Kyoo/Program.cs index b9c0869b..09f2b50c 100644 --- a/Kyoo/Program.cs +++ b/Kyoo/Program.cs @@ -1,8 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using System.IO; namespace Kyoo { @@ -15,11 +13,6 @@ namespace Kyoo public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .ConfigureAppConfiguration((hostingContext, config) => - { - config.SetBasePath(Directory.GetCurrentDirectory()); - config.AddJsonFile("config.json", false, true); - }) .UseStartup(); } } diff --git a/Kyoo/Transcoder/Kyoo.Transcoder.dll b/Kyoo/Transcoder/Kyoo.Transcoder.dll index df9e8685..da525875 100644 Binary files a/Kyoo/Transcoder/Kyoo.Transcoder.dll and b/Kyoo/Transcoder/Kyoo.Transcoder.dll differ diff --git a/Kyoo/appsettings.json b/Kyoo/appsettings.json index 8109e4f0..12d7b41d 100644 --- a/Kyoo/appsettings.json +++ b/Kyoo/appsettings.json @@ -1,9 +1,21 @@ { + "server.urls": "http://0.0.0.0", "https_port": 44300, "Logging": { "LogLevel": { "Default": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + + "databasePath": "C://Projects/database.db", + "tempPath": "C:\\\\Projects\\temp", + "peoplePath": "D:\\\\Videos\\People", + "plugins": "C:\\Projects\\Kyoo\\Debug", + "providerPlugins": "C://Projects/Plugins/Providers", + "libraryPaths": [ + "\\\\sdg\\video\\Anime" + ], + "regex": ".*\\\\(?.+?) S(?\\d+)E(?\\d+)", + "absoluteRegex": ".*\\\\(?.+?) (?\\d+)" } diff --git a/Kyoo/config.json b/Kyoo/config.json deleted file mode 100644 index f2d16b9e..00000000 --- a/Kyoo/config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "databasePath": "C://Projects/database.db", - "tempPath": "C:\\\\Projects\\temp", - "peoplePath": "D:\\\\Videos\\People", - "plugins": "C:\\Projects\\Kyoo\\Debug", - "providerPlugins": "C://Projects/Plugins/Providers", - "libraryPaths": [ - "\\\\sdg\\video\\Anime" - ], - "regex": ".*\\\\(?.+?) S(?\\d+)E(?\\d+)", - "absoluteRegex": ".*\\\\(?.+?) (?\\d+)" -}