Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enh(adapters): Add git adapter #1520

Merged
merged 25 commits into from
May 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bdfe63e
enh(adapters): Add git adapter
marcelklehr Jan 13, 2024
054bc8c
fix(tests): Make ci work for git adapter
marcelklehr Jan 13, 2024
6466fd9
fix(git): Specify remote repo to use for fetch
marcelklehr Jan 13, 2024
4cc8a6e
fix(git)
marcelklehr Jan 13, 2024
b3e7645
fix(git adapter ci)
marcelklehr Jan 13, 2024
6f17048
fixes
marcelklehr Jan 13, 2024
d75adf1
fixes
marcelklehr Jan 13, 2024
9d3cec9
fixed
marcelklehr Jan 13, 2024
037b2c3
fixes
marcelklehr Jan 14, 2024
f11a5cf
fixes
marcelklehr Jan 14, 2024
def926d
fixes
marcelklehr Jan 14, 2024
d29a609
fix(logs): Remove excessive log entries
marcelklehr Jan 14, 2024
0ccc2dc
fix(tests): Clean up file system after each test
marcelklehr Jan 14, 2024
527c25f
fix(git): Clean up locks
marcelklehr Jan 14, 2024
c0376e3
fix(git): Clean up locks
marcelklehr Jan 14, 2024
34edb83
fix(git tests): Reset server repository manually
marcelklehr Jan 14, 2024
deb66b9
fix(git tests): Fix Git#clearServer
marcelklehr Jan 18, 2024
4ad329d
fix(git): Try to fix a few glitches
marcelklehr Jan 19, 2024
3ad0928
fix(git): Don't use remote repos, use URL directly
marcelklehr Jan 20, 2024
926c872
Revert "fix(git): Don't use remote repos, use URL directly"
marcelklehr Jan 20, 2024
d6357de
fix(git): Use a per-account fs
marcelklehr Jan 20, 2024
318b421
fix(git): Use memfs
marcelklehr Jan 20, 2024
22756e3
Revert "fix(git): Use memfs"
marcelklehr Jan 21, 2024
b658752
Merge branch 'develop' into enh/git-adapter
marcelklehr May 4, 2024
da64c3f
enh(ui): Add git adapter UI
marcelklehr Jan 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ jobs:
- webdav-html
- webdav-html-encrypted
- webdav-xbel-encrypted
- git-xbel
- git-html
- google-drive
- google-drive-encrypted
test-name:
Expand Down Expand Up @@ -232,6 +234,25 @@ jobs:

echo "Selenium Grid is up - executing tests"

- name: Setup git http server
run: |
mkdir __fixtures__
cd __fixtures__
git init --bare test.git -b main
npx git-http-server &
npx htpasswd -cb test.git/.htpasswd admin admin
if: matrix.floccus-adapter == 'git-xbel' || matrix.floccus-adapter == 'git-html'

- name: Run git adapter tests
working-directory: floccus
env:
SELENIUM_BROWSER: ${{ matrix.browsers }}
FLOCCUS_TEST: ${{matrix.floccus-adapter}} ${{ matrix.test-name}}
TEST_HOST: 172.17.0.1:8174
run: |
npm run test
if: matrix.floccus-adapter == 'git-xbel' || matrix.floccus-adapter == 'git-html'

- name: Run tests
working-directory: floccus
env:
Expand All @@ -243,6 +264,7 @@ jobs:
APP_VERSION: ${{ matrix.app-version }}
run: |
npm run test
if: matrix.floccus-adapter != 'git-xbel' && matrix.floccus-adapter != 'git-html'

summary:
runs-on: ubuntu-latest
Expand Down
15 changes: 15 additions & 0 deletions _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@
"DescriptionBookmarksfilegoogle": {
"message": "the file name of the bookmarks file that will reside in your Google Drive (make sure this name is unique in your Drive)"
},
"DescriptionBookmarksfilegit": {
"message": "a path to the bookmarks file relative to your Git repository root (all folders in the path must already exist). e.g. personal_stuff/bookmarks.xbel"
},
"LabelServerfolder": {
"message": "Server target"
},
Expand Down Expand Up @@ -689,5 +692,17 @@
},
"DescriptionSyncscheduled": {
"message": "This profile will be synced soon. We're either waiting for other devices of yours, or other profiles on this device, to finish syncing."
},
"LabelAdaptergit": {
"message": "Git over HTTPS"
},
"DescriptionAdaptergit": {
"message": "The Git option syncs your bookmarks by storing them in a file in the provided Git repository. There is no accompanying web UI for this option, but you can use it with any Git hosting server, like Github, Gitlab, Gitea, etc. It can sync http, ftp, data, file and javascript bookmarks."
},
"LabelGiturl": {
"message": "Repository URL using HTTP"
},
"LabelGitbranch": {
"message": "Git branch"
}
}
Loading
Loading