Refresh Bibledit kernel

bibledit/cloud#965

Author: teusbenschop

package.iss

@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{C414BE13-5F10-48B7-AF92-9E4E7265D720}
 AppName=Bibledit
-AppVersion=5.1.019
+AppVersion=5.1.020
 AppPublisher=Teus Benschop
 AppPublisherURL=https://bibledit.org
 AppSupportURL=https://bibledit.org
@@ -19,7 +19,7 @@ DisableDirPage=yes
 DefaultGroupName=Bibledit
 LicenseFile=COPYING
 ; OutputDir=C:\bibledit-windows-packager
-OutputBaseFilename=bibledit-5.1.019
+OutputBaseFilename=bibledit-5.1.020
 Compression=lzma
 SolidCompression=yes
 ; Create a log file in the user's TEMP directory detailing file installation and [Run] actions taken during the installation process.

server/bb/import.cpp

@@ -87,7 +87,7 @@ std::string bible_import (Webserver_Request& webserver_request)
         filter_url_file_put_contents (datafile, data);
         success_message = translate("Import has started.");
         view.set_variable ("journal", journal_logic_see_journal_for_progress ());
-        tasks_logic_queue (IMPORTBIBLE, { datafile, bible, std::to_string (book), std::to_string (chapter) });
+        tasks_logic_queue (task::import_bible, { datafile, bible, std::to_string (book), std::to_string (chapter) });
       } else {
         error_message = translate("Please supply valid Unicode UTF-8 text.");
       }
@@ -106,7 +106,7 @@ std::string bible_import (Webserver_Request& webserver_request)
       filter_url_file_put_contents (datafile, data);
       success_message = translate("Import has started.");
       view.set_variable ("journal", journal_logic_see_journal_for_progress ());
-      tasks_logic_queue (IMPORTBIBLE, { datafile, bible, std::to_string (book), std::to_string (chapter) });
+      tasks_logic_queue (task::import_bible, { datafile, bible, std::to_string (book), std::to_string (chapter) });
     } else {
       error_message = translate ("Nothing was uploaded");
     }

server/bb/settings.cpp

@@ -191,7 +191,7 @@ std::string bible_settings (Webserver_Request& webserver_request)
   const std::string resource = webserver_request.post["add"];
   if (!resource.empty ()) {
     if (write_access) {
-      tasks_logic_queue (IMPORTRESOURCE, { bible, resource });
+      tasks_logic_queue (task::import_resource, { bible, resource });
       success_message = translate ("The resource will be imported into the Bible.") + " " + translate ("The journal shows the progress.");
     }
   }

server/bootstrap/bootstrap.cpp

@@ -192,7 +192,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <filter/date.h>
 #include <filter/string.h>
 #include <journal/logic.h>
-#include <nmt/index.h>
 #include <editor/id.h>
 #include <editor/style.h>
 #include <edit/update.h>
@@ -1130,11 +1129,6 @@ void bootstrap_index (Webserver_Request& webserver_request)
     return;
   }
 
-  if ((url == nmt_index_url ()) && browser_request_security_okay (webserver_request) && nmt_index_acl (webserver_request)) {
-    webserver_request.reply = nmt_index (webserver_request);
-    return;
-  }
-
   if ((url == edit_update_url ()) && browser_request_security_okay (webserver_request) && edit_update_acl (webserver_request)) {
     webserver_request.reply = edit_update (webserver_request);
     return;

server/changes/logic.cpp

@@ -44,7 +44,7 @@
 
 void changes_logic_start ()
 {
-  tasks_logic_queue (GENERATECHANGES);
+  tasks_logic_queue (task::generate_changes);
 }
 
 

server/changes/manage.cpp

@@ -72,7 +72,7 @@ std::string changes_manage (Webserver_Request& webserver_request)
     const int jobId = database_jobs.get_new_id ();
     database_jobs.set_level (jobId, Filter_Roles::manager ());
     database_jobs.set_start (jobId, translate ("Clearing change notifications."));
-    tasks_logic_queue (DELETECHANGES, {std::to_string (jobId), username});
+    tasks_logic_queue (task::delete_changes, {std::to_string (jobId), username});
     redirect_browser (webserver_request, jobs_index_url () + "?id=" + std::to_string (jobId));
     return std::string();
   }

server/changes/modifications.cpp

@@ -137,8 +137,21 @@ void changes_process_identifiers (Webserver_Request& webserver_request,
 }
 
 
+// This mutex ensures that only one single process can generate the changes modifications at any time.
+std::timed_mutex mutex;
+
+
 void changes_modifications ()
 {
+  // Ensure only one process at any time generates the changes,
+  // even if multiple order to generate then were given by the user.
+  std::unique_lock<std::timed_mutex> lock (mutex, std::defer_lock);
+  if (!lock.try_lock_for(std::chrono::milliseconds(200))) {
+    Database_Logs::log ("Change notifications: Skipping just now because another process is already generating them", Filter_Roles::translator ());
+    return;
+  }
+  
+
   Database_Logs::log ("Change notifications: Generating", Filter_Roles::translator ());
 
 
@@ -192,7 +205,6 @@ void changes_modifications ()
   // At the same time, produce change statistics per user.
 
   std::vector <std::string> users = database::modifications::getUserUsernames ();
-  if (!users.empty ()) Database_Logs::log ("Change notifications: Per user", Filter_Roles::translator ());
   for (const auto& user : users) {
 
     // Total changes made by this user.
@@ -213,7 +225,9 @@ void changes_modifications ()
         // Go through the chapters in that book.
         const std::vector <int> chapters = database::modifications::getUserChapters (user, bible, book);
         for (auto chapter : chapters) {
-          
+
+          Database_Logs::log ("Change notifications: User " + user + " - Bible " + bible + " " + filter_passage_display (book, chapter, ""), Filter_Roles::translator ());
+
           // Get the sets of identifiers for that chapter, and set some variables.
           const std::vector <database::modifications::id_bundle> IdSets = database::modifications::getUserIdentifiers (user, bible, book, chapter);
           int reference_new_id {0};

server/checks/logic.cpp

@@ -35,5 +35,5 @@ void checks_logic_start_all ()
 
 void checks_logic_start (const std::string& bible)
 {
-  tasks_logic_queue (CHECKBIBLE, {bible});
+  tasks_logic_queue (task::check_bible, {bible});
 }

server/checks/run.cpp

@@ -256,7 +256,7 @@ void checks_run (std::string bible)
   }
 
 
-  // Add a link to the online checking results. Todo test this.
+  // Add a link to the online checking results.
   if (!emailBody.empty ()) {
     const std::string siteUrl = config::logic::site_url (webserver_request);
     std::stringstream body1 {};

server/collaboration/settings.cpp

@@ -71,7 +71,7 @@ std::string collaboration_settings (Webserver_Request& webserver_request)
       int jobId = database_jobs.get_new_id ();
       database_jobs.set_level (jobId, Filter_Roles::admin ());
       database_jobs.set_start (jobId, collaboration_link_header ());
-      tasks_logic_queue (LINKGITREPOSITORY, {object, std::to_string (jobId), source});
+      tasks_logic_queue (task::link_git_repository, {object, std::to_string (jobId), source});
       redirect_browser (webserver_request, jobs_index_url () + "?id=" + std::to_string (jobId));
       return std::string();
     }