hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2025-02-03 09:44:15 -05:00
Code Issues Projects Releases Wiki Activity

pep8 fixes

Browse Source
This commit is contained in:
Hemna 2023-11-17 13:34:10 -05:00
parent 638128adf8
commit 6b397cbdf1
3 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
aprsd/packets/core.py
View File

@ -54,23 +54,11 @@ def _init_msgNo(): # noqa: N802
def factory_from_dict(packet_dict): def factory_from_dict(packet_dict):
pkt_type = get_packet_type(packet_dict) pkt_type = get_packet_type(packet_dict)
# print(f"pkt_type {pkt_type}")
if pkt_type: if pkt_type:
# if pkt_type == 'unknown':
# # try to determine it by the raw
# raw = packet_dict.get('raw')
# if raw:
# import aprslib
# type = get_packet_type(aprslib.parse(raw))
# print(f"raw type {type}")
cls = TYPE_LOOKUP[pkt_type] cls = TYPE_LOOKUP[pkt_type]
# print(f"CLS {cls}")
return cls.from_dict(packet_dict) return cls.from_dict(packet_dict)
def factory_from_json(packet_dict): def factory_from_json(packet_dict):
pkt_type = get_packet_type(packet_dict) pkt_type = get_packet_type(packet_dict)
if pkt_type: if pkt_type:
@ -97,7 +85,7 @@ class Packet(metaclass=abc.ABCMeta):
# Fields related to sending packets out # Fields related to sending packets out
send_count: int = field(repr=False, default=0, compare=False, hash=False) send_count: int = field(repr=False, default=0, compare=False, hash=False)
retry_count: int = field(repr=False, default=3, compare=False, hash=False) retry_count: int = field(repr=False, default=3, compare=False, hash=False)
#last_send_time: datetime = field( # last_send_time: datetime = field(
# metadata=dc_json_config( # metadata=dc_json_config(
# encoder=datetime.isoformat, # encoder=datetime.isoformat,
# decoder=datetime.fromisoformat, # decoder=datetime.fromisoformat,
@ -106,7 +94,7 @@ class Packet(metaclass=abc.ABCMeta):
# default_factory=_init_send_time, # default_factory=_init_send_time,
# compare=False, # compare=False,
# hash=False # hash=False
#) # )
last_send_time: float = field(repr=False, default=0, compare=False, hash=False) last_send_time: float = field(repr=False, default=0, compare=False, hash=False)
last_send_attempt: int = field(repr=False, default=0, compare=False, hash=False) last_send_attempt: int = field(repr=False, default=0, compare=False, hash=False)
@ -123,7 +111,6 @@ class Packet(metaclass=abc.ABCMeta):
""" """
get the json formated string get the json formated string
""" """
#return json.dumps(self.__dict__, cls=aprsd_json.EnhancedJSONEncoder)
return self.to_json() return self.to_json()
def get(self, key, default=None): def get(self, key, default=None):
@ -330,6 +317,7 @@ class RejectPacket(Packet):
def _build_payload(self): def _build_payload(self):
self.payload = f":{self.to_call.ljust(9)} :rej{self.msgNo}" self.payload = f":{self.to_call.ljust(9)} :rej{self.msgNo}"
@dataclass_json @dataclass_json
@dataclass(unsafe_hash=True) @dataclass(unsafe_hash=True)
class MessagePacket(Packet): class MessagePacket(Packet):
@ -478,13 +466,6 @@ class GPSPacket(Packet):
) )
@dataclass
class StatusPacket(Packet):
status: str = None
messagecapable: bool = False
comment: str = None
@dataclass @dataclass
class MicEPacket(GPSPacket): class MicEPacket(GPSPacket):
messagecapable: bool = False messagecapable: bool = False

1
aprsd/packets/packet_list.py
View File

@ -62,7 +62,6 @@ class PacketList(MutableMapping):
def copy(self): def copy(self):
return self.d.copy() return self.d.copy()
@property @property
def maxlen(self): def maxlen(self):
return self._maxlen return self._maxlen

7
aprsd/wsgi.py
View File

@ -236,6 +236,7 @@ def plugins():
return "reloaded" return "reloaded"
def _get_namespaces(): def _get_namespaces():
args = [] args = []
@ -259,13 +260,13 @@ def generate_oslo():
generator.generate(CONF, string_out) generator.generate(CONF, string_out)
return string_out.getvalue() return string_out.getvalue()
@auth.login_required @auth.login_required
@app.route("/oslo") @app.route("/oslo")
def oslo(): def oslo():
return generate_oslo() return generate_oslo()
@auth.login_required @auth.login_required
@app.route("/save") @app.route("/save")
def save(): def save():
@ -407,8 +408,8 @@ if __name__ == "aprsd.wsgi":
log_level = init_app( log_level = init_app(
log_level="DEBUG", log_level="DEBUG",
#config_file="/config/aprsd.conf", # config_file="/config/aprsd.conf",
config_file = cli_helper.DEFAULT_CONFIG_FILE, config_file=cli_helper.DEFAULT_CONFIG_FILE,
) )
setup_logging(app, log_level) setup_logging(app, log_level)
sio.register_namespace(LoggingNamespace("/logs")) sio.register_namespace(LoggingNamespace("/logs"))