From 2d834dfc58e7ade4e27d28b43cefaf210aec3da2 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 28 Aug 2022 16:51:45 -0500 Subject: [PATCH] SQLite Hangfire (#1488) * Update to use SQLIte for Hangfire to retain information on tasks * Updated all external links to have noopener noreferrer * When watching folders, ensure the folders exist before creating watchers. * Tweaked the messaging for Email Service and added link to the project. --- API/API.csproj | 1 + API/Services/Tasks/Scanner/LibraryWatcher.cs | 1 + API/Startup.cs | 3 ++- .../directory-picker/directory-picker.component.html | 2 +- .../app/admin/invite-user/invite-user.component.html | 4 ++-- .../manage-email-settings.component.html | 4 ++-- .../manage-settings/manage-settings.component.html | 2 +- .../admin/manage-system/manage-system.component.html | 12 ++++++------ .../app/admin/manage-users/manage-users.component.ts | 2 +- .../announcements/changelog/changelog.component.html | 4 ++-- .../app/bookmark/bookmarks/bookmarks.component.html | 2 +- .../edit-series-relation.component.html | 2 +- .../all-collections/all-collections.component.html | 2 +- .../reading-lists/reading-lists.component.html | 2 +- .../update-notification-modal.component.html | 2 +- 15 files changed, 24 insertions(+), 21 deletions(-) diff --git a/API/API.csproj b/API/API.csproj index b5d91d566..d7920b926 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -54,6 +54,7 @@ + diff --git a/API/Services/Tasks/Scanner/LibraryWatcher.cs b/API/Services/Tasks/Scanner/LibraryWatcher.cs index f27f4119b..17ea744c9 100644 --- a/API/Services/Tasks/Scanner/LibraryWatcher.cs +++ b/API/Services/Tasks/Scanner/LibraryWatcher.cs @@ -115,6 +115,7 @@ public class LibraryWatcher : ILibraryWatcher .SelectMany(l => l.Folders) .Distinct() .Select(Parser.Parser.NormalizePath) + .Where(_directoryService.Exists) .ToList(); foreach (var libraryFolder in _libraryFolders) { diff --git a/API/Startup.cs b/API/Startup.cs index b4ce9b179..40987f874 100644 --- a/API/Startup.cs +++ b/API/Startup.cs @@ -17,6 +17,7 @@ using API.Services.Tasks; using API.SignalR; using Hangfire; using Hangfire.MemoryStorage; +using Hangfire.Storage.SQLite; using Kavita.Common; using Kavita.Common.EnvironmentInfo; using Microsoft.AspNetCore.Builder; @@ -155,7 +156,7 @@ namespace API services.AddHangfire(configuration => configuration .UseSimpleAssemblyNameTypeSerializer() .UseRecommendedSerializerSettings() - .UseMemoryStorage()); + .UseSQLiteStorage()); // Add the processing server as IHostedService services.AddHangfireServer(options => diff --git a/UI/Web/src/app/admin/_modals/directory-picker/directory-picker.component.html b/UI/Web/src/app/admin/_modals/directory-picker/directory-picker.component.html index d7c9b08f0..758922079 100644 --- a/UI/Web/src/app/admin/_modals/directory-picker/directory-picker.component.html +++ b/UI/Web/src/app/admin/_modals/directory-picker/directory-picker.component.html @@ -57,7 +57,7 @@
- Help + Help
diff --git a/UI/Web/src/app/admin/invite-user/invite-user.component.html b/UI/Web/src/app/admin/invite-user/invite-user.component.html index 1164627a7..64d97438e 100644 --- a/UI/Web/src/app/admin/invite-user/invite-user.component.html +++ b/UI/Web/src/app/admin/invite-user/invite-user.component.html @@ -6,7 +6,7 @@

- Invite a user to your server. Enter their email in and we will send them an email to create an account. If you do not want to use our email service, you can host your own + Invite a user to your server. Enter their email in and we will send them an email to create an account. If you do not want to use our email service, you can host your own email service or use a fake email (Forgot User will not work). A link will be presented regardless and can be used to setup the email account manually.

@@ -39,7 +39,7 @@

You can use the following link below to setup the account for your user or use the copy button. You may need to log out before using the link to register a new user. If your server is externally accessible, an email will have been sent to the user and the links can be used by them to finish setting up their account.

- + diff --git a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html index 63ac841ca..79a591662 100644 --- a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html +++ b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html @@ -2,8 +2,8 @@

Email Services (SMTP)

Kavita comes out of the box with an email service to power flows like invite user, forgot password, etc. Emails sent via our service are deleted immediately. You can use your own - email service. Set the url of the email service and use the Test button to ensure it works. At any time you can reset to ours. There is no way to disable emails although you are not required to use a - valid email address for users. Confirmation links will always be saved to logs. Emails will not be sent if you are not accessing Kavita via a publically reachable url. + email service, by setting up Kavita Email service. Set the url of the email service and use the Test button to ensure it works. At any time you can reset to the default. There is no way to disable emails although you are not required to use a + valid email address for users. Confirmation links will always be saved to logs and presented in the UI. Emails will not be sent if you are not accessing Kavita via a publically reachable url.

  diff --git a/UI/Web/src/app/admin/manage-settings/manage-settings.component.html b/UI/Web/src/app/admin/manage-settings/manage-settings.component.html index f8927f89a..878885c0c 100644 --- a/UI/Web/src/app/admin/manage-settings/manage-settings.component.html +++ b/UI/Web/src/app/admin/manage-settings/manage-settings.component.html @@ -58,7 +58,7 @@
-

Send anonymous usage data to Kavita's servers. This includes information on certain features used, number of files, OS version, kavita install version, cpu and memory. We will use this information to prioritize features, bug fixes, and preformance tuning. Requires restart to take effect. See wiki for what is collected.

+

Send anonymous usage data to Kavita's servers. This includes information on certain features used, number of files, OS version, kavita install version, cpu and memory. We will use this information to prioritize features, bug fixes, and preformance tuning. Requires restart to take effect. See wiki for what is collected.

diff --git a/UI/Web/src/app/admin/manage-system/manage-system.component.html b/UI/Web/src/app/admin/manage-system/manage-system.component.html index 68840a8d2..a2124df9c 100644 --- a/UI/Web/src/app/admin/manage-system/manage-system.component.html +++ b/UI/Web/src/app/admin/manage-system/manage-system.component.html @@ -16,26 +16,26 @@
Home page:
-
kavitareader.com
+
kavitareader.com
Wiki:
-
wiki.kavitareader.com
+
wiki.kavitareader.com
Discord:
-
discord.gg/b52wT37kt7
+
discord.gg/b52wT37kt7
Donations:
-
opencollective.com/kavita
+
opencollective.com/kavita
Source:
-
github.com/Kareadita/Kavita
+
github.com/Kareadita/Kavita
Feature Requests:
-
https://feats.kavitareader.com
+
https://feats.kavitareader.com
\ No newline at end of file diff --git a/UI/Web/src/app/admin/manage-users/manage-users.component.ts b/UI/Web/src/app/admin/manage-users/manage-users.component.ts index 2d4857d4c..7389927b0 100644 --- a/UI/Web/src/app/admin/manage-users/manage-users.component.ts +++ b/UI/Web/src/app/admin/manage-users/manage-users.component.ts @@ -133,7 +133,7 @@ export class ManageUsersComponent implements OnInit, OnDestroy { return; } await this.confirmService.alert( - 'Please click this link to confirm your email. You must confirm to be able to login. You may need to log out of the current account before clicking.
' + email + ''); + 'Please click this link to confirm your email. You must confirm to be able to login. You may need to log out of the current account before clicking.
' + email + ''); }); }); diff --git a/UI/Web/src/app/announcements/changelog/changelog.component.html b/UI/Web/src/app/announcements/changelog/changelog.component.html index 0a8b8a1b2..cb14c1a3d 100644 --- a/UI/Web/src/app/announcements/changelog/changelog.component.html +++ b/UI/Web/src/app/announcements/changelog/changelog.component.html @@ -13,8 +13,8 @@
- Installed - Download + Installed + Download
diff --git a/UI/Web/src/app/bookmark/bookmarks/bookmarks.component.html b/UI/Web/src/app/bookmark/bookmarks/bookmarks.component.html index 184b92302..943c73077 100644 --- a/UI/Web/src/app/bookmark/bookmarks/bookmarks.component.html +++ b/UI/Web/src/app/bookmark/bookmarks/bookmarks.component.html @@ -21,6 +21,6 @@ - There are no bookmarks. Try creating one . + There are no bookmarks. Try creating one . \ No newline at end of file diff --git a/UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.html b/UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.html index 0a8499812..aefdfced6 100644 --- a/UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.html +++ b/UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.html @@ -1,7 +1,7 @@

- Not sure what relationship to add? See our wiki for hints. + Not sure what relationship to add? See our wiki for hints.

diff --git a/UI/Web/src/app/collections/all-collections/all-collections.component.html b/UI/Web/src/app/collections/all-collections/all-collections.component.html index 9a6e4dea0..b64402ea3 100644 --- a/UI/Web/src/app/collections/all-collections/all-collections.component.html +++ b/UI/Web/src/app/collections/all-collections/all-collections.component.html @@ -16,6 +16,6 @@ - There are no collections. Try creating one . + There are no collections. Try creating one . \ No newline at end of file diff --git a/UI/Web/src/app/reading-list/reading-lists/reading-lists.component.html b/UI/Web/src/app/reading-list/reading-lists/reading-lists.component.html index d559b337d..543658b4e 100644 --- a/UI/Web/src/app/reading-list/reading-lists/reading-lists.component.html +++ b/UI/Web/src/app/reading-list/reading-lists/reading-lists.component.html @@ -19,6 +19,6 @@ - There are no reading lists. Try creating one . + There are no reading lists. Try creating one . diff --git a/UI/Web/src/app/shared/update-notification/update-notification-modal.component.html b/UI/Web/src/app/shared/update-notification/update-notification-modal.component.html index 290643b13..af2b2c1d8 100644 --- a/UI/Web/src/app/shared/update-notification/update-notification-modal.component.html +++ b/UI/Web/src/app/shared/update-notification/update-notification-modal.component.html @@ -11,5 +11,5 @@
- Download + Download
\ No newline at end of file