GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-21 07:22:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

use '<=' when merging UnchunkableChanges

Browse source 
Prevents current tests from failing when testing locally, due the current
second not changing between syncs.
This commit is contained in:
Damien Elmes 2021-01-06 21:55:54 +10:00
parent 9225c804db
commit f6c1a91674
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rslib/src/sync/mod.rs
View file

@ -831,7 +831,7 @@ impl Collection {
for nt in notetypes { for nt in notetypes {
let nt: NoteType = nt.into(); let nt: NoteType = nt.into();
let proceed = if let Some(existing_nt) = self.storage.get_notetype(nt.id)? { let proceed = if let Some(existing_nt) = self.storage.get_notetype(nt.id)? {
if existing_nt.mtime_secs < nt.mtime_secs { if existing_nt.mtime_secs <= nt.mtime_secs {
if (existing_nt.fields.len() != nt.fields.len()) if (existing_nt.fields.len() != nt.fields.len())
|| (existing_nt.templates.len() != nt.templates.len()) || (existing_nt.templates.len() != nt.templates.len())
{ {
@ -858,7 +858,7 @@ impl Collection {
fn merge_decks(&mut self, decks: Vec<DeckSchema11>) -> Result<()> { fn merge_decks(&mut self, decks: Vec<DeckSchema11>) -> Result<()> {
for deck in decks { for deck in decks {
let proceed = if let Some(existing_deck) = self.storage.get_deck(deck.id())? { let proceed = if let Some(existing_deck) = self.storage.get_deck(deck.id())? {
existing_deck.mtime_secs < deck.common().mtime existing_deck.mtime_secs <= deck.common().mtime
} else { } else {
true true
}; };
@ -874,7 +874,7 @@ impl Collection {
fn merge_deck_config(&self, dconf: Vec<DeckConfSchema11>) -> Result<()> { fn merge_deck_config(&self, dconf: Vec<DeckConfSchema11>) -> Result<()> {
for conf in dconf { for conf in dconf {
let proceed = if let Some(existing_conf) = self.storage.get_deck_config(conf.id)? { let proceed = if let Some(existing_conf) = self.storage.get_deck_config(conf.id)? {
existing_conf.mtime_secs < conf.mtime existing_conf.mtime_secs <= conf.mtime
} else { } else {
true true
}; };