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.

Sign up for GitHub

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

Jump to bottom

feat: add cross device sync #40

Closed
wants to merge 208 commits into from
Closed

feat: add cross device sync #40

wants to merge 208 commits into from

Conversation

kaiserbh
Copy link
Contributor

ref: GitHub - Tachiyomi Pull Request #9790

Currently, there are two services available: Syncyomi, which is self-hosted, and Google Drive.

Once merged you will need to create OAuth 2.0 Client IDs in google console then replace the app/src/main/assets/client_secrets.json

image

Once all of that is done just need to set the app to publish instead of testing that way everyone can access it otherwise limited to 100 users we add for testing, we don't need to submit the app for approval since we are not using sensitive scopes. More info here

OAuth Consent Screen

image

Scopes

image

image
image
image
image
image

AriaMoradi and others added 30 commits July 6, 2023 14:08
@AriaMoradi @kaiserbh
Split sync feature part 1
84eb68e 
Co-authored-by: KaiserBh <[email protected]>
@AriaMoradi
rename self hosted to SyncYomi
bb89e9f
@AriaMoradi
apply review pointers
7331819
@AriaMoradi
fix remember stuff
75b9871
@kaiserbh @AriaMoradi
fix: fix not restoring categories etc.
877bf72
@kaiserbh @AriaMoradi
feat: syncyomi uses same internal logic as well now.
878f709 
TODO: refactor them as the code is duplicated for now.
@AriaMoradi
refactor SyncYomiService
a2a1201
@AriaMoradi
liner run
6d9f74d
@AriaMoradi
merge backup and sync screens
a1e9d34
@AriaMoradi
rename SettingsBackupScreen
425260b
@AriaMoradi
fix labels
5e02eda
@AriaMoradi
Merge branch 'master' into sync-part-1
1af1ce9
@kaiserbh
refactor: don't need device id.
a036e49
@kaiserbh
refactor: removed no used anymore.
a512508
@kaiserbh
refactor: removed no used anymore.
93f3dd3
@kaiserbh
refactor: removed no used anymore.
4db4dd2
@kaiserbh
refactor: use Uri instead of syncHolder
c81400c
@kaiserbh
Merge branch 'master' into sync-part-1
92b1025
@kaiserbh
Merge branch 'master' into sync-part-1
abe6920
@kaiserbh
fix:conflict.
70452ac 
Signed-off-by: KaiserBh <[email protected]>
@kaiserbh
fix:conflict.
536c5fa 
Signed-off-by: KaiserBh <[email protected]>
@kaiserbh
feat: added google drive service.
645505e 
Signed-off-by: KaiserBh <[email protected]>
@kaiserbh
refactor: refactor merging logic tidy up.
96a767a 
As we fixed the issue with removing favorites we don't the extra stuff.

Signed-off-by: KaiserBh <[email protected]>
@kaiserbh
bugfix: Since syncing is cross-device we need to take read status fro…
fdc85bd 
…m backup.

I fixed this before but I believe it slipped past while refactoring and splitting into smaller PR, This fixes the unread chapter so if a device have unread chapters or user marked it as unread it should restore it properly now.

Signed-off-by: KaiserBh <[email protected]>
@kaiserbh
Merge branch 'master' into sync-part-final
c4dc2c8
@kaiserbh
Merge branch 'master' into sync-part-final
bedfbf3
@kaiserbh
Merge branch 'master' into sync-part-final
1fcfd27
@undefiened
Added exceptions in Google Sync process so that it fails correctly an…
1993928 
…d moved the redirect url to a constant
@kaiserbh
Merge branch 'master' into sync-part-final
d229010
@undefiened @kaiserbh
Using a proper constant instead of val
569db9e 
Co-authored-by: KaiserBh <[email protected]>
@kaiserbh kaiserbh mentioned this pull request Jan 16, 2024
Merged
@AntsyLich
Copy link
Member

Initially I'll do reviews on small independent sections and ask you to make separate pr for them e.g. the db change you did which you can go ahead and make a pr for

@RatCornu RatCornu mentioned this pull request Jan 18, 2024
Open
@kaiserbh
Copy link
Contributor Author

Initially I'll do reviews on small independent sections and ask you to make separate pr for them e.g. the db change you did which you can go ahead and make a pr for

#113

AntsyLich
AntsyLich requested changes Jan 19, 2024
View reviewed changes
Copy link
Member

@AntsyLich AntsyLich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make a separate PR for this file and also maybe prefix all of them with __SYNC__?

domain/src/main/java/tachiyomi/domain/sync/SyncPreferences.kt Outdated Show resolved Hide resolved
domain/src/main/java/tachiyomi/domain/sync/SyncPreferences.kt Outdated Show resolved Hide resolved
domain/src/main/java/tachiyomi/domain/sync/SyncPreferences.kt Outdated Show resolved Hide resolved
domain/src/main/java/tachiyomi/domain/sync/SyncPreferences.kt Outdated Show resolved Hide resolved
@kaiserbh
Copy link
Contributor Author

Make a separate PR for this file and also maybe prefix all of them with __SYNC__?

#149 Let me know on that branch if I need to change anything else.

@kaiserbh
Merge branch 'main' of https://github.com/mihonapp/mihon into feat/ad…
8680565 
…d-cross-device-sync
@kaiserbh
refactor: add more error guard for gdrive.
624d65d 
Also changed it to be app specific, we don't want them to use sync data from SY or other forks as some of the model and backup is different. So if people using other forks they should use the same data and not mismatch.
@kaiserbh
chore: update to match upstream and fix conflict.
c262c7a
@kaiserbh
refactor: update imports.
842c7d3
@LightDestory LightDestory mentioned this pull request Feb 3, 2024
Closed
@LightDestory
Copy link

Build fails?

@kaiserbh
Copy link
Contributor Author

kaiserbh commented Feb 5, 2024

Build fails?

Hmm the build is okay it's just detekt errors, which is just too strict at the moment, to name a few:

Class 'SyncPreferences' with '13' functions detected. Defined threshold inside classes is set to '11' [TooManyFunctions]

/home/runner/work/mihon/mihon/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt:371:43: This expression contains a magic number. Consider defining it to a well named constant. [MagicNumber]

/home/runner/work/mihon/mihon/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt:372:44: This expression contains a magic number. Consider defining it to a well named constant. [MagicNumber]

@kaiserbh
refactor: add breaks and max retries.
574887a 
I think we were reaching deadlock or infinite loop causing the sync to go forever.
@kaiserbh kaiserbh requested a review from AntsyLich February 7, 2024 00:28
@kaiserbh
Merge branch 'main' of https://github.com/mihonapp/mihon into feat/ad…
57e6bf1 
…d-cross-device-sync
@kaiserbh
feat: db changes to accommodate new syncing logic.
157a996 
Using timestamp to sync is a bit skewed due to system clock etc and therefore there was a lot of issues with it such as removing a manga that shouldn't have been removed. Marking chapters as unread even though it was marked as a read. Hopefully by using versioning system it should eliminate those issues.
@kaiserbh
refactor: Use the new powerful versioning system.
7c85f50
@kaiserbh
chore: detekt auto fix.
ed2b7df
@kaiserbh kaiserbh closed this Feb 24, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@AntsyLich AntsyLich Awaiting requested review from AntsyLich

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kaiserbh @AntsyLich @LightDestory @AriaMoradi @undefiened