AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UX Pass 6 (#3131)

Browse source 
Co-authored-by: Joseph Milazzo <joseph.v.milazzo@gmail.com>
This commit is contained in:
Robbie Davis 2024-08-26 10:52:46 -04:00 • committed by GitHub
parent fc644985be
commit 62383042b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
70 changed files with 741 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

39
API/Controllers/SettingsController.cs
View file

@ -164,8 +164,6 @@ public class SettingsController : BaseApiController
foreach (var setting in currentSettings)
{
UpdateSchedulingSettings(setting, updateSettingsDto);
if (setting.Key == ServerSettingKey.OnDeckProgressDays &&
updateSettingsDto.OnDeckProgressDays + string.Empty != setting.Value)
{
@ -205,6 +203,8 @@ public class SettingsController : BaseApiController
_unitOfWork.SettingsRepository.Update(setting);
}
UpdateSchedulingSettings(setting, updateSettingsDto);
UpdateEmailSettings(setting, updateSettingsDto);
@ -293,14 +293,6 @@ public class SettingsController : BaseApiController
{
setting.Value = updateSettingsDto.AllowStatCollection + string.Empty;
_unitOfWork.SettingsRepository.Update(setting);
if (!updateSettingsDto.AllowStatCollection)
{
_taskScheduler.CancelStatsTasks();
}
else
{
await _taskScheduler.ScheduleStatsTasks();
}
}
if (setting.Key == ServerSettingKey.TotalBackups &&
@ -341,20 +333,27 @@ public class SettingsController : BaseApiController
{
await _unitOfWork.CommitAsync();
if (!updateSettingsDto.AllowStatCollection)
{
_taskScheduler.CancelStatsTasks();
}
else
{
await _taskScheduler.ScheduleStatsTasks();
}
if (updateBookmarks)
{
_directoryService.ExistOrCreate(bookmarkDirectory);
_directoryService.CopyDirectoryToDirectory(originalBookmarkDirectory, bookmarkDirectory);
_directoryService.ClearAndDeleteDirectory(originalBookmarkDirectory);
BackgroundJob.Enqueue(() => UpdateBookmarkDirectory(originalBookmarkDirectory, bookmarkDirectory));
}
if (updateSettingsDto.EnableFolderWatching)
{
await _libraryWatcher.StartWatching();
BackgroundJob.Enqueue(() => _libraryWatcher.StartWatching());
}
else
{
_libraryWatcher.StopWatching();
BackgroundJob.Enqueue(() => _libraryWatcher.StopWatching());
}
}
catch (Exception ex)
@ -366,10 +365,18 @@ public class SettingsController : BaseApiController
_logger.LogInformation("Server Settings updated");
await _taskScheduler.ScheduleTasks();
BackgroundJob.Enqueue(() => _taskScheduler.ScheduleTasks());
return Ok(updateSettingsDto);
}
public void UpdateBookmarkDirectory(string originalBookmarkDirectory, string bookmarkDirectory)
{
_directoryService.ExistOrCreate(bookmarkDirectory);
_directoryService.CopyDirectoryToDirectory(originalBookmarkDirectory, bookmarkDirectory);
_directoryService.ClearAndDeleteDirectory(originalBookmarkDirectory);
}
private void UpdateSchedulingSettings(ServerSetting setting, ServerSettingDto updateSettingsDto)
{
if (setting.Key == ServerSettingKey.TaskBackup && updateSettingsDto.TaskBackup != setting.Value)

8
API/Services/SeriesService.cs
View file

@ -175,6 +175,10 @@ public class SeriesService : ISeriesService
series.Metadata.Genres.Add(genre);
}, () => series.Metadata.GenresLocked = true);
}
else
{
series.Metadata.Genres = new List<Genre>();
}
if (updateSeriesMetadataDto.SeriesMetadata?.Tags is {Count: > 0})
@ -188,6 +192,10 @@ public class SeriesService : ISeriesService
series.Metadata.Tags.Add(tag);
}, () => series.Metadata.TagsLocked = true);
}
else
{
series.Metadata.Tags = new List<Tag>();
}
if (updateSeriesMetadataDto.SeriesMetadata != null)
{