mirror of
https://github.com/ankitects/anki.git
synced 2025-09-18 14:02:21 -04:00
Switch card.original_position to a proto3 optional
This commit is contained in:
parent
99cb6c616e
commit
2d6dd0630f
3 changed files with 5 additions and 5 deletions
|
@ -41,7 +41,7 @@ message Card {
|
|||
sint32 original_due = 15;
|
||||
int64 original_deck_id = 16;
|
||||
uint32 flags = 17;
|
||||
generic.UInt32 original_position = 18;
|
||||
optional uint32 original_position = 18;
|
||||
}
|
||||
|
||||
message UpdateCardsRequest {
|
||||
|
|
|
@ -11,7 +11,7 @@ import anki.collection
|
|||
import anki.decks
|
||||
import anki.notes
|
||||
import anki.template
|
||||
from anki import cards_pb2, generic_pb2, hooks
|
||||
from anki import cards_pb2, hooks
|
||||
from anki._legacy import DeprecatedNamesMixin, deprecated
|
||||
from anki.consts import *
|
||||
from anki.models import NotetypeDict, TemplateDict
|
||||
|
@ -90,7 +90,7 @@ class Card(DeprecatedNamesMixin):
|
|||
self.odid = anki.decks.DeckId(card.original_deck_id)
|
||||
self.flags = card.flags
|
||||
self.original_position = (
|
||||
card.original_position.val if card.HasField("original_position") else None
|
||||
card.original_position if card.HasField("original_position") else None
|
||||
)
|
||||
|
||||
def _to_backend_card(self) -> cards_pb2.Card:
|
||||
|
@ -111,7 +111,7 @@ class Card(DeprecatedNamesMixin):
|
|||
original_due=self.odue,
|
||||
original_deck_id=self.odid,
|
||||
flags=self.flags,
|
||||
original_position=generic_pb2.UInt32(val=self.original_position)
|
||||
original_position=self.original_position
|
||||
if self.original_position is not None
|
||||
else None,
|
||||
)
|
||||
|
|
|
@ -86,7 +86,7 @@ impl TryFrom<pb::Card> for Card {
|
|||
original_due: c.original_due,
|
||||
original_deck_id: DeckId(c.original_deck_id),
|
||||
flags: c.flags as u8,
|
||||
original_position: c.original_position.map(|pos| pos.val),
|
||||
original_position: c.original_position,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue