mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
[DeckSync] Match server rows by identity and hash the whole deck
Sync keyed local files to server rows by path, but the server names a row
after the deck, not after the file, so any deck whose file name and deck name
differ uploaded again on every run. A second pass then brought the server copy
back as an extra local file.
- Match by the sidecar's row id, then guid, then content, and only then by the
server path, so renaming either side no longer duplicates a deck.
- Key the server tree by row id: the server allows several rows with the same
name in one folder, and keying by path silently dropped all but one.
- Stop discarding rows whose name contains '/' ("U/W Control"). They stay
matchable, and only the download file name is sanitised.
- Build the download path from the folder plus a sanitised row name, including
every folder segment, so a hostile server name cannot escape the deck folder.
- Download a colliding server row under a unique name and count it, instead of
skipping it without a trace.
- Hash the whole deck instead of the card hash: SHA-1 over the native deck
string covers name, printings, banner, tokens and sideboard plans. The client
and the server hash the exact bytes they exchange, so both agree.
Adds deck_content_hash_test for the client/server hashing invariant and for the
name-only change the card hash cannot see.
This commit is contained in:
parent
aa0ab333f6
commit
34e22df5ba
7 changed files with 215 additions and 81 deletions
|
|
@ -30,9 +30,11 @@ class ServerInfo_DeckStorage_Folder;
|
|||
* Each syncNow() run loads the profile sidecar, scans the deck folder, fetches
|
||||
* the server tree and mirrors both sides: unknown local decks upload, unknown
|
||||
* server decks download, and decks changed on both sides resolve newer-wins
|
||||
* (ties go to the server). Matching is path-based; a rename looks like a
|
||||
* delete plus an add. Before a download overwrites a locally modified file, the
|
||||
* local content is copied to a .sync-backup file next to it.
|
||||
* (ties go to the server). A local file is matched to its server row by the
|
||||
* sidecar's row id, then guid, then the server path, and finally by content, so
|
||||
* renaming either side does not duplicate a deck. Before a download overwrites a
|
||||
* locally modified file, the local content is copied to a .sync-backup file next
|
||||
* to it.
|
||||
*
|
||||
* Ownership: fire-and-forget per run, driven by PendingCommand round trips.
|
||||
* No watcher, no auto triggers, no conflict UI — those arrive in later layers.
|
||||
|
|
@ -81,6 +83,9 @@ private:
|
|||
struct ServerFile
|
||||
{
|
||||
int id = -1;
|
||||
QString path; ///< Server-side address: folder prefix plus row name.
|
||||
QString dir; ///< Folder prefix, empty in the root.
|
||||
QString name; ///< Row name exactly as the server stores it.
|
||||
QString guid;
|
||||
QString hash;
|
||||
qint64 lastModifiedSecs = 0;
|
||||
|
|
@ -94,7 +99,8 @@ private:
|
|||
struct UploadOp
|
||||
{
|
||||
QString relativePath;
|
||||
QString serverPath;
|
||||
QString serverPath; ///< Target address of a brand-new row.
|
||||
QString serverDir; ///< Folder that must exist before the upload.
|
||||
int deckId = -1;
|
||||
QString guid;
|
||||
};
|
||||
|
|
@ -112,7 +118,7 @@ private:
|
|||
[[nodiscard]] SyncSummary currentSummary() const;
|
||||
void collectServerFiles(const ServerInfo_DeckStorage_Folder &folder,
|
||||
const QString &prefix,
|
||||
QMap<QString, ServerFile> &files,
|
||||
QMap<int, ServerFile> &files,
|
||||
QSet<QString> &dirs);
|
||||
void processNext();
|
||||
void processNextUpload();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue