Skip to content

Commit ef63600

Browse files
committed
Adding language file, styling pushover message
1 parent e08c2e5 commit ef63600

4 files changed

Lines changed: 53 additions & 33 deletions

File tree

config.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ class Config:
77

88
@staticmethod
99
def load():
10-
file_config = open("config.yaml", "r")
11-
config = yaml.load(file_config, Loader=yaml.FullLoader)
12-
file_config.close()
13-
return json.loads(json.dumps(config), object_hook=lambda d: SimpleNamespace(**d))
10+
config = Config._load_yaml("config.yaml")
11+
config["language"] = Config._load_yaml(config["language_file"] + ".yaml")
1412

13+
return json.loads(json.dumps(config), object_hook=lambda d: SimpleNamespace(**d))
1514

15+
@staticmethod
16+
def _load_yaml(file_name):
17+
file = open(file_name, "r")
18+
data = yaml.load(file, Loader=yaml.FullLoader)
19+
file.close()
20+
return data

db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
import json
44

5-
# "last_update": "2021-07-11T10:45:17.185972+00:00",
5+
66
class Db:
77
FILE = "db.json"
88

language_en.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
status:
2+
cloned: Cloned
3+
updated: Updated
4+
skipped: Skipped
5+
6+
pushover:
7+
title: Github sync {title}
8+
success:
9+
title: Success!
10+
message: |
11+
Cloned: {count_cloned}
12+
Updated: {count_updated}
13+
Skipped: {count_skipped}
14+
{list_cloned}{list_updated}{list_skipped}
15+
fail:
16+
title: Failed!
17+
message: Something went wrong

log.py

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,24 @@ class Log:
66
def __init__(self, config):
77
self._config = config.logging
88
self._pushover = config.pushover
9+
self._language = config.language
910
self._cloned = []
1011
self._updated = []
1112
self._skipped = []
1213

1314
def updated(self, name):
1415
if self._config.type.updated:
15-
self._repo(name, self._Colors.YELLOW, "updated")
16+
self._repo(name, self._Colors.YELLOW, self._language.status.updated)
1617
self._updated.append(name)
1718

1819
def skipped(self, name):
1920
if self._config.type.skipped:
20-
self._repo(name, self._Colors.RED, "skipped")
21+
self._repo(name, self._Colors.RED, self._language.status.skipped)
2122
self._skipped.append(name)
2223

2324
def cloned(self, name):
2425
if self._config.type.cloned:
25-
self._repo(name, self._Colors.GREEN, "cloned")
26+
self._repo(name, self._Colors.GREEN, self._language.status.cloned)
2627
self._cloned.append(name)
2728

2829
def pushover(self):
@@ -33,47 +34,44 @@ def pushover(self):
3334
count_updated = len(self._updated)
3435

3536
if count_cloned > 0 or count_updated > 0 or count_skipped > 0:
36-
title = "Success!"
37-
38-
message = "Cloned: {cloned} \nUpdated: {updated} \nSkipped: {skipped}"\
39-
.format(cloned=count_cloned,
40-
updated=count_updated,
41-
skipped=count_skipped)
42-
43-
message += self._pushover_message("Cloned",
44-
self._pushover.notification_type.cloned,
45-
self._cloned)
46-
47-
message += self._pushover_message("Updated",
48-
self._pushover.notification_type.updated,
49-
self._updated)
50-
51-
message += self._pushover_message("Skipped",
52-
self._pushover.notification_type.skipped,
53-
self._skipped)
37+
title = self._language.pushover.success.title
38+
39+
message = self._language.pushover.success.message.\
40+
format(count_cloned=count_cloned,
41+
count_updated=count_updated,
42+
count_skipped=count_skipped,
43+
list_cloned=self._pushover_message(self._language.status.cloned,
44+
self._pushover.notification_type.cloned,
45+
self._cloned),
46+
list_updated=self._pushover_message(self._language.status.updated,
47+
self._pushover.notification_type.updated,
48+
self._updated),
49+
list_skipped=self._pushover_message(self._language.status.skipped,
50+
self._pushover.notification_type.skipped,
51+
self._skipped))
5452

5553
else:
56-
title = "Failed!"
57-
58-
message = "Something went wrong"
54+
title = self._language.pushover.fail.title
55+
message = self._language.pushover.fail.message
5956

6057
if len(message) > self._pushover.message_limit:
6158
append_message = " ..."
6259
max_len = self._pushover.message_limit - len(append_message)
6360
message = (message[:max_len] + append_message)
6461

6562
pushover.send_message(message,
66-
title="Github sync {title}".format(title=title),
67-
priority=-1)
63+
title=self._language.pushover.title.format(title=title),
64+
priority=-1,
65+
html=1)
6866

6967
def _pushover_message(self, title, log, list_name):
7068
message = ""
7169

7270
if log and len(list_name) > 0:
73-
message += "\n\n{title}:".format(title=title)
71+
message += "\n<b><u>{title}:</u></b>\n".format(title=title)
7472

7573
for name in list_name:
76-
message += "\n{name}".format(name=name)
74+
message += "{name}\n".format(name=name)
7775

7876
return message
7977

0 commit comments

Comments
 (0)