From 201a0e569d65dc8ab9984f3882b53d7cbbe255a2 Mon Sep 17 00:00:00 2001 From: markusbloch <> Date: Mon, 12 Mar 2018 13:45:07 +0000 Subject: [PATCH] FB_CALLMONITOR: new reverse search provider herold.at (Forum: #84280) and 11880.com git-svn-id: https://svn.fhem.de/fhem/trunk@16392 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 + fhem/FHEM/72_FB_CALLMONITOR.pm | 113 ++++++++++++++++++++++++++++++--- 2 files changed, 106 insertions(+), 9 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 77e036b9b..831e30718 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 72_FB_CALLMONITOR: new reverse search provider 11880.com (german) + and herold.at (austrian) - change: 93_DbRep: V7.14.4, increased timeout of special function - feature: 74_Unifi: added set updateClient, encrypt user and password - change: 49_TBot_List: deleteonly lists / internal changes diff --git a/fhem/FHEM/72_FB_CALLMONITOR.pm b/fhem/FHEM/72_FB_CALLMONITOR.pm index 46e308999..c6f8b5c97 100755 --- a/fhem/FHEM/72_FB_CALLMONITOR.pm +++ b/fhem/FHEM/72_FB_CALLMONITOR.pm @@ -65,7 +65,7 @@ FB_CALLMONITOR_Initialize($) "answMachine-is-missed-call:0,1 ". "check-deflections:0,1 ". "reverse-search-cache-file ". - "reverse-search:sortable-strict,phonebook,textfile,dasoertliche.de,search.ch,dasschnelle.at ". + "reverse-search:sortable-strict,phonebook,textfile,dasoertliche.de,11880.com,search.ch,dasschnelle.at,herold.at ". "reverse-search-cache:0,1 ". "reverse-search-phonebook-file ". "reverse-search-text-file ". @@ -626,7 +626,7 @@ FB_CALLMONITOR_reverseSearch($$) my @attr_list = split("(,|\\|)", AttrVal($name, "reverse-search", "")); foreach my $method (@attr_list) - { + { # Using internal phonebook if available and enabled if($method eq "phonebook") { @@ -650,7 +650,7 @@ FB_CALLMONITOR_reverseSearch($$) } # Using user defined textfile - elsif($method eq "textfile") + elsif($method eq "textfile") { if(exists($hash->{helper}{TEXTFILE}) and defined($hash->{helper}{TEXTFILE}{$number})) { @@ -658,7 +658,8 @@ FB_CALLMONITOR_reverseSearch($$) return $hash->{helper}{TEXTFILE}{$number}; } } - elsif($method =~ /^(klicktel.de|dasoertliche.de|dasschnelle.at|search.ch)$/) + + else { # Using Cache if enabled if(AttrVal($name, "reverse-search-cache", "0") eq "1" and defined($hash->{helper}{CACHE}{$number})) @@ -751,6 +752,50 @@ FB_CALLMONITOR_reverseSearch($$) } } + # Ask 11880.com + elsif($method eq "11880.com") + { + unless(($number =~ /^0?[1-9]/ and $country_code eq "0049") or $number =~ /^0049/) + { + Log3 $name, 4, "FB_CALLMONITOR ($name) - skip using 11880.com for reverse search of $number because of non-german number"; + } + else + { + $number =~ s/^0049/0/; # remove country code + Log3 $name, 4, "FB_CALLMONITOR ($name) - using 11880.com for reverse search of $number"; + + $result = GetFileFromURL("https://www.11880.com/suche/".$number."/deutschland", 5, undef, 1); + + if(not defined($result)) + { + Log3 $name, 4, "FB_CALLMONITOR ($name) - unable to retrieve result for reverse search of $number via $method"; + if(AttrVal($name, "reverse-search-cache", "0") eq "1") + { + $status = "timeout"; + undef($result); + } + } + else + { + #Debug($result); + if($result =~ m,

]*itemprop="name"[^>]*>([^<]+)

,) + { + $invert_match = $1; + $invert_match = FB_CALLMONITOR_html2txt($invert_match); + FB_CALLMONITOR_writeToCache($hash, $number, $invert_match); + undef($result); + return $invert_match; + } + elsif(not $result =~ /Leider nichts gefunden/i) + { + Log3 $name, 3, "FB_CALLMONITOR ($name) - the reverse search result for $number could not be extracted from 11880.com. Please contact the FHEM community."; + } + + $status = "unknown"; + } + } + } + # SWITZERLAND ONLY!!! Ask search.ch elsif($method eq "search.ch") { @@ -824,7 +869,7 @@ FB_CALLMONITOR_reverseSearch($$) { unless(($number =~ /^0?[1-9]/ and $country_code eq "0043") or $number =~ /^0043/) { - Log3 $name, 4, "FB_CALLMONITOR ($name) - skip using dasschnelle.at for reverse search of $number because of non-swiss number"; + Log3 $name, 4, "FB_CALLMONITOR ($name) - skip using dasschnelle.at for reverse search of $number because of non-austrian number"; } else { @@ -866,6 +911,56 @@ FB_CALLMONITOR_reverseSearch($$) } } } + + # Austria ONLY!!! Ask herold.at + elsif($method eq "herold.at") + { + unless(($number =~ /^0?[1-9]/ and $country_code eq "0043") or $number =~ /^0043/) + { + Log3 $name, 4, "FB_CALLMONITOR ($name) - skip using herold.at for reverse search of $number because of non-austrian number"; + } + else + { + $number =~ s/^0043/0/; # remove country code + Log3 $name, 4, "FB_CALLMONITOR ($name) - using herold.at for reverse search of $number"; + + $result = GetFileFromURL("https://www.herold.at/gelbe-seiten/telefon_".$number."/", 5, undef, 1); + + if(not defined($result)) + { + Log3 $name, 4, "FB_CALLMONITOR ($name) - unable to retrieve result for reverse search of $number via $method"; + if(AttrVal($name, "reverse-search-cache", "0") eq "1") + { + $status = "timeout"; + undef($result); + } + } + else + { + #Debug($result); + if($result =~ m,data-clickpos="name">([^<]+),) + { + $invert_match = $1; + $invert_match = FB_CALLMONITOR_html2txt($invert_match); + FB_CALLMONITOR_writeToCache($hash, $number, $invert_match); + undef($result); + return $invert_match; + } + elsif($result !~ /Wir konnten zu den eingegebenen Suchkriterien keine Ergebnisse finden/) + { + Log3 $name, 3, "FB_CALLMONITOR ($name) - the reverse search result for $number could not be extracted from herold.at. Please contact the FHEM community."; + } + + $status = "unknown"; + } + } + } + + + else + { + Log3 $name, 3, "FB_CALLMONITOR ($name) - unknown reverse search method $method"; + } } } @@ -2023,7 +2118,7 @@ sub FB_CALLMONITOR_checkNumberForDeflection($$)

Possible values: 0 => disabled, 1 => enabled (answering machine calls will be treated as "missed call").
Default Value is 0 (disabled)

-
  • reverse-search (phonebook,textfile,dasoertliche.de,search.ch,dasschnelle.at)
    • +
  • reverse-search (phonebook,textfile,dasoertliche.de,11880.com,search.ch,dasschnelle.at,herold.at)
    • Enables the reverse searching of the external number (at dial and call receiving). This attribute contains a comma separated list of providers which should be used to reverse search a name to a specific phone number. The reverse search process will try to lookup the name according to the order of providers given in this attribute (from left to right). The first valid result from the given provider order will be used as reverse search result. @@ -2109,7 +2204,7 @@ sub FB_CALLMONITOR_checkNumberForDeflection($$)

    FB_CALLMONITOR