ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-07 19:03:23 +03:00
Code Issues Projects Releases Wiki Activity

Fixed current mypy complaints.

Browse Source 
There are still *missing* type annotations.
This commit is contained in:
Athanasius 2021-03-10 14:46:40 +00:00
parent 1c82605d9f
commit 20772e7daf
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
monitor.py
View File

@ -9,9 +9,9 @@ from os import SEEK_END, SEEK_SET, listdir
from os.path import basename, expanduser, isdir, join from os.path import basename, expanduser, isdir, join
from sys import platform from sys import platform
from time import gmtime, localtime, sleep, strftime, strptime, time from time import gmtime, localtime, sleep, strftime, strptime, time
from typing import TYPE_CHECKING, Any, Dict, List, MutableMapping, Optional from typing import TYPE_CHECKING, Any, List, MutableMapping, Optional
from typing import OrderedDict as OrderedDictT from typing import OrderedDict as OrderedDictT
from typing import Tuple, Union from typing import Tuple
if TYPE_CHECKING: if TYPE_CHECKING:
import tkinter import tkinter
@ -100,7 +100,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.station: Optional[str] = None self.station: Optional[str] = None
self.station_marketid: Optional[int] = None self.station_marketid: Optional[int] = None
self.stationtype: Optional[str] = None self.stationtype: Optional[str] = None
self.coordinates: Optional[Tuple[int, int, int]] = None self.coordinates: Optional[Tuple[float, float, float]] = None
self.systemaddress: Optional[int] = None self.systemaddress: Optional[int] = None
self.started: Optional[int] = None # Timestamp of the LoadGame event self.started: Optional[int] = None # Timestamp of the LoadGame event
@ -425,7 +425,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
logger.debug('Done.') logger.debug('Done.')
def parse_entry(self, line: str) -> Dict: # noqa: C901, CCR001 def parse_entry(self, line: str) -> MutableMapping[str, Any]: # noqa: C901, CCR001
""" """
Parse a Journal JSON line. Parse a Journal JSON line.
@ -623,7 +623,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.planet = None self.planet = None
if 'StarPos' in entry: if 'StarPos' in entry:
self.coordinates = tuple(entry['StarPos']) self.coordinates = tuple(entry['StarPos']) # type: ignore
elif self.system != entry['StarSystem']: elif self.system != entry['StarSystem']:
self.coordinates = None # Docked event doesn't include coordinates self.coordinates = None # Docked event doesn't include coordinates
@ -890,6 +890,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['Friends'].discard(entry['Name']) self.state['Friends'].discard(entry['Name'])
return entry return entry
except Exception as ex: except Exception as ex:
logger.debug(f'Invalid journal entry:\n{line}\n', exc_info=ex) logger.debug(f'Invalid journal entry:\n{line}\n', exc_info=ex)
return {'event': None} return {'event': None}
@ -931,7 +932,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
return item.capitalize() return item.capitalize()
def get_entry(self) -> Union[OrderedDictT[str, Any], None]: def get_entry(self) -> Optional[MutableMapping[str, Any]]:
""" """
Pull the next Journal event from the event_queue. Pull the next Journal event from the event_queue.
@ -1026,7 +1027,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
return False return False
def ship(self, timestamped=True) -> OrderedDictT: def ship(self, timestamped=True) -> Optional[MutableMapping[str, Any]]:
""" """
Produce a subset of data for the current ship. Produce a subset of data for the current ship.
@ -1043,7 +1044,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
'PowerDistributor', 'Radar', 'FuelTank' 'PowerDistributor', 'Radar', 'FuelTank'
) )
d = OrderedDict() d: MutableMapping[str, Any] = OrderedDict()
if timestamped: if timestamped:
d['timestamp'] = strftime('%Y-%m-%dT%H:%M:%SZ', gmtime()) d['timestamp'] = strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())