Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2015-02-03 11:40:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-15 08:52:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2015-02-03 11:40:19.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 30 22:09:27 UTC 2015 - [email protected] + +- Update to version 1.12.0: + * xml: removed www.weather.com support because the website is unparsable now + * xml: splitted openweathermap.org into celsius and fahrenheit versions + * modifications for locating correct data path + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.11.1.tar.bz2 New: ---- 98925-cwp-1.12.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.9Gkz6d/_old 2015-02-03 11:40:20.000000000 +0100 +++ /var/tmp/diff_new_pack.9Gkz6d/_new 2015-02-03 11:40:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package plasmoid-cwp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2009 Buschmann <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: plasmoid-cwp -Version: 1.11.1 +Version: 1.12.0 Release: 0 Summary: Customizable Weather Plasmoid License: GPL-3.0+ ++++++ 98925-cwp-1.11.1.tar.bz2 -> 98925-cwp-1.12.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/CMakeLists.txt new/cwp-1.12.0/CMakeLists.txt --- old/cwp-1.11.1/CMakeLists.txt 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/CMakeLists.txt 2014-11-22 10:03:27.000000000 +0100 @@ -46,7 +46,6 @@ data/fr_weather_com.xml data/in_weather_com.xml data/uk_weather_com.xml - data/www_weather_com.xml data/wetter_com.xml data/www_weather_com.cn.xml data/myforecast_com_celsius.xml @@ -58,7 +57,8 @@ data/ilmeteo_it.xml data/pogodynka_pl.xml data/www_gismeteo_com.xml - data/openweathermap_org.xml + data/openweathermap_org_celsius.xml + data/openweathermap_org_fahrenheit.xml data/satellite_images.xml DESTINATION ${DATA_INSTALL_DIR}/plasma-cwp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/ChangeLog new/cwp-1.12.0/ChangeLog --- old/cwp-1.11.1/ChangeLog 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/ChangeLog 2014-11-22 10:04:22.000000000 +0100 @@ -1,3 +1,9 @@ +1.12.0 +====== +- xml: removed www.weather.com support because the website is unparsable now +- xml: splitted openweathermap.org into celsius and fahrenheit versions +- modifications for locating correct data path + 1.11.1 ====== - xml: br.weather.com: location fixed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/README new/cwp-1.12.0/README --- old/cwp-1.11.1/README 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/README 2014-11-22 10:03:27.000000000 +0100 @@ -1,5 +1,5 @@ ========================================== -Customizable Weather Plasmoid (CWP) 1.11.1 +Customizable Weather Plasmoid (CWP) 1.12.0 ========================================== This is another weather plasmoid. @@ -10,7 +10,6 @@ For now, xml files for the weather providers -www.weather.com (°F) (city identifier example: USDC0001) br.weather.com (°C) (city identifier example: BRXX0043) de.weather.com (°C) (city identifier example: 80331 or UKXX0085) espanol.weather.com (°C) (city identifier example: Ciudad-de-Mexico-MXDF0132) @@ -29,6 +28,7 @@ pogodynka.pl (°C) (city identifier example: Warszawa) www.gismeteo.com (°C) (city identifier example: 4944) openweathermap.org (°C) (city identifier example: id=2643743 or q=London,UK) +openweathermap.org (°F) (city identifier example: id=5506956 or q=Las Vegas,US) 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.11.1/data/br_weather_com.xml new/cwp-1.12.0/data/br_weather_com.xml --- old/cwp-1.11.1/data/br_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/br_weather_com.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043:1:BR" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/de_weather_com.xml new/cwp-1.12.0/data/de_weather_com.xml --- old/cwp-1.11.1/data/de_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/de_weather_com.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="de.weather.com" search_page="http://de.weather.com"; example_zip="GMXX0087:1:GM" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/espanol_weather_com.xml new/cwp-1.12.0/data/espanol_weather_com.xml --- old/cwp-1.11.1/data/espanol_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/espanol_weather_com.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/data/fr_weather_com.xml new/cwp-1.12.0/data/fr_weather_com.xml --- old/cwp-1.11.1/data/fr_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/fr_weather_com.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="FRXX0076:1:FR" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/ilmeteo_it.xml new/cwp-1.12.0/data/ilmeteo_it.xml --- old/cwp-1.11.1/data/ilmeteo_it.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/ilmeteo_it.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/in_weather_com.xml new/cwp-1.12.0/data/in_weather_com.xml --- old/cwp-1.11.1/data/in_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/in_weather_com.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/data/myforecast_com_celsius.xml new/cwp-1.12.0/data/myforecast_com_celsius.xml --- old/cwp-1.11.1/data/myforecast_com_celsius.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/myforecast_com_celsius.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/myforecast_com_fahrenheit.xml new/cwp-1.12.0/data/myforecast_com_fahrenheit.xml --- old/cwp-1.11.1/data/myforecast_com_fahrenheit.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/myforecast_com_fahrenheit.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/openweathermap_org.xml new/cwp-1.12.0/data/openweathermap_org.xml --- old/cwp-1.11.1/data/openweathermap_org.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/openweathermap_org.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,197 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> - -<custom_weather> - <xml_file_version type="cwp" version="2014-09-06" 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)%16)}'" - 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.11.1/data/openweathermap_org_celsius.xml new/cwp-1.12.0/data/openweathermap_org_celsius.xml --- old/cwp-1.11.1/data/openweathermap_org_celsius.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/cwp-1.12.0/data/openweathermap_org_celsius.xml 2014-11-22 10:03:27.000000000 +0100 @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> + +<custom_weather> + <xml_file_version type="cwp" version="2014-11-22" 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)%16)}'" + 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.11.1/data/openweathermap_org_fahrenheit.xml new/cwp-1.12.0/data/openweathermap_org_fahrenheit.xml --- old/cwp-1.11.1/data/openweathermap_org_fahrenheit.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/cwp-1.12.0/data/openweathermap_org_fahrenheit.xml 2014-11-22 10:03:27.000000000 +0100 @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> + +<custom_weather> + <xml_file_version type="cwp" version="2014-11-22" name="openweathermap.org" search_page="http://www.openweathermap.org"; example_zip="id=5506956 or q=Las Vegas,US" unit="F" /> + + <locale_settings locale="utf-8" encoding="utf8" /> + + <urlc urlc_prefix="http://api.openweathermap.org/data/2.5/weather?"; urlc_suffix="&units=imperial" urlc_follow="" /> + + <url1 url1_prefix="http://api.openweathermap.org/data/2.5/forecast/daily?"; url1_suffix="&cnt=7&units=imperial" 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)%16)}'" + 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.11.1/data/pogodynka_pl.xml new/cwp-1.12.0/data/pogodynka_pl.xml --- old/cwp-1.11.1/data/pogodynka_pl.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/pogodynka_pl.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/satellite_images.xml new/cwp-1.12.0/data/satellite_images.xml --- old/cwp-1.11.1/data/satellite_images.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/satellite_images.xml 2014-11-22 10:03:27.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="2014-09-06" /> + <xml_file_version type="cwp_satellite_images" version="2014-11-22" /> <!--Global--> <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/data/uk_weather_com.xml new/cwp-1.12.0/data/uk_weather_com.xml --- old/cwp-1.11.1/data/uk_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/uk_weather_com.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/data/wetter_com.xml new/cwp-1.12.0/data/wetter_com.xml --- old/cwp-1.11.1/data/wetter_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/wetter_com.xml 2014-11-22 10:03:27.000000000 +0100 @@ -2,7 +2,7 @@ <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/www_accuweather_com_us_celsius.xml new/cwp-1.12.0/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.11.1/data/www_accuweather_com_us_celsius.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/www_accuweather_com_us_celsius.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" 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="2014-11-22" 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.11.1/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.12.0/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.11.1/data/www_accuweather_com_us_fahrenheit.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/www_accuweather_com_us_fahrenheit.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" 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="2014-11-22" 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.11.1/data/www_accuweather_com_world_celsius.xml new/cwp-1.12.0/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.11.1/data/www_accuweather_com_world_celsius.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/www_accuweather_com_world_celsius.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" 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="2014-11-22" 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.11.1/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.12.0/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.11.1/data/www_accuweather_com_world_fahrenheit.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/www_accuweather_com_world_fahrenheit.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" 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="2014-11-22" 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.11.1/data/www_gismeteo_com.xml new/cwp-1.12.0/data/www_gismeteo_com.xml --- old/cwp-1.11.1/data/www_gismeteo_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/www_gismeteo_com.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/data/www_weather_com.cn.xml new/cwp-1.12.0/data/www_weather_com.cn.xml --- old/cwp-1.11.1/data/www_weather_com.cn.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/www_weather_com.cn.xml 2014-11-22 10:03:27.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2014-11-22" 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.11.1/data/www_weather_com.xml new/cwp-1.12.0/data/www_weather_com.xml --- old/cwp-1.11.1/data/www_weather_com.xml 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/data/www_weather_com.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,195 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> - -<custom_weather> - <xml_file_version type="cwp" version="2014-09-06" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" /> - - <locale_settings locale="utf-8" encoding="utf8" /> - - <urlc urlc_prefix="http://www.weather.com/weather/right-now/"; urlc_suffix="" urlc_follow="" /> - - <url1 url1_prefix="http://www.weather.com/weather/tenday/"; url1_suffix="" url1_follow="" /> - - <url2 url2_prefix="http://www.weather.com/weather/today/"; 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="url1" - location="grep \"city\" | sed -e "s/.*\"city\":\"\([^\"]*\)\".*/\1/"" - country="grep \"state\" | sed -e "s/.*\"state\":\"\([^\"]*\)\".*/\1/" | tr '[:lower:]' '[:upper:]'" - /> - - <data_sun url="urlc" - sunrise="grep -A 1 Sunrise: | head -n 2 | tail -n 1 | sed -e "s/[^>]*>\([^<]*\).*/\1/"" - sunset="grep -A 1 Sunset: | head -n 2 | tail -n 1 | sed -e "s/[^>]*>\([^<]*\).*/\1/"" - /> - - <data_current_temperature url="urlc" - update_time="grep -A 18 Updated: | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/<[^>]*>//g" | sed -e "s/.*Updated:.* \([0-9]*:*[0-9]*[ap]m\).*/\1/"" - temperature="grep \"realTemp\" | sed -e "s/.*\"realTemp\":\"*\([-0-9]*\).*/\1/"" - temperature_felt="grep feels-like-temperature-fahrenheit | sed -e "s/.*feels-like-temperature-fahrenheit[^>]*>\([-0-9]*\).*/\1/"" - /> - - <data_current_wind url="urlc" - wind_code="grep wx-wind-label | sed -e "s/<[^>]*>//g" | sed -e "s/\([^ ]*\).*/\1/"" - wind="grep wx-wind-label | sed -e "s/<[^>]*>//g"" - wind_speed="grep wx-wind-label | sed -e "s/<[^>]*>//g" | sed -e "s/[^ ]* at \([0-9C]\+.*\)/\1/"" - /> - - <data_current_icon url="urlc" - icon="grep wx-weather-icon\" | head -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/"" - icon_code="grep wx-weather-icon\" | head -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([0-9]*\)\.png/\1/"" - icon_text="grep wx-phrase\ *\" | sed -e "s/.*wx-phrase\s*\"[^>]*>\([^<]*\).*/\1/"" - /> - - <data_current_additional url="urlc" - humidity="grep \"relativeHumidity\" | sed -e "s/.*\"relativeHumidity\":\"*\([0-9]*\).*/\1 %/"" - rain="echo -n" - dew_point="grep -A 5 Dew\ Point: | head -n 6 | tail -n 1 | sed -e "s/[^0-9]*\([0-9]\+\)&deg.*/\1/"" - visibility="grep -A 1 Visibility: | head -n 2 | tail -n 1 | sed -e "s/[^>]*>\([^<]*\).*/\1/"" - pressure="grep -A 1 barometric-pressure-incheshg | head -n 2 | tail -n 1 | sed -e "s/[^>]*>\([^<]*\).*/\1/"" - uv_index="grep -A 1 UV\ Index: | head -n 2 | tail -n 1 | sed -e "s/[^>]*>\([^<]*\).*/\1/"" - /> - - <data_day1 url="url1" - name="grep -A5 wx-daypart\" | grep \<h3 | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep p\ class=\"wx-temp-alt\" | head -n 1 | tail -n 1 | grep wx-temp-alt\" | sed -e "s/.*wx-temp-alt\"> *\([-0-9]*\).*/\1/"" - temperature_high="grep p\ class=\"wx-temp\" | head -n 1 | tail -n 1 | sed -e "s/.*wx-temp\"> *\([-0-9]*\).*/\1/"" - icon="grep wxicon\/ | grep height=\"70 | head -n 1 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/"" - icon_code="grep wxicon\/ | grep height=\"70 | head -n 1 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([0-9]*\)\.png/\1/"" - icon_text="grep wx-phrase\" | head -n 1 | tail -n 1 | sed -e "s/.*wx-phrase\">\([^<]*\).*/\1/"" - /> - - <data_day2 url="url1" - name="grep -A5 wx-daypart\" | grep \<h3 | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep p\ class=\"wx-temp-alt\" | head -n 2 | tail -n 1 | grep wx-temp-alt\" | sed -e "s/.*wx-temp-alt\"> *\([-0-9]*\).*/\1/"" - temperature_high="grep p\ class=\"wx-temp\" | head -n 2 | tail -n 1 | sed -e "s/.*wx-temp\"> *\([-0-9]*\).*/\1/"" - icon="grep wxicon\/ | grep height=\"70 | head -n 2 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/"" - icon_code="grep wxicon\/ | grep height=\"70 | head -n 2 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([0-9]*\)\.png/\1/"" - icon_text="grep wx-phrase\" | head -n 2 | tail -n 1 | sed -e "s/.*wx-phrase\">\([^<]*\).*/\1/"" - /> - - <data_day3 url="url1" - name="grep -A5 wx-daypart\" | grep \<h3 | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep p\ class=\"wx-temp-alt\" | head -n 3 | tail -n 1 | grep wx-temp-alt\" | sed -e "s/.*wx-temp-alt\"> *\([-0-9]*\).*/\1/"" - temperature_high="grep p\ class=\"wx-temp\" | head -n 3 | tail -n 1 | sed -e "s/.*wx-temp\"> *\([-0-9]*\).*/\1/"" - icon="grep wxicon\/ | grep height=\"70 | head -n 3 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/"" - icon_code="grep wxicon\/ | grep height=\"70 | head -n 3 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([0-9]*\)\.png/\1/"" - icon_text="grep wx-phrase\" | head -n 3 | tail -n 1 | sed -e "s/.*wx-phrase\">\([^<]*\).*/\1/"" - /> - - <data_day4 url="url1" - name="grep -A5 wx-daypart\" | grep \<h3 | head -n 4 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep p\ class=\"wx-temp-alt\" | head -n 4 | tail -n 1 | grep wx-temp-alt\" | sed -e "s/.*wx-temp-alt\"> *\([-0-9]*\).*/\1/"" - temperature_high="grep p\ class=\"wx-temp\" | head -n 4 | tail -n 1 | sed -e "s/.*wx-temp\"> *\([-0-9]*\).*/\1/"" - icon="grep wxicon\/ | grep height=\"70 | head -n 4 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/"" - icon_code="grep wxicon\/ | grep height=\"70 | head -n 4 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([0-9]*\)\.png/\1/"" - icon_text="grep wx-phrase\" | head -n 4 | tail -n 1 | sed -e "s/.*wx-phrase\">\([^<]*\).*/\1/"" - /> - - <data_day5 url="url1" - name="grep -A5 wx-daypart\" | grep \<h3 | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep p\ class=\"wx-temp-alt\" | head -n 5 | tail -n 1 | grep wx-temp-alt\" | sed -e "s/.*wx-temp-alt\"> *\([-0-9]*\).*/\1/"" - temperature_high="grep p\ class=\"wx-temp\" | head -n 5 | tail -n 1 | sed -e "s/.*wx-temp\"> *\([-0-9]*\).*/\1/"" - icon="grep wxicon\/ | grep height=\"70 | head -n 5 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/"" - icon_code="grep wxicon\/ | grep height=\"70 | head -n 5 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([0-9]*\)\.png/\1/"" - icon_text="grep wx-phrase\" | head -n 5 | tail -n 1 | sed -e "s/.*wx-phrase\">\([^<]*\).*/\1/"" - /> - - <data_day6 url="url1" - name="grep -A5 wx-daypart\" | grep \<h3 | head -n 6 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep p\ class=\"wx-temp-alt\" | head -n 6 | tail -n 1 | grep wx-temp-alt\" | sed -e "s/.*wx-temp-alt\"> *\([-0-9]*\).*/\1/"" - temperature_high="grep p\ class=\"wx-temp\" | head -n 6 | tail -n 1 | sed -e "s/.*wx-temp\"> *\([-0-9]*\).*/\1/"" - icon="grep wxicon\/ | grep height=\"70 | head -n 6 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/"" - icon_code="grep wxicon\/ | grep height=\"70 | head -n 6 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([0-9]*\)\.png/\1/"" - icon_text="grep wx-phrase\" | head -n 6 | tail -n 1 | sed -e "s/.*wx-phrase\">\([^<]*\).*/\1/"" - /> - - <data_day7 url="url1" - name="grep -A5 wx-daypart\" | grep \<h3 | head -n 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep p\ class=\"wx-temp-alt\" | head -n 7 | tail -n 1 | grep wx-temp-alt\" | sed -e "s/.*wx-temp-alt\"> *\([-0-9]*\).*/\1/"" - temperature_high="grep p\ class=\"wx-temp\" | head -n 7 | tail -n 1 | sed -e "s/.*wx-temp\"> *\([-0-9]*\).*/\1/"" - icon="grep wxicon\/ | grep height=\"70 | head -n 7 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/"" - icon_code="grep wxicon\/ | grep height=\"70 | head -n 7 | tail -n 1 | sed -e "s/.*src=\"\([^\"]*\).*/\1/" | sed -e "s/.*\/\([0-9]*\)\.png/\1/"" - icon_text="grep wx-phrase\" | head -n 7 | tail -n 1 | sed -e "s/.*wx-phrase\">\([^<]*\).*/\1/"" - /> - - <icon_transform i1="01" o1="01" - i2="02" o2="02" - i3="03" o3="03" - i4="04" o4="04" - i5="05" o5="05" - i6="06" o6="06" - i7="07" o7="07" - i8="08" o8="08" - i9="09" o9="09" - i10="10" o10="10" - i11="11" o11="11" - i12="12" o12="12" - i13="13" o13="13" - i14="14" o14="14" - i15="15" o15="15" - i16="16" o16="16" - i17="17" o17="17" - i18="18" o18="18" - i19="19" o19="19" - i20="20" o20="20" - i21="21" o21="21" - i22="22" o22="22" - i23="23" o23="23" - i24="24" o24="24" - i25="25" o25="25" - i26="26" o26="26" - i27="27" o27="27" - i28="28" o28="28" - i29="29" o29="29" - i30="30" o30="30" - i31="31" o31="31" - i32="32" o32="32" - i33="33" o33="33" - i34="34" o34="34" - i35="35" o35="35" - i36="36" o36="36" - i37="37" o37="37" - i38="38" o38="38" - i39="39" o39="39" - i40="40" o40="40" - i41="41" o41="41" - i42="42" o42="42" - i43="43" o43="43" - i44="44" o44="44" - i45="45" o45="45" - i46="46" o46="46" - i47="47" o47="47" - i48="48" o48="48" - /> - - <wind_transform 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="NNW" o10="NNW" - i11="NW" o11="NW" - i12="WNW" o12="WNW" - i13="W" o13="W" - i14="SSW" o14="SSW" - i15="SW" o15="SW" - i16="WSW" 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.11.1/plasma-applet-cwp.desktop new/cwp-1.12.0/plasma-applet-cwp.desktop --- old/cwp-1.11.1/plasma-applet-cwp.desktop 2014-09-06 00:32:36.000000000 +0200 +++ new/cwp-1.12.0/plasma-applet-cwp.desktop 2014-11-22 10:03:27.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.11.1 +X-KDE-PluginInfo-Version=1.12.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.11.1/plasma-cwp.cpp new/cwp-1.12.0/plasma-cwp.cpp --- old/cwp-1.11.1/plasma-cwp.cpp 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/plasma-cwp.cpp 2014-11-22 10:03:27.000000000 +0100 @@ -114,11 +114,11 @@ preferred_location_list.clear(); xml_data_file_list.clear(); - populateXmlDataFileList( QDir( KGlobal::dirs()->findResourceDir( "data", "plasma-cwp/www_weather_com.xml" ) + "plasma-cwp" ) ); + populateXmlDataFileList( QDir( KGlobal::dirs()->findResourceDir( "data", "plasma-cwp/satellite_images.xml" ) + "plasma-cwp" ) ); populateXmlDataFileList( QDir( KStandardDirs::locateLocal( "data", "cwp/" ) ) ); satellite_images_list.clear(); - populateSatelliteImagesList( QDir( KGlobal::dirs()->findResourceDir( "data", "plasma-cwp/www_weather_com.xml" ) + "plasma-cwp" ) ); + populateSatelliteImagesList( QDir( KGlobal::dirs()->findResourceDir( "data", "plasma-cwp/satellite_images.xml" ) + "plasma-cwp" ) ); populateSatelliteImagesList( QDir( KStandardDirs::locateLocal( "data", "cwp/" ) ) ); background_file_list.clear(); @@ -131,7 +131,7 @@ background_file_tmp.example_zip = ""; background_file_tmp.file_name = ""; background_file_list.append( background_file_tmp ); - populateBackgroundFileList( QDir( KGlobal::dirs()->findResourceDir( "data", "plasma-cwp/www_weather_com.xml" ) + "plasma-cwp" ) ); + populateBackgroundFileList( QDir( KGlobal::dirs()->findResourceDir( "data", "plasma-cwp/satellite_images.xml" ) + "plasma-cwp" ) ); populateBackgroundFileList( QDir( KStandardDirs::locateLocal( "data", "cwp/" ) ) ); if ( size().height() < 150. ) Plasma::ToolTipManager::self()->registerWidget( this ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.11.1/version.h new/cwp-1.12.0/version.h --- old/cwp-1.11.1/version.h 2014-09-06 00:32:37.000000000 +0200 +++ new/cwp-1.12.0/version.h 2014-11-22 10:03:27.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.11.1" +#define VERSION "1.12.0" #define DATE "2009-2014" #define AUTHOR "Georg Hennig" #define NAME "Customizable Weather Plasmoid (CWP)" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
