From e8824f7e22049c9dd794c6ed9dd62e26885f7a72 Mon Sep 17 00:00:00 2001 From: RingOV Date: Fri, 6 Nov 2015 10:40:06 +0300 Subject: [PATCH] Fix: accuweather pressure --- gis-weather.py | 2 +- i18n/uk/LC_MESSAGES/gis-weather.mo | Bin 15345 -> 15397 bytes po/uk.po | 6 +++--- services/accuweather.py | 15 ++++++++++----- utils/convert.py | 5 ++++- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/gis-weather.py b/gis-weather.py index 9222c80..80ea8db 100644 --- a/gis-weather.py +++ b/gis-weather.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # # gis_weather.py -v = '0.7.9.3' +v = '0.7.9.4' # Copyright (C) 2013-2015 Alexander Koltsov # # This program is free software: you can redistribute it and/or modify diff --git a/i18n/uk/LC_MESSAGES/gis-weather.mo b/i18n/uk/LC_MESSAGES/gis-weather.mo index ddea721ee288c5ae6d6c254c4dc86a342aff9f93..3ff7eb0fb6d8dcf80485d0a9701ad4a9a2104bb4 100644 GIT binary patch delta 4348 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 l(%hIhJTzuo`%X`L+p+3nmF+FQD-szY zccmS=h&mmeLq#shp`)hcG=St%dEQLi_6~DCpOBhc38uC?FvXXQBxj;UGFcQ@tje*z@ zL$L*hIp?|VRCHr9R>O2GkF&7?EX^JyKXEpX*UzK(&eZxZm{bGs0Z(}{!^%l{D95y z68f+zH>tlhD#OpBCYBUN{rX{xBo~#D*HIH*jT(51 zwfCY1JZ_#s4frD}(?47PHPixbc~rErd#FqVbMo}MM4%p212s^zwd2jFu|EA>P%Fzu z-It3Ra3*TP^H9%Qi^|L<)WF-V-`h(?DL;%#?boO;o<^iyqip1|Vw|11^F@G>fu*H9C=j(Qz6idJ0B ztdB}{Thy89iQ1|`sDXx~CX|WFOs=)3p~jhwx^F&~(fhxQiZZYUeYhT3tUHRzz&U&p z|FQlm)%`1PhWg%fs0a5!4LHF1Q&Aa7GsmLtn}Ax-Wc1Xrkcu9(#9U^sLS0{L?Tx6^ z7N9b;50%nyP%Hig_2A3azJsUO^ZTfUob>s(!p^D-9t{EieLg%9GHC{ZY@Igxb>CsD-S1lKg9+opk62;VZjv z0kx9bsDaDYcCH?Vq9)o7wSrVs23A@7L)4i#kB#w9)Wm#I{^!(14crtpkuDw;4V;WD z!sTHnT!D=3&Y~vx06C8?q7Ek?o1s>ijJ#1U4NKw-RAy$G2eA?DJJyaSU3&gY*aN+d zR60}n12uu>EKe)$XQp6p+8L-79Yhx8ZrJtEr~GH3I@X{+7L~aq^kK5~Pe=aTIzIIL zt`a*Y2$b#OH8&KQr|P#L+5+RH%pV+e+$4r4BA0dr6p`2btvQ4GTS zs7#lu?{C+@TKe}thDs|g^gy!YW}#BO#VkTS;8zU58>k7~LXuXzA4+*$_C={q#xnRO z>i%V@=dDKO?slUVa$aq{{{apC9gR?jqqmugTG=Gj1Qu9(Ir3BBHe)#~LLH`WQE$iZ zs7yXU9mWu5#T)2qqWasReqVZ_*N;jX70vW8Duu_e0$xF~=5AZN76(8Nibbuc7it2d zQ4`NWO<)dc%icD>!o|><3c*LqTf&{58zjXdtC%7 zBZ;UKXIXnLYVWt820D$}^DC&=@CHWVP1Ih8vzjn$h00(OYP>O?bY(x*>0y=d!6NRVz>v zIDlH&7pQ?RVhQX|XwP-;UP1>`r8hB?_=uQJJS=0V^dw#-G$B1}8KLda)_z9R)%&mg zN+)&`iwPC2Y#1?(NFlU$6^H}GSb_uX77!}Q#h?BItW11N%pqPOHWFHWDMBTjc#Y7O zsWie)l z(2lC?AfgE+TIB;jZa)@kH&jLuK4JSVh~kMBr1V^+yHD(v?SglJ|uLkAC@<*qIY*9kxJ+g zCFPf>7~$nnQ&~!EC$_0U+2zOe#X45c$3a9BqC1gEtR-@YO~eM`IbuDbH@_0Gj`*B- zv~;5}iI||Q#!`8g7)+?l^5c5pT;dI4ob@G`{ctBy)!OfwN3a&rffz}&CHSFteTXeY zCqm^Av4R+_U2Q{UA90wNN~rMSx)+LT{*P)fnRws&)|kW1B8(wkBt9V)5vz#ji5|pk zB8$i%8W2kem3hti*jilWzYn<3>Ytjr{yOmv(UoXNc!kG9rUw-E4T}ow7~8OEoUciI z>*n$GV<|yBQ*v?}_Q_7k%*jZ}&B|`=OUOu_n36dnHQU!CD+9J1uimR$hlO WDQOvvvd0%5tkJc6VPw6a(EkDbV5xQh diff --git a/po/uk.po b/po/uk.po index ee7c744..a0f80d3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Gis Weather\n" "POT-Creation-Date: 2015-10-25 19:42+0300\n" -"PO-Revision-Date: 2015-10-25 16:46+0000\n" -"Last-Translator: Alexander Koltsov \n" +"PO-Revision-Date: 2015-11-03 00:21+0000\n" +"Last-Translator: Victor Butko \n" "Language-Team: Ukrainian (http://www.transifex.com/gis-weather-team/gis-weather/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -369,7 +369,7 @@ msgstr "погода отримана" #: services/openweathermap.py:15 msgid "How to get" -msgstr "" +msgstr "Як отримати" #: dialogs/city_id_dialog.py:71 msgid "Choose your city on" diff --git a/services/accuweather.py b/services/accuweather.py index 5ffb6ff..dcbf415 100644 --- a/services/accuweather.py +++ b/services/accuweather.py @@ -2,7 +2,7 @@ from utils import weather_vars, gw_vars from utils.opener import urlopener -from utils.convert import C_to_F, C_to_K, F_to_C, convert_from_kmh, convert_from_C +from utils.convert import C_to_F, C_to_K, F_to_C, convert_from_kmh, convert_from_C, convert_from_inHg, convert_from_hPa import re import time import os @@ -274,10 +274,15 @@ def get_weather(): return False # pressure now - press_now = re.findall('Pressure.*>(\d+)', source) - try: - press_now[0] = str(round(int(press_now[0])*0.75))+' mmHg;'+str(round(int(press_now[0])*0.0295))+' inHg;'+press_now[0]+' hPa' - except: + press = re.findall('Pressure.*>(.+?)<', source) + if press: + press_now = [press[0].split()[0]] + press_scale = press[0].split()[1] + if press_scale == 'mb': + press_now[0] = convert_from_hPa(press_now[0]) + if press_scale == 'in': + press_now[0] = convert_from_inHg(press_now[0]) + else: press_now = ['n/a mmHg;n/a inHg;n/a hPa'] # humidity now hum_now = re.findall('Humidity.*>(\d+)', source) diff --git a/utils/convert.py b/utils/convert.py index 8f989ce..7b4527a 100644 --- a/utils/convert.py +++ b/utils/convert.py @@ -87,4 +87,7 @@ def convert_from_mmHg(mmHg): def convert_from_hPa(hPa): - return str(round(float(hPa)*0.75))+' mmHg;'+str(round(float(hPa)*0.0295))+' inHg;'+str(round(float(hPa)))+' hPa' \ No newline at end of file + return str(round(float(hPa)*0.75))+' mmHg;'+str(round(float(hPa)*0.0295))+' inHg;'+str(round(float(hPa)))+' hPa' + +def convert_from_inHg(inHg): + return str(round(float(inHg)*25.4))+' mmHg;'+str(round(float(inHg)))+' inHg;'+str(round(float(inHg)*33.86))+' hPa' \ No newline at end of file