From 84f0562f27cb0811ec3499e023f63498fefae72d Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Wed, 11 Sep 2019 08:42:42 +0200 Subject: [PATCH] add support fpr Meta.pm and little Code changes --- DarkSkyAPI.pm | 10 ++++---- OpenWeatherMapAPI.pm | 60 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/DarkSkyAPI.pm b/DarkSkyAPI.pm index fe35e8e..361fae2 100644 --- a/DarkSkyAPI.pm +++ b/DarkSkyAPI.pm @@ -28,14 +28,14 @@ # ############################################################################### -package wundergroundAPI; +package DarkSkyAPI; use strict; use warnings; use FHEM::Meta; use Data::Dumper; FHEM::Meta::Load(__PACKAGE__); -use version 0.50; our $VERSION = $main::packages{wundergroundAPI}{META}{version}; +use version 0.50; our $VERSION = $main::packages{DarkSkyAPI}{META}{version}; package DarkSkyAPI::Weather; use strict; @@ -772,7 +772,7 @@ sub _CreateForecastRef($) { long => $self->{long}, apiMaintainer => 'Leon Gaultier (CoolTux)', - apiVersion => DarkSkyAPI->VERSION(), + apiVersion => version->parse(DarkSkyAPI->VERSION())->normal, } ); @@ -809,10 +809,10 @@ sub strftimeWrapper(@) { =for :application/json;q=META.json DarkSkyAPI.pm { - "abstract": "Weather API for Weather Dark Sky", + "abstract": "Weather API for Weather DarkSky", "x_lang": { "de": { - "abstract": "Wetter API für Weather Dark Sky" + "abstract": "Wetter API für Weather DarkSky" } }, "version": "v1.0.0", diff --git a/OpenWeatherMapAPI.pm b/OpenWeatherMapAPI.pm index 638e686..da104a0 100644 --- a/OpenWeatherMapAPI.pm +++ b/OpenWeatherMapAPI.pm @@ -32,6 +32,15 @@ # https://api.openweathermap.org/data/2.5/forecast?lat=[lat]&lon=[long]&APPID=[API] Forecast # https://openweathermap.org/weather-conditions Icons und Conditions ID's +package OpenWeatherMapAPI; +use strict; +use warnings; +use FHEM::Meta; +use Data::Dumper; + +FHEM::Meta::Load(__PACKAGE__); +use version 0.50; our $VERSION = $main::packages{OpenWeatherMapAPI}{META}{version}; + package OpenWeatherMapAPI::Weather; use strict; use warnings; @@ -116,7 +125,6 @@ eval "use Encode qw(encode_utf8);1" or $missingModul .= "Encode "; # use Data::Dumper; # for Debug only ## API URL use constant URL => 'https://api.openweathermap.org/data/2.5/'; -use constant VERSION => '1.0.0'; ## URL . 'weather?' for current data ## URL . 'forecast?' for forecast data @@ -598,7 +606,7 @@ sub _CreateForecastRef($) { long => $self->{long}, apiMaintainer => 'Leon Gaultier (CoolTux)', - apiVersion => VERSION, + apiVersion => version->parse(OpenWeatherMapAPI->VERSION())->normal, } ); @@ -627,3 +635,51 @@ sub strftimeWrapper(@) { ############################################################################## 1; + + +=pod + +=encoding utf8 + +=for :application/json;q=META.json OpenWeatherMapAPI.pm +{ + "abstract": "Weather API for Weather OpenWeatherMap", + "x_lang": { + "de": { + "abstract": "Wetter API für OpenWeatherMap" + } + }, + "version": "v1.0.0", + "author": [ + "Marko Oldenburg " + ], + "x_fhem_maintainer": [ + "CoolTux" + ], + "x_fhem_maintainer_github": [ + "LeonGaultier" + ], + "prereqs": { + "runtime": { + "requires": { + "FHEM::Meta": 0, + "HttpUtils": 0, + "strict": 0, + "warnings": 0, + "constant": 0, + "POSIX": 0, + "JSON::PP": 0 + }, + "recommends": { + "JSON": 0 + }, + "suggests": { + "JSON::XS": 0, + "Cpanel::JSON::XS": 0 + } + } + } +} +=end :application/json;q=META.json + +=cut