relikd/abcddb2vcard
1
0
Fork 0
Code Pull Requests Releases Activity

fix: operation & between None and int

Browse Source
This commit is contained in:
relikd
2023-02-21 17:01:54 +01:00
parent 285d84e1a1
commit 768b9c09fc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ABCDDB.py
View File

@@ -294,7 +294,7 @@ class Record:
@staticmethod @staticmethod
def initEmpty(id: int) -> 'Record': def initEmpty(id: int) -> 'Record':
return Record([id] + [None] * 16 + [0]) return Record([id] + [None] * 17)
def __init__(self, row: List[Any]) -> None: def __init__(self, row: List[Any]) -> None:
self.id = row[0] # type: int self.id = row[0] # type: int
@@ -321,7 +321,8 @@ class Record:
self.urls = [] # type: List[URL] self.urls = [] # type: List[URL]
self.service = [] # type: List[Service] self.service = [] # type: List[Service]
self.image = row[16] # type: Optional[bytes] self.image = row[16] # type: Optional[bytes]
self.iscompany = row[17] & 1 # type: bool display_flags = row[17] or 0 # type: int
self.iscompany = bool(display_flags & 1) # type: bool
def __repr__(self) -> str: def __repr__(self) -> str:
return self.makeVCard() return self.makeVCard()
@@ -415,7 +416,7 @@ class Record:
class ABCDDB: class ABCDDB:
@staticmethod @staticmethod
def load(db_path: str) -> Iterable['Record']: def load(db_path: str) -> List['Record']:
db = sqlite3.connect(db_path) db = sqlite3.connect(db_path)
cur = db.cursor() cur = db.cursor()
@@ -452,4 +453,4 @@ class ABCDDB:
_getOrMake(service).service.append(service) _getOrMake(service).service.append(service)
db.close() db.close()
return records.values() return list(records.values())