PsychoticNinja/oddluck-limnoria-plugins
1
0
Fork 0
mirror of https://github.com/oddluck/limnoria-plugins.git synced 2025-04-30 07:21:16 -05:00
Code Issues Projects Releases Wiki Activity

Corona: fix for latest site change

Browse Source
This commit is contained in:
oddluck 2020-05-15 09:15:33 +00:00
parent 3d40876de3
commit 39075d3893
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Corona/plugin.py
View File

@ -423,7 +423,7 @@ class Corona(callbacks.Plugin):
results = sorted( results = sorted(
results, results,
key=lambda k_v: int( key=lambda k_v: int(
re.sub("[^\d]", "", k_v[self.headers["countries"][1]]) re.sub("[^\d]", "", k_v[self.headers["countries"][2]])
) )
if len(k_v) == len(self.headers["countries"]) if len(k_v) == len(self.headers["countries"])
else 0, else 0,
@ -434,7 +434,7 @@ class Corona(callbacks.Plugin):
if len(item) == len(self.headers["countries"]): if len(item) == len(self.headers["countries"]):
i = 0 i = 0
while i < len(self.headers["countries"]): while i < len(self.headers["countries"]):
if i < 7 and not item[self.headers["countries"][i]]: if i < 8 and not item[self.headers["countries"][i]]:
item[self.headers["countries"][i]] = "0" item[self.headers["countries"][i]] = "0"
elif not item[self.headers["countries"][i]]: elif not item[self.headers["countries"][i]]:
item[self.headers["countries"][i]] = "N/A" item[self.headers["countries"][i]] = "N/A"
@ -445,72 +445,72 @@ class Corona(callbacks.Plugin):
re.sub("[^\d]", "", item[self.headers["countries"][i]]) re.sub("[^\d]", "", item[self.headers["countries"][i]])
) )
i += 1 i += 1
self.countries[item[self.headers["countries"][0]]] = item self.countries[item[self.headers["countries"][1]]] = item
rank = results.index(item) - 1 rank = results.index(item) - 1
self.countries[item[self.headers["countries"][0]]]["rank"] = rank self.countries[item[self.headers["countries"][1]]]["rank"] = rank
if rank > 0 and rank <= 10: if rank > 0 and rank <= 10:
top.append( top.append(
"#{0}: \x1F{1}\x1F (\x0307{2}\x03/\x0304{3}\x03)".format( "#{0}: \x1F{1}\x1F (\x0307{2}\x03/\x0304{3}\x03)".format(
rank, rank,
item[self.headers["countries"][0]], item[self.headers["countries"][1]],
"{:,}".format(item[self.headers["countries"][1]]), "{:,}".format(item[self.headers["countries"][2]]),
"{:,}".format(item[self.headers["countries"][3]]), "{:,}".format(item[self.headers["countries"][4]]),
) )
) )
self.top["countries"] = top self.top["countries"] = top
for item in self.countries: for item in self.countries:
try: try:
self.countries[item]["ratio_new_cases"] = "{0:.1%}".format( self.countries[item]["ratio_new_cases"] = "{0:.1%}".format(
self.countries[item][self.headers["countries"][2]] self.countries[item][self.headers["countries"][3]]
/ ( / (
self.countries[item][self.headers["countries"][1]] self.countries[item][self.headers["countries"][2]]
- self.countries[item][self.headers["countries"][2]] - self.countries[item][self.headers["countries"][3]]
) )
) )
except: except:
self.countries[item]["ratio_new_cases"] = "0%" self.countries[item]["ratio_new_cases"] = "0%"
try: try:
self.countries[item]["ratio_new_dead"] = "{0:.1%}".format( self.countries[item]["ratio_new_dead"] = "{0:.1%}".format(
self.countries[item][self.headers["countries"][4]] self.countries[item][self.headers["countries"][5]]
/ ( / (
self.countries[item][self.headers["countries"][3]] self.countries[item][self.headers["countries"][4]]
- self.countries[item][self.headers["countries"][4]] - self.countries[item][self.headers["countries"][5]]
) )
) )
except: except:
self.countries[item]["ratio_new_dead"] = "0%" self.countries[item]["ratio_new_dead"] = "0%"
try: try:
self.countries[item]["ratio_dead"] = "{0:.1%}".format( self.countries[item]["ratio_dead"] = "{0:.1%}".format(
self.countries[item][self.headers["countries"][3]] self.countries[item][self.headers["countries"][4]]
/ self.countries[item][self.headers["countries"][1]] / self.countries[item][self.headers["countries"][2]]
) )
except: except:
self.countries[item]["ratio_dead"] = "N/A" self.countries[item]["ratio_dead"] = "N/A"
try: try:
self.countries[item]["ratio_recovered"] = "{0:.1%}".format( self.countries[item]["ratio_recovered"] = "{0:.1%}".format(
self.countries[item][self.headers["countries"][5]] self.countries[item][self.headers["countries"][6]]
/ self.countries[item][self.headers["countries"][1]] / self.countries[item][self.headers["countries"][2]]
) )
except: except:
self.countries[item]["ratio_recovered"] = "N/A" self.countries[item]["ratio_recovered"] = "N/A"
try: try:
self.countries[item]["mild"] = ( self.countries[item]["mild"] = (
self.countries[item][self.headers["countries"][6]] self.countries[item][self.headers["countries"][7]]
- self.countries[item][self.headers["countries"][7]] - self.countries[item][self.headers["countries"][8]]
) )
except: except:
self.countries[item]["mild"] = "N/A" self.countries[item]["mild"] = "N/A"
try: try:
self.countries[item]["ratio_mild"] = "{0:.1%}".format( self.countries[item]["ratio_mild"] = "{0:.1%}".format(
self.countries[item]["mild"] self.countries[item]["mild"]
/ self.countries[item][self.headers["countries"][6]] / self.countries[item][self.headers["countries"][7]]
) )
except: except:
self.countries[item]["ratio_mild"] = "N/A" self.countries[item]["ratio_mild"] = "N/A"
try: try:
self.countries[item]["ratio_serious"] = "{0:.1%}".format( self.countries[item]["ratio_serious"] = "{0:.1%}".format(
self.countries[item][self.headers["countries"][7]] self.countries[item][self.headers["countries"][8]]
/ self.countries[item][self.headers["countries"][6]] / self.countries[item][self.headers["countries"][7]]
) )
except: except:
self.countries[item]["ratio_serious"] = "N/A" self.countries[item]["ratio_serious"] = "N/A"
@ -671,24 +671,24 @@ class Corona(callbacks.Plugin):
"(\x0310{12}\x03 Mild) (\x0313{13}\x03 Serious) (\x0310{14}\x03/" "(\x0310{12}\x03 Mild) (\x0313{13}\x03 Serious) (\x0310{14}\x03/"
"\x0313{15}\x03) | Cases/1M: \x0307{16}\x03 | Deaths/1M: \x0304{17}" "\x0313{15}\x03) | Cases/1M: \x0307{16}\x03 | Deaths/1M: \x0304{17}"
"\x03 | Updated: {18}".format( "\x03 | Updated: {18}".format(
self.countries[search][self.headers["countries"][0]],
self.countries[search]["rank"],
self.countries[search][self.headers["countries"][1]], self.countries[search][self.headers["countries"][1]],
self.countries[search]["rank"],
self.countries[search][self.headers["countries"][2]], self.countries[search][self.headers["countries"][2]],
self.countries[search]["ratio_new_cases"],
self.countries[search][self.headers["countries"][3]], self.countries[search][self.headers["countries"][3]],
self.countries[search]["ratio_dead"], self.countries[search]["ratio_new_cases"],
self.countries[search][self.headers["countries"][4]], self.countries[search][self.headers["countries"][4]],
self.countries[search]["ratio_new_dead"], self.countries[search]["ratio_dead"],
self.countries[search][self.headers["countries"][5]], self.countries[search][self.headers["countries"][5]],
self.countries[search]["ratio_recovered"], self.countries[search]["ratio_new_dead"],
self.countries[search][self.headers["countries"][6]], self.countries[search][self.headers["countries"][6]],
self.countries[search]["mild"], self.countries[search]["ratio_recovered"],
self.countries[search][self.headers["countries"][7]], self.countries[search][self.headers["countries"][7]],
self.countries[search]["mild"],
self.countries[search][self.headers["countries"][8]],
self.countries[search]["ratio_mild"], self.countries[search]["ratio_mild"],
self.countries[search]["ratio_serious"], self.countries[search]["ratio_serious"],
self.countries[search][self.headers["countries"][8]],
self.countries[search][self.headers["countries"][9]], self.countries[search][self.headers["countries"][9]],
self.countries[search][self.headers["countries"][10]],
self.time_created(self.updated), self.time_created(self.updated),
) )
) )
@ -726,39 +726,39 @@ class Corona(callbacks.Plugin):
"Cases/1M: \x0307{15}\x03 | Deaths/1M: \x0304{16}\x03 | " "Cases/1M: \x0307{15}\x03 | Deaths/1M: \x0304{16}\x03 | "
"Updated: {17}".format( "Updated: {17}".format(
"Global", "Global",
self.countries[list(self.countries)[0]][
self.headers["countries"][1]
],
self.countries[list(self.countries)[0]][ self.countries[list(self.countries)[0]][
self.headers["countries"][2] self.headers["countries"][2]
], ],
self.countries[list(self.countries)[0]]["ratio_new_cases"],
self.countries[list(self.countries)[0]][ self.countries[list(self.countries)[0]][
self.headers["countries"][3] self.headers["countries"][3]
], ],
self.countries[list(self.countries)[0]]["ratio_dead"], self.countries[list(self.countries)[0]]["ratio_new_cases"],
self.countries[list(self.countries)[0]][ self.countries[list(self.countries)[0]][
self.headers["countries"][4] self.headers["countries"][4]
], ],
self.countries[list(self.countries)[0]]["ratio_new_dead"], self.countries[list(self.countries)[0]]["ratio_dead"],
self.countries[list(self.countries)[0]][ self.countries[list(self.countries)[0]][
self.headers["countries"][5] self.headers["countries"][5]
], ],
self.countries[list(self.countries)[0]]["ratio_recovered"], self.countries[list(self.countries)[0]]["ratio_new_dead"],
self.countries[list(self.countries)[0]][ self.countries[list(self.countries)[0]][
self.headers["countries"][6] self.headers["countries"][6]
], ],
self.countries[list(self.countries)[0]]["mild"], self.countries[list(self.countries)[0]]["ratio_recovered"],
self.countries[list(self.countries)[0]][ self.countries[list(self.countries)[0]][
self.headers["countries"][7] self.headers["countries"][7]
], ],
self.countries[list(self.countries)[0]]["mild"],
self.countries[list(self.countries)[0]][
self.headers["countries"][8]
],
self.countries[list(self.countries)[0]]["ratio_mild"], self.countries[list(self.countries)[0]]["ratio_mild"],
self.countries[list(self.countries)[0]]["ratio_serious"], self.countries[list(self.countries)[0]]["ratio_serious"],
self.countries[list(self.countries)[0]][ self.countries[list(self.countries)[0]][
self.headers["countries"][8] self.headers["countries"][9]
], ],
self.countries[list(self.countries)[0]][ self.countries[list(self.countries)[0]][
self.headers["countries"][9] self.headers["countries"][10]
], ],
self.time_created(self.updated), self.time_created(self.updated),
) )