Update Covid19

Covid19/plugin.py

@@ -39,7 +39,9 @@ except ImportError:
     _ = lambda x: x
 import urllib.parse
 from urllib.request import urlopen, HTTPError, URLError
-from datetime import datetime
+from datetime import datetime as dt
+from datetime import timedelta
+import datetime
 import re
 import requests
 import urllib.request
@@ -49,11 +51,9 @@ from bs4 import BeautifulSoup
 
 class COVID19(callbacks.Plugin):
     """COVID19 Live Status"""
-
     def covid19(self, irc, msg, args, argv):
         """<COVID19>
-
+        Returns the current world wide COVID19 cases (Worldmeters.info).
-        Returns the current COVID19 cases.
         """
         url = 'https://www.worldometers.info/coronavirus/'
         req = urllib.request.Request(
@@ -63,16 +63,73 @@ class COVID19(callbacks.Plugin):
                 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.47 Safari/537.36'
             }
         )
+        country = 'Total:'
         content = urllib.request.urlopen(req)
         soup = BeautifulSoup(content, "html.parser")
-        for item in soup.find_all('', class_=["maincounter-number"]):
+        table = soup.find("table", id='main_table_countries_today')
-            title = item.previous_sibling.previous_sibling
+        if not table:
-            irc.reply(title.text + " " + item.text, prefixNick=False)
+            irc.error("Data source is unreachable")
+            return
+        else:
+            table_rows = table.find_all('tr')
+            for tr in table_rows:
+                td = tr.find_all('td')
+                row = [i.text for i in td]   
+                if (len(row) > 0):  
+                    if (country.lower() == row[0].lower().strip()):
+                        deaths = "0"
+                        new = "0"
+                        ndeaths = "0"
+                        if (len(row[3]) > 1):
+                            deaths = row[3].strip()
+                        if (len(row[4]) > 1):
+                            ndeaths = row[4].strip()
+                        if (len(row[2]) > 1):
+                            new = row[2].strip()
+                        output = "Cases Worldwide: " + row[1].strip() + " (new " + new + ") Total deaths: " + deaths + " (new " + ndeaths + ") Recovered: " + row[5].strip() + " Active cases: " + row[6].strip() + " Serious/Critical: " + row[7].strip()
+            irc.reply(output, prefixNick=False)
     covid19 = wrap(covid19, [additional('text')])
+    def covid19y(self, irc, msg, args, argv):
+        """<COVID19>
+        Returns the yesterday world wide COVID19 cases (Worldmeters.info).
+        """
+        url = 'https://www.worldometers.info/coronavirus/'
+        req = urllib.request.Request(
+            url, 
+            data=None, 
+            headers={
+                'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.47 Safari/537.36'
+            }
+        )
+        country = 'Total:'
+        content = urllib.request.urlopen(req)
+        soup = BeautifulSoup(content, "html.parser")
+        table = soup.find("table", id='main_table_countries_yesterday')
+        if not table:
+            irc.error("Data source is unreachable")
+            return
+        else:
+            table_rows = table.find_all('tr')
+            for tr in table_rows:
+                td = tr.find_all('td')
+                row = [i.text for i in td]   
+                if (len(row) > 0):  
+                    if (country.lower() == row[0].lower().strip()):
+                        deaths = "0"
+                        new = "0"
+                        ndeaths = "0"
+                        if (len(row[3]) > 1):
+                            deaths = row[3].strip()
+                        if (len(row[4]) > 1):
+                            ndeaths = row[4].strip()
+                        if (len(row[2]) > 1):
+                            new = row[2].strip()
+                        output = "Cases Worldwide (yesterday): " + row[1].strip() + " (new " + new + ") Total deaths: " + deaths + " (new " + ndeaths + ") Recovered: " + row[5].strip() + " Active cases: " + row[6].strip() + " Serious/Critical: " + row[7].strip()
+            irc.reply(output, prefixNick=False)
+    covid19y = wrap(covid19y, [additional('text')])
     def fcovid19(self, irc, msg, args, argv):
         """<COVID19>
-
+        Returns the current COVID19 cases in <Country> (Worldmeters.info).
-        Returns the current COVID19 cases in <Country>.
         """
         argv2 = str(argv).split(" ")
         if (len(argv2) < 1):
@@ -115,14 +172,11 @@ class COVID19(callbacks.Plugin):
                         if (len(row[2]) > 1):
                             new = row[2].strip()
                         output = "Cases in " + row[0].strip() + ": " + row[1].strip() + " (new " + new + ") Total deaths: " + deaths + " (new " + ndeaths + ") Recovered: " + row[5].strip() + " Active cases: " + row[6].strip() + " Serious/Critical: " + row[7].strip()
-            if (country.lower() == 'almada'):
-                output = 'Cases in Almada: 0 ( new 0) Total deaths: 0 People Panicking: 1 (its fALSO)'
             irc.reply(output, prefixNick=False)
     fcovid19 = wrap(fcovid19, [additional('text')])
     def fcovid19y(self, irc, msg, args, argv):
         """<COVID19>
-
+        Returns the yesterday COVID19 cases in <Country> (Worldmeters.info).
-        Returns the yesterday COVID19 cases in <Country>.
         """
         argv2 = str(argv).split(" ")
         if (len(argv2) < 1):
@@ -164,16 +218,12 @@ class COVID19(callbacks.Plugin):
                         if (len(row[2]) > 1):
                             new = row[2].strip()
                         output = "Cases in " + row[0].strip() + " (Yesterday): " + row[1].strip() + " (new " + new + ") Total deaths: " + deaths + " (new " + ndeaths + ") Recovered: " + row[5].strip() + " Active cases: " + row[6].strip() + " Serious/Critical: " + row[7].strip()
-            if (country.lower() == 'almada'):
-                output = 'Cases in Almada (Yesterday): 0 ( new 0) Total deaths: 0 People Panicking: 1 (its fALSO)'
             irc.reply(output, prefixNick=False)
     fcovid19y = wrap(fcovid19y, [additional('text')])
     def cv19pt(self, irc, msg, args, argv):
         """<COVID19>
-
+        Returns the current COVID19 Data for Portugal (Data from DGS).
-        Returns the current COVID19 Data for Portugal.
         """
-        
         output = 'Not found'
         url = 'https://services.arcgis.com/CCZiGSEQbAxxFVh3/arcgis/rest/services/COVID19Portugal_UltimoRel/FeatureServer/0/query?f=json&where=1%3D1&returnGeometry=false&spatialRel=esriSpatialRelIntersects&outFields=*&outSR=102100&resultOffset=0&resultRecordCount=50&cacheHint=true'
         req = urllib.request.Request(
@@ -193,9 +243,59 @@ class COVID19(callbacks.Plugin):
             return
         values = json.loads(response.read().decode('utf-8'))
         valdat = values['features'][0]['attributes']
-        datarelatorio = datetime.fromtimestamp(int(str(valdat['datarelatorio'])[0:10]))
+        datarelatorio = dt.fromtimestamp(int(str(valdat['datarelatorio'])[0:10]))
-        output = "Dados DGS Casos Confirmados: " + str(valdat['casosconfirmados']) + " (" + str(valdat['casosnovos']) + " novos) " + "Casos suspeitos: " + str(valdat['casossuspeitos']) + " Recuperados: " + str(valdat['recuperados']) + " Obitos: " + str(valdat['nrobitos']) + " Data do relatório: " + str(datarelatorio)
+        output = "Dados DGS Casos Confirmados: " + str(valdat['casosconfirmados']) + " (" + str(valdat['casosnovos']) + " novos) | Internados: " + str(valdat['CasosInternados']) + " | Internados UCI: " + str(valdat['CasosInternadosUCI']) + " | Casos suspeitos: " + str(valdat['casossuspeitos']) + " | Recuperados: " + str(valdat['recuperados']) + " | Aguardam resultado de Lab.: " + str(valdat['AguardaReslab']) + " | Obitos: " + str(valdat['nrobitos']) + " | Data do relatório: " + str(datarelatorio)
         irc.reply(output, prefixNick=False)
     cv19pt = wrap(cv19pt, [additional('text')])
+    def fcv19pt(self, irc, msg, args, argv):
+        """<COVID19>
+        Returns the current COVID19 Data for Portugal Cities (Data DGS).
+        """
+        argv2 = str(argv).split(" ")
+        if (len(argv2) < 1):
+            irc.error("Usage .fcv19pt <concelho>")
+            return
+        if (len(argv2) >= 1):
+            fcidade = argv
+        else:
+            fcidade = argv[0]
+        output = 'Not found'
+        url = 'https://services.arcgis.com/CCZiGSEQbAxxFVh3/ArcGIS/rest/services/COVID19_ConcelhosDiarios/FeatureServer/0/query?where=Concelho%3D%27{0}%27&outFields=*&featureEncoding=esriDefault&f=pjson&orderByFields=Data+DESC&token='.format(fcidade.replace(" ","%20").lower())
+        req = urllib.request.Request(
+            url, 
+            data=None,
+            headers={
+                'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.47 Safari/537.36'
+            }
+        )
+        try:
+            response = urlopen(req)
+        except (HTTPError, URLError) as error:
+            irc.error('Data of %s not retrieved because %s', name, error)  
+            return
+        except timeout:
+            irc.error('Socket timed out, please try again later') 
+            return
+        values = json.loads(response.read().decode('utf-8'))
+        valdat = values['features']
+        i = 0
+        resultado = [0, 0]
+        for concelho in valdat:
+            if (i > 1):
+                break
+            resultado[i] = concelho['attributes']
+            i += 1
+        if (resultado[0] == 0):
+            output = "Não foram encontrados resultados"
+        else:
+            novosCasos = int(resultado[0]['ConfirmadosAcumulado']) - int(resultado[1]['ConfirmadosAcumulado'])
+            if (novosCasos > 0):
+                novosCasos = "+" + str(novosCasos)
+            else:
+                novosCasos = str(novosCasos)
+            datarelatorio = dt.fromtimestamp(int(str(resultado[0]['Data'])[0:10]))
+            output = "Dados DGS Casos Confirmados acumulados (" + str(resultado[0]['Concelho']).lower().capitalize() + "): " + str(resultado[0]['ConfirmadosAcumulado']) + " (novos " + novosCasos + ") | Data do relatório: " + str(datarelatorio)
+        irc.reply(output, prefixNick=False)
+    fcv19pt = wrap(fcv19pt, [additional('text')])
 Class = COVID19
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: