fix trivial issues #2

Closed
conao3 wants to merge 3 commits from feature into master
Showing only changes of commit b781990890 - Show all commits

70
aqi.el
View file

@ -160,7 +160,7 @@
(defun aqi-search (name) (defun aqi-search (name)
"Search for the nearest stations (if any) matching a given NAME." "Search for the nearest stations (if any) matching a given NAME."
(request (request
(format "https://api.waqi.info/search/?keyword=%s&" name) (format "https://api.waqi.info/search/?keyword=%s&" name)
:sync t :sync t
:params `(("token" . ,aqi-api-key)) :params `(("token" . ,aqi-api-key))
@ -180,28 +180,28 @@
(defun aqi-report-brief (&optional place) (defun aqi-report-brief (&optional place)
"General air quality info from PLACE as a string." "General air quality info from PLACE as a string."
(let ((city (if (and (string< "" place) place) place "here"))) (let ((city (if (and (string< "" place) place) place "here")))
(if aqi-use-cache (if aqi-use-cache
(aqi-request-cached city) (aqi-request-cached city)
(aqi-request city)) (aqi-request city))
(let-alist (aqi--city-cache-get city) (let-alist (aqi--city-cache-get city)
(format "Air Quality Index in %s is %s and the dominant pollutant is %s%s" (format "Air Quality Index in %s is %s and the dominant pollutant is %s%s"
.city.name .aqi .dominentpol .city.name .aqi .dominentpol
(if aqi-use-cache " (cached)" ""))))) (if aqi-use-cache " (cached)" "")))))
;;;###autoload ;;;###autoload
(defun aqi-report-full (&optional place) (defun aqi-report-full (&optional place)
"Detailed air quality info from PLACE as a string." "Detailed air quality info from PLACE as a string."
(let ((city (if (and (string< "" place) place) place "here"))) (let ((city (if (and (string< "" place) place) place "here")))
(if aqi-use-cache (if aqi-use-cache
(aqi-request-cached city) (aqi-request-cached city)
(aqi-request city)) (aqi-request city))
(let ((data (aqi--city-cache-get city))) (let ((data (aqi--city-cache-get city)))
;; simple typecheck -> error handling since semantic errors are cached as strings. ;; simple typecheck -> error handling since semantic errors are cached as strings.
(if (stringp data) (if (stringp data)
(format "%s (%s)" data city) (format "%s (%s)" data city)
(let-alist data (let-alist data
(format (format
"Air Quality index in %s is %s as of %s (UTC%s). "Air Quality index in %s is %s as of %s (UTC%s).
\nDominant pollutant is %s \nDominant pollutant is %s
PM2.5 (fine particulate matter): %s PM2.5 (fine particulate matter): %s
PM10 (respirable particulate matter): %s PM10 (respirable particulate matter): %s
@ -213,23 +213,23 @@ Air pressure: %s
Wind: %s Wind: %s
\nFurther details can be found at %s \nFurther details can be found at %s
\nData provided by %s and %s%s" \nData provided by %s and %s%s"
.city.name .city.name
.aqi .aqi
.time.s .time.s
.time.tz .time.tz
.dominentpol .dominentpol
.iaqi.pm25.v .iaqi.pm25.v
.iaqi.pm10.v .iaqi.pm10.v
.iaqi.no2.v .iaqi.no2.v
.iaqi.co.v .iaqi.co.v
.iaqi.t.v .iaqi.t.v
.iaqi.h.v .iaqi.h.v
.iaqi.p.v .iaqi.p.v
.iaqi.wg.v .iaqi.wg.v
.city.url .city.url
(let-alist (elt .attributions 0) .name) (let-alist (elt .attributions 0) .name)
(let-alist (elt .attributions 1) .name) (let-alist (elt .attributions 1) .name)
(if aqi-use-cache " (cached)" ""))))))) (if aqi-use-cache " (cached)" "")))))))
;;;###autoload ;;;###autoload
(defun aqi-report (&optional place type) (defun aqi-report (&optional place type)