From ba47a5917ebe8e8e562c2d6a0ab7832e40db1c8b Mon Sep 17 00:00:00 2001
From: fz0x1 <fz0x1+gpg@posteo.net>
Date: Mon, 13 Jan 2025 17:51:24 +0100
Subject: [PATCH] 20250113.1736787084

---
 global/.zshrc-secrets       | Bin 739 -> 847 bytes
 global/scripts/bin/diary.sh |  77 ++++++++++++++++++++++--------------
 global/scripts/functions.sh |   8 ++++
 3 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/global/.zshrc-secrets b/global/.zshrc-secrets
index 3c6258c81e286c38fb81c9aab4ac15d1ca718bc1..5666a7e7bba3c1fa1324f090757ac80f2bf82619 100644
GIT binary patch
literal 847
zcmV-V1F-x6M@dveQdv+`0E`F0sd1H_Iy^desQ3;+UjdlMW`O!Q?*b&v>TuCMcR^vV
zv$96ek$P~`7$*DBP|Q5H>mj}2+>|ixk6(pYZoVfJH2dQS4Eh+oxEB*kr9FK6+>zM6
z=TFX-PhGpc(&~ts^$YsVnW!`iv<%=FM`q+a($q~iYIC8o_Oaqy`-zfll#AFW`JZKA
zZ81r-3blOmY}Yg-Sb+=+u*htj;8j4hz~J=L{-PRt3J?GolDaz_fqjmUb8XEyNt@J3
zX=+#)`eOcwv@+p)&HzDC&0}LwdU_x1QYwYK{}I*MaYTp_<7k>s)=r3X3c_N63)|Ja
z4+G#Z(E)pG@K^=PLGhqo?k4!Kk|fRaj`lnQ9?{gHc&${P14RN6rTTW~#U}db=DUb#
zE4#{=2~VG37K&PaazaoJYrp)^JQwdB<}^LRS8D$PEQLNa`s94$^J-5=W#O^~3E2qO
zOd63a9i2l<Zca!#gk_B0wp96<JE5rp=soA^eaVcx^@vp999-{>j2{>&rd9OYe9woG
z7eYcqj*jvmy^pbd52lrDdLBAt1@XqcvFosAYKexlZ54NEA$$xhBez@Pz>1Yv(y@HX
z4UA1<`}d8>#+~(Slm5f>AMY>D+zDv03U2_;+ameLc(r8C-w`cy>n?%t{^Id2@UhiE
zpp`o>q%qLx?WYE_y{T_2+|`05Zy*-;le)GeP#?;_gjx0*)SAAV1)(HiX9u#?JW{aw
z1Uj=(QH!e#F^~LeFx7}Knpe^@P|>B3Cy*v`$J5npKR~H7`s&DI1w%7i=_(%`P`$*6
zjfVv@)HGvj<}7e`kxI6zEkE<h81X19=4BuryY`QXvenpEV@OA|{FN>W`3rdtRFF^N
z+ofP*<5c9JeFDt*BY?h`)-l?FN-&*GBACW32!&NB-1oQ^m(j@|xxH6=7ZOCOm(<Dn
z%1wRo<Q|5;5WDvuDovnYaQZ@Y<NS5ngLuZ??#1>8#{1uS)(O-OSUxw+GcqKCZD0JB
zt>aDhXPp$P?Br0^E?g$M4%2ohhd#tHgF~ogP^x&@FS+QB8MJRVW9SaymwP+#>x1!9
ZJZx?$hT_Pk9SdF+9iEu^T><)p7C6$mtj+)c

literal 739
zcmV<90v!DSM@dveQdv+`0Ff(?bGiiaKit`%BJ9pq-dvs9lEDw;?D@RmWWDw;Af-x0
zz{`z9pl34Gg-NT&DMc3%jzq+3+62eLtq9AKpyz+B|H^CFPX<Y45^!sh8msW5tOV&O
z$FVl{glaq{*xVK~fpJat7M!e@_Bl4{E=3*InDTZWG1d=U=JDh$&VDdDxd(pz(nZbR
z&AEs1G0AE!%)TJw9SQfx<=M5Nv4~WVg=(I)brNrThM{w1n26!>xXFKm&buj>;4d2D
z04;Rr%Z*96oAcTVw#_QdDOpa7E#Xo@xx25End+!)2Ew(A2iyVa-t*H-|H$pYK(o4-
z280q1Y{m-T&1|?+JF91E${>rromF}M?&Yz^-*3*mVEE=ZjhHnnCgMe9DQCZ0eZRTx
zz$w;KU%K)8SAnLG5}WAlP(pILw2XAqC`a(DuK@7V$cyN>GfdLyBNy^PS56m<>RwTJ
zZK(X0;iA@XX*Re?F9CKAu(d9OxtuVh){^RQ6C28KU;(An;N`CBmS&Y^4^)1ni#~V2
z(T!d;LXDjK6lEvVkrag)%u;#P7Z1P1+<$<8K5veDVmcx~Qs)*#3S{3z!oKV=?hA)X
z_`u)w^knA5!oWYq-F><881?bZGeQ3rz>+5nLzht<$O%XxQhTxlmb@hS9IH%vOc*?y
zg`<@wpzaUUV?4kH0~9`bGa=+Nwr-yo9l*W(Myt^nFTKcILfUKB+8}w%>Dys=Kw!e2
zF$ir2x(E8L<(ixfgWbM*uo4q@t#zM!>ctsi>P2uQ`)05VD^wiIl-BJ$KpK9CkQGsA
zc-IqHzO~+OWva}a>&)d!m4Gq?V|Y8Y<aCC8Npe+@GpeJtAyL2A#BEEEeVU;1v|q1i
zSWV2XZ`1KT|G>wi4CmhUe1akX5=LG1mU`<Im!slmw*kWLVbDSW+T5k73wRKEY6%ZM
VB~ROe^RBx`9PSr|h5yvdF*@4ae%$~7

diff --git a/global/scripts/bin/diary.sh b/global/scripts/bin/diary.sh
index f0db9dd..e70275d 100755
--- a/global/scripts/bin/diary.sh
+++ b/global/scripts/bin/diary.sh
@@ -16,15 +16,54 @@ if [[ -z "$OPENWEATHER_APIKEY" ]]; then
     die "openweathermap api key is not set"
 fi
 
-if [[ ! -f "$CITY_FILE" ]]; then
-    die "cities.txt is not found"
-fi
+function manual_geo() {
+    if [[ ! -f "$CITY_FILE" ]]; then
+        die "cities.txt is not found"
+    fi
 
-CITY=$(cat "$CITY_FILE" | fzf --prompt="Type a city: ")
+    CITY=$(cat "$CITY_FILE" | fzf --prompt="Type a city: ")
 
-# Проверяем, выбран ли город
-if [[ -z "$CITY" ]]; then
-    die "city not selected"
+    # Проверяем, выбран ли город
+    if [[ -z "$CITY" ]]; then
+        die "city not selected"
+    fi
+
+    while true; do
+        set_text_color 43
+        set_bold_text
+        echo -n "Type a geo: "
+        reset_text_format
+        read GEO
+
+        # if a string is empty then skip it
+        if [[ -z "$GEO" ]]; then
+            break
+        fi
+
+        if [[ "$GEO" =~ ^-?[0-9]+\.[0-9]+,-?[0-9]+\.[0-9]+$ ]]; then
+            break
+        else
+            set_text_color 1
+            set_bold_text
+            echo "Wrong geo format (lat and lon 52.18969496420507,20.90814238187223)"
+            reset_text_format
+        fi
+    done
+}
+
+connection=$(check_connection)
+if [[ "$connection" = 0 ]]; then
+    manual_geo
+else
+    http_code=$(curl -H "Authorization: Basic ${GEO_SERVER_AUTH}" -s -o /dev/null -w "%{http_code}" "${GEO_SERVER_URL}?action=diary&type=get_geo")
+    echo "$http_code"
+    if [ "$http_code" -ne 200 ]; then
+        echo "Connection problem...\n"
+        manual_geo
+    fi
+    location=$(curl -H "Authorization: Basic ${GEO_SERVER_AUTH}" -s "${GEO_SERVER_URL}?action=diary&type=get_geo")
+    IFS=":" read -r lat lon CITY country timestamp <<<"$location"
+    GEO="$lat,$lon"
 fi
 
 set_text_color 43
@@ -37,28 +76,6 @@ if [[ -z "$TITLE" ]]; then
     die "title not found"
 fi
 
-while true; do
-    set_text_color 43
-    set_bold_text
-    echo -n "Type a geo: "
-    reset_text_format
-    read GEO
-
-    # if a string is empty then skip it
-    if [[ -z "$GEO" ]]; then
-        break
-    fi
-
-    if [[ "$GEO" =~ ^-?[0-9]+\.[0-9]+,-?[0-9]+\.[0-9]+$ ]]; then
-        break
-    else
-        set_text_color 1
-        set_bold_text
-        echo "Wrong geo format (lat and lon 52.18969496420507,20.90814238187223)"
-        reset_text_format
-    fi
-done
-
 RESPONSE=$(curl -s "https://api.openweathermap.org/data/2.5/weather?q=${CITY}&appid=${OPENWEATHER_APIKEY}&units=metric")
 
 if [[ "$(echo "$RESPONSE" | jq '.cod')" != "200" ]]; then
@@ -85,7 +102,7 @@ if [[ "$weather" -eq 1 ]]; then
     WEATHER="$(echo "$RESPONSE" | jq -r '.weather[0].description')"
     TZ="$(calculate_timezone "$(echo "$RESPONSE" | jq -r '.timezone')")"
     WEATHER_ICON="$(echo "$RESPONSE" | jq -r '.weather[0].icon')"
-    TEMPERATURES="🌡️ $(round $(echo "$RESPONSE" | jq -r '.main.temp')) ($(round $(echo "$RESPONSE" | jq -r '.main.feels_like')))"
+    TEMPERATURES="🌡️ $(round $(echo "$RESPONSE" | jq -r '.main.temp'))C ($(round $(echo "$RESPONSE" | jq -r '.main.feels_like'))C)"
 
     SUNRISE="$(date --date='@'"$(echo "$RESPONSE" | jq -r '.sys.sunrise')" +'%H:%M')"
     SUNSET="$(date --date='@'"$(echo "$RESPONSE" | jq -r '.sys.sunset')" +'%H:%M')"
diff --git a/global/scripts/functions.sh b/global/scripts/functions.sh
index 44027f3..bc7ca0a 100644
--- a/global/scripts/functions.sh
+++ b/global/scripts/functions.sh
@@ -69,3 +69,11 @@ function generate_random_string() {
 function checksumm() {
     echo $(sha256sum "${1:?}" | awk '{print $1}')
 }
+
+function check_connection() {
+    if ping -c 1 google.com &>/dev/null; then
+        echo 1
+    else
+        echo 0
+    fi
+}