f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 22:52:40 +00:00
Code Wiki Activity

Merge pull request #4310 from dbolack-ab/2025-06-09_Debug

Browse Source 
Add Patch wrapper/unwrapper for saves
This commit is contained in:
Trevor Buckner
2025-07-09 18:42:23 -04:00
committed by GitHub
parent 8f058d56f2 0f4157d084
commit 1d92b98568
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -256,12 +256,12 @@ const EditPage = createClass({
await updateHistory(this.state.brew).catch(console.error);
await versionHistoryGarbageCollection().catch(console.error);
const preSaveSnapshot = { ...this.state.brew }
const preSaveSnapshot = { ...this.state.brew };
//Prepare content to send to server
const brew = { ...this.state.brew };
brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
brew.patches = makePatches(this.savedBrew.text, brew.text);
brew.patches = stringifyPatches(makePatches(this.savedBrew.text, brew.text));
brew.hash = await md5(this.savedBrew.text);
brew.text = undefined;
brew.textBin = undefined;

4
server/homebrew.api.js
View File

@@ -352,11 +352,11 @@ const api = {
res.setHeader('Content-Type', 'application/json');
return res.status(409).send(JSON.stringify({ message: `The server copy is out of sync with the saved brew. Please save your changes elsewhere, refresh, and try again.` }));
}
let brew = _.assign(brewFromServer, brewFromClient);
brew.title = brew.title.trim();
brew.description = brew.description.trim() || '';
brew.text = applyPatches(brewFromClient.patches, brewFromServer.text)[0];
brew.text = applyPatches(parsePatch(brewFromClient.patches), brewFromServer.text)[0];
brew.text = api.mergeBrewText(brew);
const googleId = brew.googleId;