mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-12-11 07:35:16 -05:00
* Bump versions by dotnet-bump-version. * Bump versions by dotnet-bump-version. * Workflow updates (#658) # Added - Added: Added automatic character parsing for discord notifier. Now if the PR is over a certain character limit, it will trim and add an appropriate link to the full changelog. (Release for Stable, PR for Dev) # Removed - Removed: Removed Sentry map task from the workflow since Sentry is no longer used. * Bump versions by dotnet-bump-version. * Misc Updates (#665) * Do not allow non-admins to change their passwords when authentication is disabled * Clean up the login page so that input field text is black * cleanup some resizing when typing a password and having a lot of users * Changed the LastActive for a user to not just be login, but also when they open an already authenticated session. * Bump versions by dotnet-bump-version. * Logging Cleanup (#668) * Do not allow non-admins to change their passwords when authentication is disabled * Clean up the login page so that input field text is black * cleanup some resizing when typing a password and having a lot of users * Changed the LastActive for a user to not just be login, but also when they open an already authenticated session. * Removed some verbose debugging statements and moved some debug to information to be more prevelant to logs for default installs. * In Progress now sends progress information on the Series * Add ability to add cards to recently added when new series are added in backend * Implemented the ability to click the glasses icon to turn off incognito mode from within the reader so you can start tracking progress * Don't warn the user about authentication when they don't touch that control * Bump versions by dotnet-bump-version. * Changed the stats that are sent back to stat server from installed server. * Revert "Changed the stats that are sent back to stat server from installed server." This reverts commit 644cb6d1f67de9531ea1a1dfd3853709e0329ce7. * Bump versions by dotnet-bump-version. * Bump versions by dotnet-bump-version. * Bulk Add to Collection (#674) * Fixed the typeahead not having the same size input box as other inputs * Implemented the ability to add multiple series to a collection through bulk operations flow. Updated book parser to handle "@import url('...');" syntax as well as @import '...'; * Implemented the ability to create a new Collection tag via bulk operations flow. * Bump versions by dotnet-bump-version. * Bulk Operations for In Progress and Recently Added (#677) * Don't log a message about bad match if the file is a cover image * Enable bulk operations for In Progress and Recently Added * Fixed a bad logic case * Bump versions by dotnet-bump-version. * Regression Fix (#680) * Ensure we mount the backups directory for Docker users * Fixed a huge logic bug that deleted files in users libraries * Bump versions by dotnet-bump-version. * Change chunk size to be a fixed 50 to validate if it's causing issue with refresh. Added some try catches to see if exceptions are causing issues. (#681) * Bump versions by dotnet-bump-version. * Fixed a bug where searching on localized name would fail to show on the search. Fixed a bug where extra spaces would cause the search results not to show properly. (#682) * Bump versions by dotnet-bump-version. * When we have a special marker, ensure we fall back to folder parsing to try and group correctly to the actual series before just accepting what we parsed. (#684) Fixed a missed parsing case where comic special parsing wasn't being called on comic libraries. * Bump versions by dotnet-bump-version. * iOS Admin page dropdown fix (#686) # Fixed: - Fixed: Fixed an issue where the dropdown on the admin server page would not work on Safari or other iOS browsers. * When the DB fails to save, log out all the series the user should look into for constraint issues and push a message to the admins connected to webui. (#687) * Bump versions by dotnet-bump-version. * Bump versions by dotnet-bump-version. * Stat upload will now schedule itself between midnight and 6am in server time for upload. (#688) * Bump versions by dotnet-bump-version. * EPUB CSS Parsing Issues (#690) * WIP. Rewrote some of the Regex to better support css escaping. We now escape background-image, border-image, and list-style-image within css files. * Added position relative to help with positioning on books that are just absolute positioned elements. * When there is absolute positioning, like in some epub based comics, supress the bottom action bar since it wont render in the correct location. * Fixed tests * Commented out tests * Bump versions by dotnet-bump-version. * More EPUB Scoping Fixes (#691) * Added better handling around when importing css files that are empty. Moved comment removal on css files to before some css whitespace cleanup to get better matches. * Some enhancements on the checks to see if we need the bottom action bar on reader. Now we don't query DOM and have something that works more reliably. * Bump versions by dotnet-bump-version. * Fixed an issue where docker users were not properly backing up the database. Removed an empty File for when covers/ had nothing in it. (#692) * Bump versions by dotnet-bump-version. * Fallback to Folder Parsing Issue (#694) * Fixed a bug in the scanner where we fall back to parsing from folders for poorly named files. The code was exiting early if a chapter or volume could be parsed out. * Fixed a unit test by tweaking a regex for fallback * Bump versions by dotnet-bump-version. * KavitaStats Cleanup (#695) * Refactored Stats code to be much cleaner and user better naming. * Cleaned up the actual http code to use Flurl and to return if the upload was successful or not so we can delete the file where appropriate. * More refactoring for the stats code to clean it up and keep it consistent with our standards. * Removed a confusing log statement * Added support for old api key header from original stat server * Use the correct endpoint, not the new one. * Code smell * Bump versions by dotnet-bump-version. * Bulk Deletion (#697) * Implemented bulk deletion of series * Don't show unauthorized exception on UI, just redirect to the login page. * Bump versions by dotnet-bump-version. * Cover Image Picking + Forwarding Headers with EPUBs (#700) * Ensure Kavita knows about forwarding headers (fixes issue with epub urls not going through https with reverse proxy). Fixed a case where cover image selection preferred nested folders vs files in root directory. * Fixed broken unit test * Added bug that I fixed to the unit tests * Cover Image Picking + Forwarding Headers with EPUBs (#702) * Updating GA Bump version temporarily for fix (#703) * Bump versions by dotnet-bump-version. * Cover Image Picking + Forwarding Headers with EPUBs (GA Fix) (#704) * Bump versions by dotnet-bump-version. * Vacation Fixes (#709) * Ignore system and hidden folders when performing directory scan. * Fixed the comic parser tests not using Comic mode for parsing. * Accept all forwarded headers and use them. * Ignore some changes from another branch * Bump versions by dotnet-bump-version. * Breaking Changes: Docker Parity (#698) * Refactored all the config files for Kavita to be loaded from config/. This will allow docker to just mount one folder and for Update functionality to be trivial. * Cleaned up documentation around new update method. * Updated docker files to support config directory * Removed entrypoint, no longer needed * Update appsettings to point to config directory for logs * Updated message for docker users that are upgrading * Ensure that docker users that have not updated their mount points from upgrade cannot start the server * Code smells * More cleanup * Added entrypoint to fix bind mount issues * Updated README with new folder structure * Fixed build system for new setup * Updated string path if user is docker * Updated the migration flow for docker to work properly and Fixed LogFile configuration updating. * Migrating docker images is now working 100% * Fixed config from bad code * Code cleanup Co-authored-by: Chris Plaatjes <kizaing@gmail.com> * Bump versions by dotnet-bump-version. * Feature/docker parity (#714) * Refactored all the config files for Kavita to be loaded from config/. This will allow docker to just mount one folder and for Update functionality to be trivial. * Cleaned up documentation around new update method. * Updated docker files to support config directory * Removed entrypoint, no longer needed * Update appsettings to point to config directory for logs * Updated message for docker users that are upgrading * Ensure that docker users that have not updated their mount points from upgrade cannot start the server * Code smells * More cleanup * Added entrypoint to fix bind mount issues * Updated README with new folder structure * Fixed build system for new setup * Updated string path if user is docker * Updated the migration flow for docker to work properly and Fixed LogFile configuration updating. * Migrating docker images is now working 100% * Fixed config from bad code * Code cleanup * Fixed monorepo-build.sh Co-authored-by: Chris Plaatjes <kizaing@gmail.com> * Breaking Changes: Docker Parity (#715) * Fixed a bug in the copy directory to directory in the migration * Somehow GetFiles lost static modifier. * Bump versions by dotnet-bump-version. * Build issue (#716) * Fixed a bug in the copy directory to directory in the migration * Somehow GetFiles lost static modifier. * Please work * Bump versions by dotnet-bump-version. * Bump versions by dotnet-bump-version. * Shakeout Changes (#717) * Make the appsettings public on Configuration and change how we detect when to migrate for non-docker users. * Fixed up non-docker copy command and removed duplicate check on source directory for a copy. * Don't delete files unless we know we are successful * Bump versions by dotnet-bump-version. * Fixed a migration issue on docker happening too many times or throwing exception when source wasn't there. (#719) * Bump versions by dotnet-bump-version. * Version bump for release (#718) * Bump versions by dotnet-bump-version. Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> Co-authored-by: YEGCSharpDev <89283498+YEGCSharpDev@users.noreply.github.com> Co-authored-by: Chris Plaatjes <kizaing@gmail.com>
355 lines
11 KiB
C#
355 lines
11 KiB
C#
using System;
|
|
using System.IO;
|
|
using System.Text.Json;
|
|
using Kavita.Common.EnvironmentInfo;
|
|
using Microsoft.Extensions.Hosting;
|
|
|
|
namespace Kavita.Common
|
|
{
|
|
public static class Configuration
|
|
{
|
|
public static readonly string AppSettingsFilename = Path.Join("config", GetAppSettingFilename());
|
|
|
|
public static string Branch
|
|
{
|
|
get => GetBranch(GetAppSettingFilename());
|
|
set => SetBranch(GetAppSettingFilename(), value);
|
|
}
|
|
|
|
public static int Port
|
|
{
|
|
get => GetPort(GetAppSettingFilename());
|
|
set => SetPort(GetAppSettingFilename(), value);
|
|
}
|
|
|
|
public static string JwtToken
|
|
{
|
|
get => GetJwtToken(GetAppSettingFilename());
|
|
set => SetJwtToken(GetAppSettingFilename(), value);
|
|
}
|
|
|
|
public static string LogLevel
|
|
{
|
|
get => GetLogLevel(GetAppSettingFilename());
|
|
set => SetLogLevel(GetAppSettingFilename(), value);
|
|
}
|
|
|
|
public static string LogPath
|
|
{
|
|
get => GetLoggingFile(GetAppSettingFilename());
|
|
set => SetLoggingFile(GetAppSettingFilename(), value);
|
|
}
|
|
|
|
public static string DatabasePath
|
|
{
|
|
get => GetDatabasePath(GetAppSettingFilename());
|
|
set => SetDatabasePath(GetAppSettingFilename(), value);
|
|
}
|
|
|
|
private static string GetAppSettingFilename()
|
|
{
|
|
if (!string.IsNullOrEmpty(AppSettingsFilename))
|
|
{
|
|
return AppSettingsFilename;
|
|
}
|
|
|
|
var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
|
|
var isDevelopment = environment == Environments.Development;
|
|
return "appsettings" + (isDevelopment ? ".Development" : string.Empty) + ".json";
|
|
}
|
|
|
|
#region JWT Token
|
|
|
|
private static string GetJwtToken(string filePath)
|
|
{
|
|
try
|
|
{
|
|
var json = File.ReadAllText(filePath);
|
|
var jsonObj = JsonSerializer.Deserialize<dynamic>(json);
|
|
const string key = "TokenKey";
|
|
|
|
if (jsonObj.TryGetProperty(key, out JsonElement tokenElement))
|
|
{
|
|
return tokenElement.GetString();
|
|
}
|
|
|
|
return string.Empty;
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.WriteLine("Error reading app settings: " + ex.Message);
|
|
}
|
|
|
|
return string.Empty;
|
|
}
|
|
|
|
private static void SetJwtToken(string filePath, string token)
|
|
{
|
|
try
|
|
{
|
|
var currentToken = GetJwtToken(filePath);
|
|
var json = File.ReadAllText(filePath)
|
|
.Replace("\"TokenKey\": \"" + currentToken, "\"TokenKey\": \"" + token);
|
|
File.WriteAllText(filePath, json);
|
|
}
|
|
catch (Exception)
|
|
{
|
|
/* Swallow exception */
|
|
}
|
|
}
|
|
|
|
public static bool CheckIfJwtTokenSet()
|
|
{
|
|
try
|
|
{
|
|
return GetJwtToken(GetAppSettingFilename()) != "super secret unguessable key";
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.WriteLine("Error writing app settings: " + ex.Message);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region Port
|
|
|
|
private static void SetPort(string filePath, int port)
|
|
{
|
|
if (new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker)
|
|
{
|
|
return;
|
|
}
|
|
|
|
try
|
|
{
|
|
var currentPort = GetPort(filePath);
|
|
var json = File.ReadAllText(filePath).Replace("\"Port\": " + currentPort, "\"Port\": " + port);
|
|
File.WriteAllText(filePath, json);
|
|
}
|
|
catch (Exception)
|
|
{
|
|
/* Swallow Exception */
|
|
}
|
|
}
|
|
|
|
private static int GetPort(string filePath)
|
|
{
|
|
const int defaultPort = 5000;
|
|
if (new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker)
|
|
{
|
|
return defaultPort;
|
|
}
|
|
|
|
try
|
|
{
|
|
var json = File.ReadAllText(filePath);
|
|
var jsonObj = JsonSerializer.Deserialize<dynamic>(json);
|
|
const string key = "Port";
|
|
|
|
if (jsonObj.TryGetProperty(key, out JsonElement tokenElement))
|
|
{
|
|
return tokenElement.GetInt32();
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.WriteLine("Error writing app settings: " + ex.Message);
|
|
}
|
|
|
|
return defaultPort;
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region LogLevel
|
|
|
|
private static void SetLogLevel(string filePath, string logLevel)
|
|
{
|
|
try
|
|
{
|
|
var currentLevel = GetLogLevel(filePath);
|
|
var json = File.ReadAllText(filePath)
|
|
.Replace($"\"Default\": \"{currentLevel}\"", $"\"Default\": \"{logLevel}\"");
|
|
File.WriteAllText(filePath, json);
|
|
}
|
|
catch (Exception)
|
|
{
|
|
/* Swallow Exception */
|
|
}
|
|
}
|
|
|
|
private static string GetLogLevel(string filePath)
|
|
{
|
|
try
|
|
{
|
|
var json = File.ReadAllText(filePath);
|
|
var jsonObj = JsonSerializer.Deserialize<dynamic>(json);
|
|
|
|
if (jsonObj.TryGetProperty("Logging", out JsonElement tokenElement))
|
|
{
|
|
foreach (var property in tokenElement.EnumerateObject())
|
|
{
|
|
if (!property.Name.Equals("LogLevel")) continue;
|
|
foreach (var logProperty in property.Value.EnumerateObject())
|
|
{
|
|
if (logProperty.Name.Equals("Default"))
|
|
{
|
|
return logProperty.Value.GetString();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.WriteLine("Error writing app settings: " + ex.Message);
|
|
}
|
|
|
|
return "Information";
|
|
}
|
|
|
|
#endregion
|
|
|
|
private static string GetBranch(string filePath)
|
|
{
|
|
const string defaultBranch = "main";
|
|
|
|
try
|
|
{
|
|
var json = File.ReadAllText(filePath);
|
|
var jsonObj = JsonSerializer.Deserialize<dynamic>(json);
|
|
const string key = "Branch";
|
|
|
|
if (jsonObj.TryGetProperty(key, out JsonElement tokenElement))
|
|
{
|
|
return tokenElement.GetString();
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.WriteLine("Error reading app settings: " + ex.Message);
|
|
}
|
|
|
|
return defaultBranch;
|
|
}
|
|
|
|
private static void SetBranch(string filePath, string updatedBranch)
|
|
{
|
|
try
|
|
{
|
|
var currentBranch = GetBranch(filePath);
|
|
var json = File.ReadAllText(filePath)
|
|
.Replace("\"Branch\": " + currentBranch, "\"Branch\": " + updatedBranch);
|
|
File.WriteAllText(filePath, json);
|
|
}
|
|
catch (Exception)
|
|
{
|
|
/* Swallow Exception */
|
|
}
|
|
}
|
|
|
|
private static string GetLoggingFile(string filePath)
|
|
{
|
|
const string defaultFile = "config/logs/kavita.log";
|
|
|
|
try
|
|
{
|
|
var json = File.ReadAllText(filePath);
|
|
var jsonObj = JsonSerializer.Deserialize<dynamic>(json);
|
|
|
|
if (jsonObj.TryGetProperty("Logging", out JsonElement tokenElement))
|
|
{
|
|
foreach (var property in tokenElement.EnumerateObject())
|
|
{
|
|
if (!property.Name.Equals("File")) continue;
|
|
foreach (var logProperty in property.Value.EnumerateObject())
|
|
{
|
|
if (logProperty.Name.Equals("Path"))
|
|
{
|
|
return logProperty.Value.GetString();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.WriteLine("Error writing app settings: " + ex.Message);
|
|
}
|
|
|
|
return defaultFile;
|
|
}
|
|
|
|
/// <summary>
|
|
/// This should NEVER be called except by <see cref="MigrateConfigFiles"/>
|
|
/// </summary>
|
|
/// <param name="filePath"></param>
|
|
/// <param name="directory"></param>
|
|
private static void SetLoggingFile(string filePath, string directory)
|
|
{
|
|
try
|
|
{
|
|
var currentFile = GetLoggingFile(filePath);
|
|
var json = File.ReadAllText(filePath)
|
|
.Replace("\"Path\": \"" + currentFile + "\"", "\"Path\": \"" + directory + "\"");
|
|
File.WriteAllText(filePath, json);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
/* Swallow Exception */
|
|
Console.WriteLine(ex);
|
|
}
|
|
}
|
|
|
|
private static string GetDatabasePath(string filePath)
|
|
{
|
|
const string defaultFile = "config/kavita.db";
|
|
|
|
try
|
|
{
|
|
var json = File.ReadAllText(filePath);
|
|
var jsonObj = JsonSerializer.Deserialize<dynamic>(json);
|
|
|
|
if (jsonObj.TryGetProperty("ConnectionStrings", out JsonElement tokenElement))
|
|
{
|
|
foreach (var property in tokenElement.EnumerateObject())
|
|
{
|
|
if (!property.Name.Equals("DefaultConnection")) continue;
|
|
return property.Value.GetString();
|
|
}
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.WriteLine("Error writing app settings: " + ex.Message);
|
|
}
|
|
|
|
return defaultFile;
|
|
}
|
|
|
|
/// <summary>
|
|
/// This should NEVER be called except by <see cref="MigrateConfigFiles"/>
|
|
/// </summary>
|
|
/// <param name="filePath"></param>
|
|
/// <param name="updatedPath"></param>
|
|
private static void SetDatabasePath(string filePath, string updatedPath)
|
|
{
|
|
try
|
|
{
|
|
var existingString = GetDatabasePath(filePath);
|
|
var json = File.ReadAllText(filePath)
|
|
.Replace(existingString,
|
|
"Data source=" + updatedPath);
|
|
File.WriteAllText(filePath, json);
|
|
}
|
|
catch (Exception)
|
|
{
|
|
/* Swallow Exception */
|
|
}
|
|
}
|
|
}
|
|
}
|