[PR #1919] [MERGED] test(sync): Making changes to the tree while syncing should not cause trouble #1958

Closed
opened 2026-02-25 23:31:21 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/floccusaddon/floccus/pull/1919
Author: @marcelklehr
Created: 4/21/2025
Status: Merged
Merged: 4/26/2025
Merged by: @marcelklehr

Base: developHead: fix/changes-while-syncing


📝 Commits (7)

  • b41b934 test(sync): Making changes to the tree while syncing should not cause trouble
  • 18be6dd refactor(CachingTreeWrapper): Allow changes to the live tree without disturbing the cache
  • 4f05364 refactor(isUsingBrowserTabs): Expose Resource#isUsingBrowserTabs
  • 7351d1b perf(BrowserAccount): Don't use bookmarks.getTree() if avoidable
  • d5db3bf refactor(Folder#clone): Make Folder#clone use prototype inheritance
  • 25062d5 fix(Bookmark#clone): Obey withHash argument
  • 6245264 perf(GDrive): Speed up "no changes" code path

📊 Changes

19 files changed (+451 additions, -149 deletions)

View changed files

📝 src/lib/Account.ts (+3 -3)
src/lib/CacheTree.ts (+26 -0)
src/lib/CachingTreeWrapper.ts (+77 -0)
📝 src/lib/Diff.ts (+6 -6)
📝 src/lib/LocalTabs.ts (+4 -0)
📝 src/lib/Scanner.ts (+2 -2)
📝 src/lib/Tree.ts (+82 -8)
📝 src/lib/adapters/Caching.ts (+4 -3)
📝 src/lib/adapters/Git.ts (+1 -1)
📝 src/lib/adapters/GoogleDrive.ts (+12 -8)
📝 src/lib/adapters/NextcloudBookmarks.ts (+7 -7)
📝 src/lib/adapters/WebDav.ts (+1 -1)
📝 src/lib/browser/BrowserAccount.ts (+3 -3)
📝 src/lib/interfaces/Resource.ts (+6 -1)
📝 src/lib/native/NativeTree.ts (+1 -1)
📝 src/lib/strategies/Default.ts (+64 -98)
📝 src/lib/strategies/Merge.ts (+2 -2)
📝 src/lib/strategies/Unidirectional.ts (+1 -1)
📝 src/test/test.js (+149 -4)

📄 Description

see #1857


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/floccusaddon/floccus/pull/1919 **Author:** [@marcelklehr](https://github.com/marcelklehr) **Created:** 4/21/2025 **Status:** ✅ Merged **Merged:** 4/26/2025 **Merged by:** [@marcelklehr](https://github.com/marcelklehr) **Base:** `develop` ← **Head:** `fix/changes-while-syncing` --- ### 📝 Commits (7) - [`b41b934`](https://github.com/floccusaddon/floccus/commit/b41b934a60def56a212a2e199a54e5205221d186) test(sync): Making changes to the tree while syncing should not cause trouble - [`18be6dd`](https://github.com/floccusaddon/floccus/commit/18be6dd7e2aaebdf6a686069d2fd370c157b8a52) refactor(CachingTreeWrapper): Allow changes to the live tree without disturbing the cache - [`4f05364`](https://github.com/floccusaddon/floccus/commit/4f05364485a9f68b0afbb97ca6eb0bd1af3b9226) refactor(isUsingBrowserTabs): Expose Resource#isUsingBrowserTabs - [`7351d1b`](https://github.com/floccusaddon/floccus/commit/7351d1ba28334f51726bb98a47e77bf5ede47619) perf(BrowserAccount): Don't use bookmarks.getTree() if avoidable - [`d5db3bf`](https://github.com/floccusaddon/floccus/commit/d5db3bfa2586ca177881d44509180c0156bb0590) refactor(Folder#clone): Make Folder#clone use prototype inheritance - [`25062d5`](https://github.com/floccusaddon/floccus/commit/25062d55fa637ce949d95463334ff2783b6a4bbb) fix(Bookmark#clone): Obey withHash argument - [`6245264`](https://github.com/floccusaddon/floccus/commit/62452643adf7372e61831b9d8e343cc36e92b3b9) perf(GDrive): Speed up "no changes" code path ### 📊 Changes **19 files changed** (+451 additions, -149 deletions) <details> <summary>View changed files</summary> 📝 `src/lib/Account.ts` (+3 -3) ➕ `src/lib/CacheTree.ts` (+26 -0) ➕ `src/lib/CachingTreeWrapper.ts` (+77 -0) 📝 `src/lib/Diff.ts` (+6 -6) 📝 `src/lib/LocalTabs.ts` (+4 -0) 📝 `src/lib/Scanner.ts` (+2 -2) 📝 `src/lib/Tree.ts` (+82 -8) 📝 `src/lib/adapters/Caching.ts` (+4 -3) 📝 `src/lib/adapters/Git.ts` (+1 -1) 📝 `src/lib/adapters/GoogleDrive.ts` (+12 -8) 📝 `src/lib/adapters/NextcloudBookmarks.ts` (+7 -7) 📝 `src/lib/adapters/WebDav.ts` (+1 -1) 📝 `src/lib/browser/BrowserAccount.ts` (+3 -3) 📝 `src/lib/interfaces/Resource.ts` (+6 -1) 📝 `src/lib/native/NativeTree.ts` (+1 -1) 📝 `src/lib/strategies/Default.ts` (+64 -98) 📝 `src/lib/strategies/Merge.ts` (+2 -2) 📝 `src/lib/strategies/Unidirectional.ts` (+1 -1) 📝 `src/test/test.js` (+149 -4) </details> ### 📄 Description see #1857 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-25 23:31:21 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/floccus#1958
No description provided.