lobo/wttr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

minor fixes

Browse source
This commit is contained in:
Igor Chubin 2018-11-02 18:15:15 +01:00
parent c330875eda
commit 632a4169c5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/wttr_srv.py
View file

@ -7,6 +7,7 @@ Main wttr.in rendering function implementation
import logging import logging
import os import os
import time
from flask import render_template, send_file, make_response from flask import render_template, send_file, make_response
import wttrin_png import wttrin_png
@ -205,6 +206,7 @@ def wttr(location, request):
# We are ready to return the answer # We are ready to return the answer
try: try:
if 'format' in query: if 'format' in query:
location = (orig_location or location).lstrip('~')
return wttr_line(location, query) return wttr_line(location, query)
if png_filename: if png_filename:

4
lib/wttrin_png.py
View file

@ -32,7 +32,7 @@ MYDIR = os.path.abspath(os.path.dirname(os.path.dirname('__file__')))
sys.path.append("%s/lib/" % MYDIR) sys.path.append("%s/lib/" % MYDIR)
import parse_query import parse_query
from globals import PNG_CACHE from globals import PNG_CACHE, log
COLS = 180 COLS = 180
ROWS = 100 ROWS = 100
@ -311,11 +311,9 @@ def make_wttr_in_png(png_name, options=None):
if not os.path.exists(dirname): if not os.path.exists(dirname):
os.makedirs(dirname) os.makedirs(dirname)
print "Cached file: %s" % cached_png_file
if os.path.exists(cached_png_file): if os.path.exists(cached_png_file):
return cached_png_file return cached_png_file
print "Requesting URL: %s" % url
text = requests.get(url).text.replace('\n', '\r\n') text = requests.get(url).text.replace('\n', '\r\n')
curl_output = text.encode('utf-8') curl_output = text.encode('utf-8')