Merge branch 'master' of https://github.com/chubin/wttr.in

Dockerfile

@@ -13,7 +13,7 @@ RUN go get -u github.com/mattn/go-colorable && \
     cd /app && CGO_ENABLED=0 go build .
 
 # Application stage
-FROM alpine:3.16
+FROM alpine:3.21.1
 
 WORKDIR /app
 

lib/view/line.py

@@ -128,6 +128,12 @@ def render_condition_plain(data, query):
 
     return weather_condition
 
+def render_condition_int(data, query):
+    """Weather condition code as integer (i)
+    """
+    return data['weatherCode']
+
+
 def render_humidity(data, query):
     """
     humidity (h)
@@ -284,6 +290,7 @@ FORMAT_SYMBOL = {
     'c':    render_condition,
     'C':    render_condition_fullname,
     'x':    render_condition_plain,
+    'i':    render_condition_int,
     'h':    render_humidity,
     't':    render_temperature,
     'f':    render_feel_like_temperature,

requirements.txt

@@ -24,3 +24,4 @@ numba
 emoji>=1.6.0,<=1.7.0
 grapheme
 pycountry
+aiohttp>=3.10.11 # not directly required, pinned by Snyk to avoid a vulnerability

share/bash-function.txt

@@ -20,12 +20,12 @@ fi
 
 wttr() {
   local location="${1// /+}"
-  command shift
-  local args=""
+  test "$#" -gt 0 && shift
+  local args=()
   for p in $WTTR_PARAMS "$@"; do
-    args+=" --data-urlencode $p "
+    args+=("--data-urlencode" "$p")
   done
-  curl -fGsS -H "Accept-Language: ${LANG%_*}" $args --compressed "wttr.in/${location}"
+  curl -fGsS -H "Accept-Language: ${LANG%_*}" "${args[@]}" --compressed "wttr.in/${location}"
 }
 
 wttr "$@"