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

moved wttr.py to lib/view/

Browse source
This commit is contained in:
Igor Chubin 2020-04-04 18:04:27 +02:00
parent 4ea5c74b03
commit 826cedf1f0
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/globals.py
View file

@ -122,3 +122,7 @@ def get_help_file(lang):
if os.path.exists(help_file): if os.path.exists(help_file):
return help_file return help_file
return HELP_FILE return HELP_FILE
def remove_ansi(sometext):
ansi_escape = re.compile(r'(\x9B|\x1B\[)[0-?]*[ -\/]*[@-~]')
return ansi_escape.sub('', sometext)

7
lib/wttr.py → lib/view/wttr.py
View file

@ -13,19 +13,16 @@ import os
import re import re
import time import time
sys.path.insert(0, "..")
from translations import get_message, FULL_TRANSLATION, PARTIAL_TRANSLATION, SUPPORTED_LANGS from translations import get_message, FULL_TRANSLATION, PARTIAL_TRANSLATION, SUPPORTED_LANGS
from globals import WEGO, CACHEDIR, \ from globals import WEGO, CACHEDIR, \
NOT_FOUND_LOCATION, DEFAULT_LOCATION, TEST_FILE, \ NOT_FOUND_LOCATION, DEFAULT_LOCATION, TEST_FILE, \
log, error log, error, remove_ansi
def _is_invalid_location(location): def _is_invalid_location(location):
if '.png' in location: if '.png' in location:
return True return True
def remove_ansi(sometext):
ansi_escape = re.compile(r'(\x9B|\x1B\[)[0-?]*[ -\/]*[@-~]')
return ansi_escape.sub('', sometext)
def get_wetter(location, ip, html=False, lang=None, query=None, location_name=None, full_address=None, url=None): def get_wetter(location, ip, html=False, lang=None, query=None, location_name=None, full_address=None, url=None):
local_url = url local_url = url