fish-corona

Track corona-virus cases from the fish-shell 😷️

git clone: git://git.pablopie.xyz/fish-corona
Log
Files
Refs
README
LICENSE

Commit: a226920b917e7774b6a7e217d3223df00264706c
Parent: 00148eb354976474ae51c2ba624531b5a07bf05a
Author: Pablo Emilio Escobar Gaviria <pablo-escobar@riseup.net>
Date: Sat, 3 Oct 2020 11:02:22 -0300

Fixed bugs

Diffstat

1 file changed, 9 insertions, 11 deletions

Status	File Name	N° Changes	Insertions	Deletions
Modified	corona.fish	20	9	11

diff --git a/corona.fish b/corona.fish
@@ -12,7 +12,7 @@
 function __corona_select_csv -a country
     echo '🚩️ Country, 😷️ Cases, 🤒️ New Cases, 💀️ Deaths, 😰️ New Deaths'
 
-    if [ (string lower "$country") = all ]
+    if test (string lower "$country") = all
         cat "$HOME/.cache/corona.csv"
     else
         grep -Ei "^\"?($country|World)" "$HOME/.cache/corona.csv"
@@ -20,12 +20,8 @@ function __corona_select_csv -a country
 end
 
 function corona -a country -d "Track corona-virus cases from fish-shell. 😷️"
-    switch (string lower "$country")
-    case all
-        set country ""
-    # Figure out the host's country from his IP
-    case ""
-        if [ -f "$HOME/.cache/country.name" ]
+    if test -z "$country"
+        if test -f "$HOME/.cache/country.name"
             set country (cat "$HOME/.cache/country.name" )
         else
             set country_code (curl -s https://ipinfo.io/country/)
@@ -37,12 +33,14 @@ function corona -a country -d "Track corona-virus cases from fish-shell. 😷️
     # Update the cache if it doesn't exists or if it hasn't been modified in
     # over a day
     set date (date +%Y-%m-%d)
-    if ! [ -f "$HOME/.cache/corona.csv" ] || \
-         [ (stat -c %y "$HOME/.cache/corona.csv" | cut -d' ' -f1) = "$date" ]
+    not test -f "$HOME/.cache/corona.csv"
+    or test (stat -c %y "$HOME/.cache/corona.csv" | cut -d' ' -f1) != "$date"
 
+    if test "$status" -eq 0
         curl -s https://corona-stats.online/\?format=json \
-            | jq -r '.data[], .worldStats 
-                        | [.country, .cases, .todayCases, .deaths, .todayDeaths]
+            | jq -r '.data + [.worldStats] 
+                        | .[] 
+                        | [.country,.cases,.todayCases,.deaths,.todayDeaths] 
                         | @csv' \
             > "$HOME/.cache/corona.csv"
     end