Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2013-11-11 14:44:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasmoid-cwp (Old) and /work/SRC/openSUSE:Factory/.plasmoid-cwp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasmoid-cwp" Changes: -------- --- /work/SRC/openSUSE:Factory/plasmoid-cwp/plasmoid-cwp.changes 2013-09-25 14:34:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2013-11-11 14:44:12.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Nov 7 21:15:26 UTC 2013 - [email protected] + +- Update to version 1.9.0: + * xml: openweathermap.org: initial support (WARNING: all configurations need + to be updated!) + * xml: uk.weather.com: sunrise / sunset fixed + * xml: espanol.weather.com: sunrise / sunset and wind direction fixed + * xml: in.weather.com: sunrise / sunset fixed + +------------------------------------------------------------------- +Sun Nov 3 19:40:37 UTC 2013 - [email protected] + +- Update to version 1.8.3: + * xml: gismeteo.com: fixes + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.8.2.tar.bz2 New: ---- 98925-cwp-1.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.bJe3qD/_old 2013-11-11 14:44:13.000000000 +0100 +++ /var/tmp/diff_new_pack.bJe3qD/_new 2013-11-11 14:44:13.000000000 +0100 @@ -18,7 +18,7 @@ Name: plasmoid-cwp -Version: 1.8.2 +Version: 1.9.0 Release: 0 Summary: Customizable Weather Plasmoid License: GPL-3.0+ ++++++ 98925-cwp-1.8.2.tar.bz2 -> 98925-cwp-1.9.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/CMakeLists.txt new/cwp-1.9.0/CMakeLists.txt --- old/cwp-1.8.2/CMakeLists.txt 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/CMakeLists.txt 2013-11-05 22:37:56.000000000 +0100 @@ -60,6 +60,7 @@ data/www_gismeteo_com.xml data/freemeteo_com_celsius.xml data/freemeteo_com_fahrenheit.xml + data/openweathermap_org.xml data/satellite_images.xml DESTINATION ${DATA_INSTALL_DIR}/plasma-cwp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/ChangeLog new/cwp-1.9.0/ChangeLog --- old/cwp-1.8.2/ChangeLog 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/ChangeLog 2013-11-05 22:37:56.000000000 +0100 @@ -1,3 +1,14 @@ +1.9.0 +===== +- xml: openweathermap.org: initial support (WARNING: all configurations need to be updated!) +- xml: uk.weather.com: sunrise / sunset fixed +- xml: espanol.weather.com: sunrise / sunset and wind direction fixed +- xml: in.weather.com: sunrise / sunset fixed + +1.8.3 +===== +- xml: gismeteo.com: fixes + 1.8.2 ===== - xml: gismeteo: icon fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/README new/cwp-1.9.0/README --- old/cwp-1.8.2/README 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/README 2013-11-05 22:37:56.000000000 +0100 @@ -1,5 +1,5 @@ ========================================= -Customizable Weather Plasmoid (CWP) 1.8.2 +Customizable Weather Plasmoid (CWP) 1.9.0 ========================================= This is another weather plasmoid. @@ -30,6 +30,7 @@ freemeteo.com (°C) (city identifier example: gid=3117735&la=4; control language by la=<code>, try different numbers on freemeteo page) freemeteo.com (°F) (city identifier example: gid=3117735&la=4; control language by la=<code>, try different numbers on freemeteo page) www.gismeteo.com (°C) (city identifier example: 4944) +openweathermap.org (°C) (city identifier example: id=2643743 or q=London,UK) are included, but feel free to write your own ones. Please note, that some of the xml files might not work properly for all locations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/br_weather_com.xml new/cwp-1.9.0/data/br_weather_com.xml --- old/cwp-1.8.2/data/br_weather_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/br_weather_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043:1:BR" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043:1:BR" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/de_weather_com.xml new/cwp-1.9.0/data/de_weather_com.xml --- old/cwp-1.8.2/data/de_weather_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/de_weather_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="de.weather.com" search_page="http://de.weather.com"; example_zip="GMXX0087:1:GM" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="de.weather.com" search_page="http://de.weather.com"; example_zip="GMXX0087:1:GM" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/espanol_weather_com.xml new/cwp-1.9.0/data/espanol_weather_com.xml --- old/cwp-1.8.2/data/espanol_weather_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/espanol_weather_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -27,8 +27,8 @@ /> <data_sun url="urlc" - sunrise="grep -A18 Amanecer | grep \:" - sunset="grep -A18 Atardecer | grep \:" + sunrise="grep -A25 \<dt\>Amanecer | grep \:" + sunset="grep -A25 \<dt\>Atardecer | grep \:" /> <data_current_temperature url="urlc" @@ -172,22 +172,22 @@ /> <wind_transform - i1="Norte" o1="N" - i2="Norte Nordeste" o2="NNE" - i3="Nordeste" o3="NE" - i4="Este Nordeste" o4="ENE" - i5="Este" o5="E" - i6="Sur sureste" o6="SSE" - i7="Sureste" o7="SE" - i8="Este sureste" o8="ESE" - i9="Sur" o9="S" - i10="Norte Noroeste" o10="NNW" - i11="Noroeste" o11="NW" - i12="Oeste Noroeste" o12="WNW" - i13="Oeste" o13="W" - i14="Sur sudoeste" o14="SSW" - i15="Sudoeste" o15="SW" - i16="Oeste sudoeste" o16="WSW" + i1="N" o1="N" + i2="NNE" o2="NNE" + i3="NE" o3="NE" + i4="ENE" o4="ENE" + i5="E" o5="E" + i6="SSE" o6="SSE" + i7="SE" o7="SE" + i8="ESE" o8="ESE" + i9="S" o9="S" + i10="NNO" o10="NNW" + i11="NO" o11="NW" + i12="ONO" o12="WNW" + i13="O" o13="W" + i14="SSO" o14="SSW" + i15="SO" o15="SW" + i16="OSO" o16="WSW" i17="Var" o17="Var" i18="Variable" o18="Var" i19="En calma" o19="Calm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/fr_weather_com.xml new/cwp-1.9.0/data/fr_weather_com.xml --- old/cwp-1.8.2/data/fr_weather_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/fr_weather_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="FRXX0076:1:FR" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="FRXX0076:1:FR" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/freemeteo_com_celsius.xml new/cwp-1.9.0/data/freemeteo_com_celsius.xml --- old/cwp-1.8.2/data/freemeteo_com_celsius.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/freemeteo_com_celsius.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/freemeteo_com_fahrenheit.xml new/cwp-1.9.0/data/freemeteo_com_fahrenheit.xml --- old/cwp-1.8.2/data/freemeteo_com_fahrenheit.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/freemeteo_com_fahrenheit.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" /> + <xml_file_version type="cwp" version="2013-11-05" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/ilmeteo_it.xml new/cwp-1.9.0/data/ilmeteo_it.xml --- old/cwp-1.8.2/data/ilmeteo_it.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/ilmeteo_it.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/in_weather_com.xml new/cwp-1.9.0/data/in_weather_com.xml --- old/cwp-1.8.2/data/in_weather_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/in_weather_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -27,8 +27,8 @@ /> <data_sun url="urlc" - sunrise="grep -A18 Sunrise | grep \:" - sunset="grep -A18 Sunset | grep \:" + sunrise="grep -A25 \<dt\>Sunrise | grep \:" + sunset="grep -A25 \<dt\>Sunset | grep \:" /> <data_current_temperature url="urlc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/myforecast_com_celsius.xml new/cwp-1.9.0/data/myforecast_com_celsius.xml --- old/cwp-1.8.2/data/myforecast_com_celsius.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/myforecast_com_celsius.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/myforecast_com_fahrenheit.xml new/cwp-1.9.0/data/myforecast_com_fahrenheit.xml --- old/cwp-1.8.2/data/myforecast_com_fahrenheit.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/myforecast_com_fahrenheit.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/openweathermap_org.xml new/cwp-1.9.0/data/openweathermap_org.xml --- old/cwp-1.8.2/data/openweathermap_org.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/cwp-1.9.0/data/openweathermap_org.xml 2013-11-05 22:37:56.000000000 +0100 @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> + +<custom_weather> + <xml_file_version type="cwp" version="2013-11-05" name="openweathermap.org" search_page="http://www.openweathermap.org"; example_zip="id=2643743 or q=London,UK" unit="C" /> + + <locale_settings locale="utf-8" encoding="utf8" /> + + <urlc urlc_prefix="http://api.openweathermap.org/data/2.5/weather?"; urlc_suffix="&units=metric" urlc_follow="" /> + + <url1 url1_prefix="http://api.openweathermap.org/data/2.5/forecast/daily?"; url1_suffix="&cnt=7&units=metric" url1_follow="" /> + + <url2 url2_prefix="" url2_suffix="" url2_follow="" /> + + <url3 url3_prefix="" url3_suffix="" url3_follow="" /> + + <url4 url4_prefix="" url4_suffix="" url4_follow="" /> + + <url5 url5_prefix="" url5_suffix="" url5_follow="" /> + + <url6 url6_prefix="" url6_suffix="" url6_follow="" /> + + <url7 url7_prefix="" url7_suffix="" url7_follow="" /> + + <data_location url="urlc" + location="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"name\":\"*\([^\",}]*\).*/\1/"" + country="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"country\":\"*\([^\",}]*\).*/\1/"" + /> + + <data_sun url="urlc" + sunrise="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"sunrise\":\"*\([^\",}]*\).*/\1/" | awk '{ print strftime("%H:%M",$0); }'" + sunset="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"sunset\":\"*\([^\",}]*\).*/\1/" | awk '{ print strftime("%H:%M",$0); }'" + /> + + <data_current_temperature url="urlc" + update_time="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"dt\":\"*\([^\",}]*\).*/\1/" | awk '{ print strftime("%H:%M",$0); }'" + temperature="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"temp\":\"*\([^\",}]*\).*/\1/" | awk '{print int($0*10+0.5)/10}'" + temperature_felt="echo -n" + /> + + <data_current_wind url="urlc" + wind_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*wind.*\"speed\":\"*\([^\",]*\)[^{}]*deg\":\"*\([^\",}]*\).*/\2/" | awk '{print int(($0+11.25)/22.5)}'" + wind_speed="tr -d '\r' | tr -d '\n' | sed -e "s/.*wind.*\"speed\":\"*\([^\",}]*\).*/\1 km\/h/"" + wind="tr -d '\r' | tr -d '\n' | sed -e "s/.*wind.*\"speed\":\"*\([^\",]*\)[^{}]*deg\":\"*\([^\",}]*\).*/\1 km\/h at \2°/"" + /> + + <data_current_icon url="urlc" + icon="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*/http:\/\/openweathermap.org\/img\/w\/\1.png/"" + icon_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*/\1/"" + icon_text="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"description\":\"*\([^\",}]*\).*/\1/"" + /> + + <data_current_additional url="urlc" + humidity="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"humidity\":\"*\([^\",}]*\).*/\1%/"" + rain="" + dew_point="" + visibility="" + pressure="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"pressure\":\"*\([^\",}]*\).*/\1 hPa/"" + uv_index="" + /> + + <data_day1 url="url1" + name="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*/\1/" | awk '{ print strftime("%d.%m.",$0); }'" + temperature_low="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*/\1/" | awk '{print int($0+0.5)}'" + temperature_high="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*/\1/" | awk '{print int($0+0.5)}'" + icon="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/http:\/\/openweathermap.org\/img\/w\/\1.png/"" + icon_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/\1/"" + icon_text="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*/\1/"" + /> + + <data_day2 url="url1" + name="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*/\2/" | awk '{ print strftime("%d.%m.",$0); }'" + temperature_low="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*/\2/" | awk '{print int($0+0.5)}'" + temperature_high="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*/\2/" | awk '{print int($0+0.5)}'" + icon="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/http:\/\/openweathermap.org\/img\/w\/\2.png/"" + icon_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/\2/"" + icon_text="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*/\2/"" + /> + + <data_day3 url="url1" + name="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*/\3/" | awk '{ print strftime("%d.%m.",$0); }'" + temperature_low="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*/\3/" | awk '{print int($0+0.5)}'" + temperature_high="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*/\3/" | awk '{print int($0+0.5)}'" + icon="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/http:\/\/openweathermap.org\/img\/w\/\3.png/"" + icon_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/\3/"" + icon_text="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*/\3/"" + /> + + <data_day4 url="url1" + name="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*/\4/" | awk '{ print strftime("%d.%m.",$0); }'" + temperature_low="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*/\4/" | awk '{print int($0+0.5)}'" + temperature_high="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*/\4/" | awk '{print int($0+0.5)}'" + icon="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/http:\/\/openweathermap.org\/img\/w\/\4.png/"" + icon_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/\4/"" + icon_text="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*/\4/"" + /> + + <data_day5 url="url1" + name="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*/\5/" | awk '{ print strftime("%d.%m.",$0); }'" + temperature_low="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*/\5/" | awk '{print int($0+0.5)}'" + temperature_high="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*/\5/" | awk '{print int($0+0.5)}'" + icon="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/http:\/\/openweathermap.org\/img\/w\/\5.png/"" + icon_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/\5/"" + icon_text="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*/\5/"" + /> + + <data_day6 url="url1" + name="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*/\6/" | awk '{ print strftime("%d.%m.",$0); }'" + temperature_low="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*/\6/" | awk '{print int($0+0.5)}'" + temperature_high="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*/\6/" | awk '{print int($0+0.5)}'" + icon="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/http:\/\/openweathermap.org\/img\/w\/\6.png/"" + icon_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/\6/"" + icon_text="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*/\6/"" + /> + + <data_day7 url="url1" + name="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*\"dt\":\"*\([^\",}]*\).*/\7/" | awk '{ print strftime("%d.%m.",$0); }'" + temperature_low="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*\"min\":\"*\([^\",}]*\).*/\7/" | awk '{print int($0+0.5)}'" + temperature_high="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*\"max\":\"*\([^\",}]*\).*/\7/" | awk '{print int($0+0.5)}'" + icon="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/http:\/\/openweathermap.org\/img\/w\/\7.png/"" + icon_code="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*\"icon\":\"*\([^\",}]*\).*/\7/"" + icon_text="tr -d '\r' | tr -d '\n' | sed -e "s/.*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*\"description\":\"*\([^\",}]*\).*/\7/"" + /> + + <icon_transform + i1="01d" o1="32" + i2="02d" o2="34" + i3="03d" o3="30" + i4="04d" o4="26" + i5="09d" o5="12" + i6="10d" o6="39" + i7="11d" o7="37" + i8="13d" o8="15" + i9="50d" o9="20" + i10="01n" o10="31" + i11="02n" o11="33" + i12="03n" o12="29" + i13="04n" o13="27" + i14="09n" o14="12" + i15="10n" o15="45" + i16="11n" o16="47" + i17="13n" o17="15" + i18="50n" o18="20" + i19="" o19="" + i20="" o20="" + i21="" o21="" + i22="" o22="" + i23="" o23="" + i24="" o24="" + i25="" o25="" + i26="" o26="" + i27="" o27="" + i28="" o28="" + i29="" o29="" + i30="" o30="" + i31="" o31="" + i32="" o32="" + i33="" o33="" + i34="" o34="" + i35="" o35="" + i36="" o36="" + i37="" o37="" + i38="" o38="" + i39="" o39="" + i40="" o40="" + i41="" o41="" + i42="" o42="" + i43="" o43="" + i44="" o44="" + i45="" o45="" + i46="" o46="" + i47="" o47="" + i48="" o48="" + /> + + <wind_transform + i1="0" o1="N" + i2="1" o2="NNE" + i3="2" o3="NE" + i4="3" o4="ENE" + i5="4" o5="E" + i6="5" o6="SSE" + i7="6" o7="SE" + i8="7" o8="ESE" + i9="8" o9="S" + i10="15" o10="NNW" + i11="14" o11="NW" + i12="13" o12="WNW" + i13="12" o13="W" + i14="9" o14="SSW" + i15="10" o15="SW" + i16="11" o16="WSW" + i17="Var" o17="Var" + i18="Variable" o18="Var" + i19="Calm" o19="Calm" + i20="" o20="" + /> +</custom_weather> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/pogodynka_pl.xml new/cwp-1.9.0/data/pogodynka_pl.xml --- old/cwp-1.8.2/data/pogodynka_pl.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/pogodynka_pl.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/satellite_images.xml new/cwp-1.9.0/data/satellite_images.xml --- old/cwp-1.8.2/data/satellite_images.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/satellite_images.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp_satellite_images" version="2013-09-19" /> + <xml_file_version type="cwp_satellite_images" version="2013-11-05" /> <!--Global--> <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/uk_weather_com.xml new/cwp-1.9.0/data/uk_weather_com.xml --- old/cwp-1.8.2/data/uk_weather_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/uk_weather_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -27,8 +27,8 @@ /> <data_sun url="urlc" - sunrise="grep -A18 Sunrise | grep \:" - sunset="grep -A18 Sunset | grep \:" + sunrise="grep -A25 \<dt\>Sunrise | grep \:" + sunset="grep -A25 \<dt\>Sunset | grep \:" /> <data_current_temperature url="urlc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/wetter_com.xml new/cwp-1.9.0/data/wetter_com.xml --- old/cwp-1.8.2/data/wetter_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/wetter_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -2,7 +2,7 @@ <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> <urlc urlc_prefix="http://www.wetter.com/wetter_aktuell/aktuelles_wetter/deutschland/"; urlc_suffix=".html" urlc_follow="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/www_accuweather_com_us_celsius.xml new/cwp-1.9.0/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.8.2/data/www_accuweather_com_us_celsius.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/www_accuweather_com_us_celsius.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="phoenix-az/85003/weather-forecast/346935" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="phoenix-az/85003/weather-forecast/346935" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.9.0/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.8.2/data/www_accuweather_com_us_fahrenheit.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/www_accuweather_com_us_fahrenheit.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="phoenix-az/85003/weather-forecast/346935" unit="F" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="phoenix-az/85003/weather-forecast/346935" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/www_accuweather_com_world_celsius.xml new/cwp-1.9.0/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.8.2/data/www_accuweather_com_world_celsius.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/www_accuweather_com_world_celsius.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.accuweather.com World" search_page="http://www.accuweather.com"; example_zip="za/johannesburg/305448/weather-forecast/305448" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.accuweather.com World" search_page="http://www.accuweather.com"; example_zip="za/johannesburg/305448/weather-forecast/305448" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.9.0/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.8.2/data/www_accuweather_com_world_fahrenheit.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/www_accuweather_com_world_fahrenheit.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.accuweather.com World" search_page="http://www.accuweather.com"; example_zip="za/johannesburg/305448/weather-forecast/305448" unit="F" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.accuweather.com World" search_page="http://www.accuweather.com"; example_zip="za/johannesburg/305448/weather-forecast/305448" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/www_gismeteo_com.xml new/cwp-1.9.0/data/www_gismeteo_com.xml --- old/cwp-1.8.2/data/www_gismeteo_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/www_gismeteo_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -33,28 +33,28 @@ <data_current_temperature url="urlc" update_time="grep icon\ date | sed -e "s/.*icon date[^>]*>[^:]* \([0-9]\+:[0-9]\+\).*/\1/" | awk '{if ($1 ~ /^[0-9]+:[0-9]+$/) {print} else {print "N.A."} ; }'" - temperature="grep -A 68 id=\"weather\" | tail -n 40 | grep "temp c" | sed -e "s/&minus;/-/" | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^-0-9]\([-0-9]\+\)&deg.*/\1/"" + temperature="grep -A 68 id=\"weather\" | tail -n 55 | grep "temp c" | sed -e "s/&minus;/-/" | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^-0-9]\([-0-9]\+\)&deg.*/\1/"" temperature_felt="echo -n" /> <data_current_wind url="urlc" - wind="grep -A 68 id=\"weather\" | tail -n 40 | grep -A 4 wicon | tr -d '\r' | tr -d '\n' | sed -e "s/.*wind ms[^>]*>\([^<]*\)<[^<]*class=.unit[^>]>\([^<]*\)<.*<dt>\([^<]*\)<.*/\3 - \1 \2/"" - wind_code="grep -A 68 id=\"weather\" | tail -n 40 | grep -A 4 wicon | tr -d '\r' | tr -d '\n' | sed -e "s/.*wind ms[^>]*>\([^<]*\)<[^<]*class=.unit[^>]>\([^<]*\)<.*<dt>\([^<]*\)<.*/\3/"" - wind_speed="grep -A 68 id=\"weather\" | tail -n 40 | grep "wind ms" | sed -e "s/.*class=.value[^>]*>\([^<]*\)<.*class=.unit[^>]*>\([^<]*\)<.*/\1 \2/"" + wind="grep -A 68 id=\"weather\" | tail -n 55 | grep -A 4 wicon | tr -d '\r' | tr -d '\n' | sed -e "s/.*wind ms[^>]*>\([^<]*\)<[^<]*class=.unit[^>]>\([^<]*\)<.*<dt>\([^<]*\)<.*/\3 - \1 \2/"" + wind_code="grep -A 68 id=\"weather\" | tail -n 55 | grep -A 4 wicon | tr -d '\r' | tr -d '\n' | sed -e "s/.*wind ms[^>]*>\([^<]*\)<[^<]*class=.unit[^>]>\([^<]*\)<.*<dt>\([^<]*\)<.*/\3/"" + wind_speed="grep -A 68 id=\"weather\" | tail -n 55 | grep "wind ms" | sed -e "s/.*class=.value[^>]*>\([^<]*\)<.*class=.unit[^>]*>\([^<]*\)<.*/\1 \2/"" /> <data_current_icon url="urlc" - icon="grep -A 68 id=\"weather\" | tail -n 40 | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/"" - icon_code="grep -A 68 id=\"weather\" | tail -n 40 | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" - icon_text="grep -A 68 id=\"weather\" | tail -n 40 | grep -A 1 background-image | tail -n 1 | sed -e "s/<[^>]*>//g"" + icon="grep -A 68 id=\"weather\" | tail -n 65 | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/"" + icon_code="grep -A 68 id=\"weather\" | tail -n 65 | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'" + icon_text="grep -A 68 id=\"weather\" | tail -n 65 | grep -A 1 background-image | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_current_additional url="urlc" - humidity="grep -A 68 id=\"weather\" | tail -n 40 | grep hum | sed -e "s/<[^>]*>//g" | sed -e "s/&nbsp;/ /"" + humidity="grep -A 68 id=\"weather\" | tail -n 55 | grep hum | sed -e "s/<[^>]*>//g" | sed -e "s/&nbsp;/ /"" rain="echo -n" dew_point="echo -n" visibility="echo -n" - pressure="grep -A 68 id=\"weather\" | tail -n 40 | grep "press tor" | sed -e "s/<[^>]*>//g"" + pressure="grep -A 68 id=\"weather\" | tail -n 55 | grep "press tor" | sed -e "s/<[^>]*>//g"" uv_index="echo -n" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/www_weather_com.cn.xml new/cwp-1.9.0/data/www_weather_com.cn.xml --- old/cwp-1.8.2/data/www_weather_com.cn.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/www_weather_com.cn.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/data/www_weather_com.xml new/cwp-1.9.0/data/www_weather_com.xml --- old/cwp-1.8.2/data/www_weather_com.xml 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/data/www_weather_com.xml 2013-11-05 22:37:56.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2013-09-19" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2013-11-05" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/plasma-applet-cwp.desktop new/cwp-1.9.0/plasma-applet-cwp.desktop --- old/cwp-1.8.2/plasma-applet-cwp.desktop 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/plasma-applet-cwp.desktop 2013-11-05 22:37:56.000000000 +0100 @@ -30,7 +30,7 @@ X-KDE-PluginInfo-Author=Georg Hennig [email protected] X-KDE-PluginInfo-Name=plasma_applet_cwp -X-KDE-PluginInfo-Version=1.8.2 +X-KDE-PluginInfo-Version=1.9.0 X-KDE-PluginInfo-Website=http://www.kde-look.org/content/show.php/show.php?content=98925 X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Depends= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.8.2/version.h new/cwp-1.9.0/version.h --- old/cwp-1.8.2/version.h 2013-09-19 22:33:42.000000000 +0200 +++ new/cwp-1.9.0/version.h 2013-11-05 22:37:56.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.8.2" +#define VERSION "1.9.0" #define DATE "2009-2013" #define AUTHOR "Georg Hennig" #define NAME "Customizable Weather Plasmoid (CWP)" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
