LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

improve sync

Browse source
This commit is contained in:
zeppi 2021-11-29 22:26:12 -05:00 • committed by jessopb
parent 7afe2c58b0
commit d50a74327f
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ui/redux/actions/app.js
View file

@ -632,9 +632,8 @@ export function doGetAndPopulatePreferences() {
export function doHandleSyncComplete(error, hasNewData) { export function doHandleSyncComplete(error, hasNewData) {
return (dispatch) => { return (dispatch) => {
if (!error) { if (!error) {
dispatch(doGetAndPopulatePreferences());
if (hasNewData) { if (hasNewData) {
dispatch(doGetAndPopulatePreferences());
// we just got sync data, better update our channels // we just got sync data, better update our channels
dispatch(doFetchChannelListMine()); dispatch(doFetchChannelListMine());
} }

13
ui/redux/actions/sync.js
View file

@ -4,7 +4,12 @@ import * as SETTINGS from 'constants/settings';
import { Lbryio } from 'lbryinc'; import { Lbryio } from 'lbryinc';
import Lbry from 'lbry'; import Lbry from 'lbry';
import { doWalletEncrypt, doWalletDecrypt } from 'redux/actions/wallet'; import { doWalletEncrypt, doWalletDecrypt } from 'redux/actions/wallet';
import { selectGetSyncIsPending, selectSetSyncIsPending, selectSyncIsLocked } from 'redux/selectors/sync'; import {
selectSyncHash,
selectGetSyncIsPending,
selectSetSyncIsPending,
selectSyncIsLocked,
} from 'redux/selectors/sync';
import { makeSelectClientSetting } from 'redux/selectors/settings'; import { makeSelectClientSetting } from 'redux/selectors/settings';
import { getSavedPassword } from 'util/saved-passwords'; import { getSavedPassword } from 'util/saved-passwords';
import { doAnalyticsTagSync, doHandleSyncComplete } from 'redux/actions/app'; import { doAnalyticsTagSync, doHandleSyncComplete } from 'redux/actions/app';
@ -154,7 +159,9 @@ export function doGetSync(passedPassword?: string, callback?: (any, ?boolean) =>
} }
} }
return (dispatch: Dispatch) => { return (dispatch: Dispatch, getState: GetState) => {
const state = getState();
const localHash = selectSyncHash(state);
dispatch({ dispatch({
type: ACTIONS.GET_SYNC_STARTED, type: ACTIONS.GET_SYNC_STARTED,
}); });
@ -182,7 +189,7 @@ export function doGetSync(passedPassword?: string, callback?: (any, ?boolean) =>
const syncHash = response.hash; const syncHash = response.hash;
data.syncHash = syncHash; data.syncHash = syncHash;
data.syncData = response.data; data.syncData = response.data;
data.changed = response.changed; data.changed = response.changed || syncHash !== localHash;
data.hasSyncedWallet = true; data.hasSyncedWallet = true;
if (response.changed) { if (response.changed) {