1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236
|
/*
Copyright (©) 2003-2025 Teus Benschop.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <sendreceive/sendreceive.h>
#include <filter/url.h>
#include <filter/roles.h>
#include <filter/git.h>
#include <database/config/general.h>
#include <database/config/bible.h>
#include <database/logs.h>
#include <webserver/request.h>
#include <locale/translate.h>
std::string sendreceive_tag ()
{
return "Git repository: ";
}
void sendreceive_sendreceive ([[maybe_unused]] std::string bible)
{
#ifdef HAVE_CLOUD
// Check on Bible.
if (bible.empty ()) {
Database_Logs::log (sendreceive_tag () + "No Bible to send and receive", roles::translator);
return;
}
// The git repository directory for this object.
std::string directory = filter_git_directory (bible);
bool read_from_git = database::config::bible::get_read_from_git (bible);
// Check that the repository directory is there.
if (!file_or_dir_exists (directory)) {
std::string msg = "Cannot send ";
if (read_from_git) msg.append ("and receive ");
msg.append ("because the local git repository was not found.");
Database_Logs::log (sendreceive_tag () + msg);
return;
}
// Log what this is going to do.
if (read_from_git) {
Database_Logs::log (sendreceive_tag () + sendreceive_sendreceive_sendreceive_text () + bible, roles::translator);
} else {
Database_Logs::log (sendreceive_tag () + sendreceive_sendreceive_send_text () + bible, roles::translator);
}
Webserver_Request webserver_request;
bool success = true;
std::string error;
// Configure the repository to prevent errors, just to be sure.
filter_git_config (directory);
// Separate commits for each user to the local git repository.
filter_git_sync_modifications_to_git (bible, directory);
// Synchronize the Bible from the database to the local git repository.
filter_git_sync_bible_to_git (bible, directory);
// Log the status of the repository: "git status".
// Set a flag indicating whether there are local changes available.
bool localchanges = false;
if (success) {
std::vector <std::string> lines = filter_git_status (directory, true);
for (auto & line : lines) {
Passage passage = filter_git_get_passage (line);
if (passage.m_book) {
Database_Logs::log (sendreceive_tag () + line, roles::translator);
localchanges = true;
}
}
}
// In case of local changes, add/remove the updated data to/from the index.
if (success && localchanges) {
success = filter_git_add_remove_all (directory, error);
if (!success) {
Database_Logs::log (sendreceive_tag () + error, roles::translator);
}
}
// In case of local changes, commit the index to the repository.
if (success && localchanges) {
std::vector <std::string> messages;
success = filter_git_commit (directory, "", translate ("Changes made in Bibledit"), messages, error);
if (!success) {
Database_Logs::log (sendreceive_tag () + error, roles::translator);
}
}
// Pull changes from the remote repository.
// Record the pull messages to see which chapter has changes.
// Record the conflicting passages, to see which chapters to update.
std::vector <std::string> pull_messages;
std::vector <std::string> paths_resolved_conflicts;
if (success) {
std::vector <std::string> logs;
bool conflict = false;
success = filter_git_pull (directory, pull_messages);
for (auto & line : pull_messages) {
logs.push_back (line);
if (line.find ("CONFLICT") != std::string::npos) conflict = true;
if (line.find ("MERGE_HEAD") != std::string::npos) conflict = true;
}
if (!success || conflict || logs.size () > 1) {
for (auto & log : logs) {
if (log.find ("Updating") == 0) continue;
if (log.find ("Fast-forward") == 0) continue;
if (log.find ("file changed") != std::string::npos) continue;
if (log.find ("From ") == 0) continue;
if (log.find ("origin/master") != std::string::npos) continue;
Database_Logs::log (sendreceive_tag () + "receive: " + log, roles::translator);
}
}
if (conflict) {
Database_Logs::log (sendreceive_tag () + translate ("Bibledit will resolve the conflicts"), roles::translator);
filter_git_resolve_conflicts (directory, paths_resolved_conflicts, error);
if (!error.empty ()) Database_Logs::log (error, roles::translator);
std::vector <std::string> messages;
std::string tmp_error;
std::string no_user {};
filter_git_commit (directory, no_user, translate ("Bibledit resolved the conflicts"), messages, tmp_error);
for (auto & msg : messages) Database_Logs::log (sendreceive_tag () + "conflict resolution: " + msg, roles::translator);
// The above "git pull" operation failed due to the conflict(s).
// Since the conflicts have now been resolved, set "success" to true again.
// This enables the subsequent git operations to run successfully.
success = true;
}
}
// Push any local changes to the remote repository.
// Or changes due to automatic merge and/or conflict resolution.
if (success) {
std::vector <std::string> messages;
success = filter_git_push (directory, messages);
if (!success || messages.size() > 1) {
for (auto & msg : messages) Database_Logs::log (sendreceive_tag () + "send: " + msg, roles::translator);
}
}
// Record the changes from the collaborators into the Bible database.
// The changes will be taken from the standard "git pull" messages,
// plus the paths of the files that have resolved conflicts.
// This is normally off due to some race conditions that came up now and then,
// where a change made by a user was committed was reverted by the system.
// So having it off by default is the safest thing one can do.
if (database::config::bible::get_read_from_git (bible)) {
if (success) {
pull_messages.insert (pull_messages.end (), paths_resolved_conflicts.begin (), paths_resolved_conflicts.end());
for (auto & pull_message : pull_messages) {
Passage passage = filter_git_get_passage (pull_message);
if (passage.m_book) {
int book = passage.m_book;
int chapter = passage.m_chapter;
filter_git_sync_git_chapter_to_bible (directory, bible, book, chapter);
}
}
}
}
// Done.
if (!success) {
std::string msg = "Failure during sending";
if (read_from_git) msg.append ("and receiving");
Database_Logs::log (sendreceive_tag () + msg, roles::translator);
}
{
std::string msg;
if (read_from_git) {
msg = sendreceive_sendreceive_sendreceive_ready_text ();
} else {
msg = sendreceive_sendreceive_send_ready_text ();
}
Database_Logs::log (sendreceive_tag () + msg + " " + bible, roles::translator);
}
#endif
}
std::string sendreceive_sendreceive_sendreceive_text ()
{
return "Send/receive Bible ";
}
std::string sendreceive_sendreceive_send_text ()
{
return "Send Bible ";
}
std::string sendreceive_sendreceive_sendreceive_ready_text ()
{
return "Ready sending and receiving Bible";
}
std::string sendreceive_sendreceive_send_ready_text ()
{
return "Ready sending Bible";
}
|