Skip to content

Commit 4fb96ad

Browse files
Commit-La-GrenouilleCommit-La-Grenouille
committed
PYLINT+FLAKE8+BLACK: code reformatted to comply with expected coding style
1 parent 4327bb9 commit 4fb96ad

File tree

6 files changed

+87
-35
lines changed

6 files changed

+87
-35
lines changed

‎nabrfid2server/migrations/0001_initial.py‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,29 @@ class Migration(migrations.Migration):
77

88
initial = True
99

10-
dependencies = [
11-
]
10+
dependencies = []
1211

1312
operations = [
1413
migrations.CreateModel(
15-
name='Config',
14+
name="Config",
1615
fields=[
17-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
18-
('rfid_2_server_test', models.BooleanField(default=False)),
19-
('rfid_2_server_mode', models.IntegerField(default=2)),
20-
('rfid_2_server_url', models.TextField(default='Ex: https://MY_SERVER/core/api/jeeApi.php?apikey=MY_API_KEY&type=scenario&id=MY_SCENARIO_ID&action=start&tags=rfid="#RFID_TAG#"%20etat="#RFID_STATE#"%20flags=#34;#RFID_FLAGS##34;%20app=#34;#RFID_APP##34;')),
16+
(
17+
"id",
18+
models.AutoField(
19+
auto_created=True,
20+
primary_key=True,
21+
serialize=False,
22+
verbose_name="ID",
23+
),
24+
),
25+
("rfid_2_server_test", models.BooleanField(default=False)),
26+
("rfid_2_server_mode", models.IntegerField(default=2)),
27+
(
28+
"rfid_2_server_url",
29+
models.TextField(
30+
default="Ex: https://MY_SERVER/core/api/jeeApi.php?apikey=MY_API_KEY&type=scenario&id=MY_SCENARIO_ID&action=start&tags=rfid="#RFID_TAG#"%20etat="#RFID_STATE#"%20flags=#34;#RFID_FLAGS##34;%20app=#34;#RFID_APP##34;"
31+
),
32+
),
2133
],
2234
),
2335
]

‎nabrfid2server/models.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
class Config(singleton_model.SingletonModel):
66
rfid_2_server_test = models.BooleanField(default=False)
77
rfid_2_server_mode = models.IntegerField(default=2)
8-
rfid_2_server_url = models.TextField(default="Ex: https://MY_SERVER/core/api/jeeApi.php?apikey=MY_API_KEY&type=scenario&id=MY_SCENARIO_ID&action=start&tags=rfid="#RFID_TAG#"%20etat="#RFID_STATE#"%20flags=#34;#RFID_FLAGS##34;%20app=#34;#RFID_APP##34;")
8+
rfid_2_server_url = models.TextField(
9+
default="Ex: https://MY_SERVER/core/api/jeeApi.php?apikey=MY_API_KEY&"
10+
"type=scenario&id=MY_SCENARIO_ID&action=start&"
11+
"tags=rfid="#RFID_TAG#"%20etat=""
12+
"#RFID_STATE#"%20flags=#34;#RFID_FLAGS##34;"
13+
"%20app=#34;#RFID_APP##34; "
14+
)
915

1016
class Meta:
1117
app_label = "nabrfid2server"

‎nabrfid2server/nabrfid2server.py‎

Lines changed: 54 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,70 @@ def __init__(self):
1616

1717
async def reload_config(self):
1818
from . import models
19+
1920
self.config = await models.Config.load_async()
2021

21-
#logging.info("reload config: mode=" + str(self.config.rfid_2_server_mode) + " test="+str(self.config.rfid_2_server_test) + " url="+self.config.rfid_2_server_url)
22-
if self.config.rfid_2_server_test : self.send_rfid_2_url("rfid_uid_test","event_test","app_test","support_test","packet_test")
22+
# logging.info("reload config: mode=" + str(
23+
# self.config.rfid_2_server_mode) + " test=" + str(
24+
# self.config.rfid_2_server_test) + " url=" + \
25+
# self.config.rfid_2_server_url)
26+
if self.config.rfid_2_server_test:
27+
self.send_rfid_2_url(
28+
"rfid_uid_test",
29+
"event_test",
30+
"app_test",
31+
"support_test",
32+
"packet_test",
33+
)
2334

2435
async def process_nabd_packet(self, packet):
25-
if ( self.config.rfid_2_server_mode==0 or (packet["type"] != "rfid_event") ): return # Never send url
36+
if self.config.rfid_2_server_mode == 0 or (
37+
packet["type"] != "rfid_event"
38+
):
39+
return # Never send url
2640

27-
if "app" not in packet: app = "none"
28-
else: app = packet["app"]
29-
if "support" not in packet: supp = "support unknown"
30-
else: supp = packet["support"]
31-
if "event" not in packet: _event = "no event"
32-
else: _event = packet["event"]
41+
if "app" not in packet:
42+
app = "none"
43+
else:
44+
app = packet["app"]
45+
if "support" not in packet:
46+
supp = "support unknown"
47+
else:
48+
supp = packet["support"]
49+
if "event" not in packet:
50+
_event = "no event"
51+
else:
52+
_event = packet["event"]
3353

34-
if (self.config.rfid_2_server_mode==1) and (supp=="formatted") and (app=="none") : return # Send only unknown tags
35-
self.send_rfid_2_url(packet["uid"],_event,app,supp,packet)
54+
if (
55+
(self.config.rfid_2_server_mode == 1)
56+
and (supp == "formatted")
57+
and (app == "none")
58+
):
59+
return # Send only unknown tags
60+
self.send_rfid_2_url(packet["uid"], _event, app, supp, packet)
3661

37-
def send_rfid_2_url(self, uid,_event,app,supp,packet):
38-
#logging.info("send rfid 2 url: mode=" + str(self.config.rfid_2_server_mode) + " test="+str(self.config.rfid_2_server_test) + " url="+self.config.rfid_2_server_url)
39-
url_message = self.config.rfid_2_server_url.replace("#RFID_TAG#",uid)
40-
url_message = url_message.replace("#RFID_APP#",app)
41-
url_message = url_message.replace("#RFID_FLAGS#",supp)
42-
url_message = url_message.replace("#RFID_STATE#",_event)
43-
str_pack = json.dumps(packet);
44-
url_message = url_message.replace("#RFID_PACK#",str_pack)
62+
def send_rfid_2_url(self, uid, _event, app, supp, packet):
63+
# logging.info("send rfid 2 url: mode=" + str(
64+
# self.config.rfid_2_server_mode) + " test=" + str(
65+
# self.config.rfid_2_server_test) + " url=" + \
66+
# self.config.rfid_2_server_url)
67+
url_message = self.config.rfid_2_server_url.replace("#RFID_TAG#", uid)
68+
url_message = url_message.replace("#RFID_APP#", app)
69+
url_message = url_message.replace("#RFID_FLAGS#", supp)
70+
url_message = url_message.replace("#RFID_STATE#", _event)
71+
str_pack = json.dumps(packet)
72+
url_message = url_message.replace("#RFID_PACK#", str_pack)
4573
str_pack = str_pack.lower()
46-
str_pack = str_pack.replace('\"','')
47-
url_message = url_message.replace("#RFID_JEEPACK#",str_pack)
48-
f = requests.get(url_message)
74+
str_pack = str_pack.replace('"', "")
75+
url_message = url_message.replace("#RFID_JEEPACK#", str_pack)
76+
requests.get(url_message)
4977

5078
async def client_loop(self):
5179
try:
52-
idle_packet = '{"type":"mode","mode":"idle","events":["rfid/*"]}\r\n'
80+
idle_packet = (
81+
'{"type":"mode","mode":"idle","events":["rfid/*"]}\r\n'
82+
)
5383
self.writer.write(idle_packet.encode())
5484
while self.running and not self.reader.at_eof():
5585
line = await self.reader.readline()
@@ -70,5 +100,6 @@ async def client_loop(self):
70100
if self.running:
71101
self.loop.stop()
72102

103+
73104
if __name__ == "__main__":
74105
NabRfid2server.main(sys.argv[1:])

‎nabrfid2server/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
from .views import SettingsView
33

44
urlpatterns = [
5-
path("settings", SettingsView.as_view()),
5+
path("settings", SettingsView.as_view()),
66
]

‎nabrfid2server/views.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from .models import Config
55
from .nabrfid2server import NabRfid2server
66

7+
78
class SettingsView(TemplateView):
89
template_name = "nabrfid2server/settings.html"
910

@@ -14,9 +15,11 @@ def get_context_data(self, **kwargs):
1415

1516
def post(self, request, *args, **kwargs):
1617
config = Config.load()
17-
config.rfid_2_server_test = request.POST["rfid_2_server_test"] == "true"
18+
config.rfid_2_server_test = (
19+
request.POST["rfid_2_server_test"] == "true"
20+
)
1821
config.rfid_2_server_mode = int(request.POST["rfid_2_server_mode"])
19-
config.rfid_2_server_url = request.POST["rfid_2_server_url"]
22+
config.rfid_2_server_url = request.POST["rfid_2_server_url"]
2023
config.save()
2124
NabRfid2server.signal_daemon()
2225
context = super().get_context_data(**kwargs)

‎nabweb/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,4 @@
161161
# Static files (CSS, JavaScript, Images)
162162
# https://docs.djangoproject.com/en/2.1/howto/static-files/
163163

164-
STATIC_URL = "/static/"
164+
STATIC_URL = "/static/"

0 commit comments

Comments
 (0)