From c852d0c3b94d1c40496063b0456c6af0474cf404 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 2 Oct 2019 00:22:29 +0200 Subject: [PATCH] Solving bugs. --- Kyoo.Transcoder/src/Stream.h | 5 ++++- Kyoo.Transcoder/src/Transcoder.cpp | 4 +++- .../ThumbnailsManager/ThumbnailsManager.cs | 4 ++-- Kyoo/Program.cs | 7 ------- Kyoo/Transcoder/Kyoo.Transcoder.dll | Bin 44544 -> 44544 bytes Kyoo/appsettings.json | 14 +++++++++++++- Kyoo/config.json | 12 ------------ 7 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 Kyoo/config.json 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 df9e86855d7bb533110a58fef04ca9ae9244aa59..da525875e85d8820efe4a94ab344d5fad6f646cc 100644 GIT binary patch delta 13433 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 CeBA&5 delta 13279 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.+?) 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+)" -}