diff options
Diffstat (limited to 'lib/DBInfoscreen/Helper/Wagonorder.pm')
| -rw-r--r-- | lib/DBInfoscreen/Helper/Wagonorder.pm | 207 |
1 files changed, 40 insertions, 167 deletions
diff --git a/lib/DBInfoscreen/Helper/Wagonorder.pm b/lib/DBInfoscreen/Helper/Wagonorder.pm index 469eda6..9981244 100644 --- a/lib/DBInfoscreen/Helper/Wagonorder.pm +++ b/lib/DBInfoscreen/Helper/Wagonorder.pm @@ -1,6 +1,6 @@ package DBInfoscreen::Helper::Wagonorder; -# Copyright (C) 2011-2020 Daniel Friesel +# Copyright (C) 2011-2020 Birte Kristina Friesel # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -8,6 +8,7 @@ use strict; use warnings; use 5.020; +use DateTime; use Mojo::Promise; sub new { @@ -24,181 +25,51 @@ sub new { } -sub is_available_p { - my ( $self, $train, $wr_link ) = @_; - my $promise = Mojo::Promise->new; - - $self->check_wagonorder_p( $train->train_no, $wr_link )->then( - sub { - my ($body) = @_; - $promise->resolve($body); - return; - }, - sub { - if ( $train->is_wing ) { - my $wing = $train->wing_of; - return $self->check_wagonorder_p( $wing->train_no, $wr_link ); - } - else { - $promise->reject; - return; - } - } - )->then( - sub { - my ($body) = @_; - $promise->resolve($body); - return; - }, - sub { - $promise->reject; - return; - } - )->wait; - - return $promise; -} - -sub get_dbdb_p { - my ( $self, $url ) = @_; - - my $promise = Mojo::Promise->new; +sub get_p { + my ( $self, %opt ) = @_; - my $cache = $self->{main_cache}; + my %param; - if ( my $content = $cache->get($url) ) { - if ($content) { - return $promise->resolve($content); - } - else { - return $promise->reject; - } + if ( $opt{param} ) { + %param = %{ $opt{param} }; + delete $param{e}; } - - $self->{user_agent}->request_timeout(5)->get_p( $url => $self->{header} ) - ->then( - sub { - my ($tx) = @_; - if ( $tx->result->is_success ) { - my $body = $tx->result->body; - $cache->set( $url, $body ); - $promise->resolve($body); - } - else { - $cache->set( $url, q{} ); - $promise->reject; - } - return; - } - )->catch( - sub { - $cache->set( $url, q{} ); - $promise->reject; - return; - } - )->wait; - return $promise; -} - -sub head_dbdb_p { - my ( $self, $url ) = @_; - - my $promise = Mojo::Promise->new; - - my $cache = $self->{main_cache}; - - if ( my $content = $cache->get($url) ) { - $self->{log}->debug("wagonorder->head_dbdb_p($url): cached ($content)"); - if ( $content eq 'y' ) { - return $promise->resolve; - } - else { - return $promise->reject; - } + else { + my $datetime = $opt{datetime}->clone->set_time_zone('UTC'); + %param = ( + administrationId => 80, + category => $opt{train_type}, + date => $datetime->strftime('%Y-%m-%d'), + evaNumber => $opt{eva}, + number => $opt{train_number}, + time => $datetime->rfc3339 =~ s{(?=Z)}{.000}r + ); } - $self->{user_agent}->request_timeout(5)->head_p( $url => $self->{header} ) - ->then( - sub { - my ($tx) = @_; - if ( $tx->result->is_success ) { - $self->{log}->debug("wagonorder->head_dbdb_p($url): y"); - $cache->set( $url, 'y' ); - $promise->resolve; - } - else { - $self->{log}->debug("wagonorder->head_dbdb_p($url): n"); - $cache->set( $url, 'n' ); - $promise->reject; - } - return; - } - )->catch( - sub { - $self->{log}->debug("wagonorder->head_dbdb_p($url): n"); - $cache->set( $url, 'n' ); - $promise->reject; - return; - } - )->wait; - return $promise; -} - -sub has_cycle_p { - my ( $self, $train_no ) = @_; - - return $self->head_dbdb_p( - "https://lib.finalrewind.org/dbdb/db_umlauf/${train_no}.svg"); -} - -sub check_wagonorder_p { - my ( $self, $train_no, $wr_link ) = @_; + my $url = sprintf( '%s?%s', +'https://www.bahn.de/web/api/reisebegleitung/wagenreihung/vehicle-sequence', + join( '&', map { $_ . '=' . $param{$_} } sort keys %param ) ); my $promise = Mojo::Promise->new; - $self->head_dbdb_p( - "https://lib.finalrewind.org/dbdb/has_wagonorder/${train_no}/${wr_link}" - )->then( - sub { - $promise->resolve; - return; - } - )->catch( - sub { - $self->get_p( $train_no, $wr_link )->then( - sub { - $promise->resolve; - return; - } - )->catch( - sub { - $promise->reject; - return; - } - )->wait; - return; + if ( my $content = $self->{main_cache}->thaw($url) ) { + $self->{log}->debug("wagonorder->get_p($url): cached"); + if ( $content->{error} ) { + return $promise->reject( +"GET $url: HTTP $content->{error}{code} $content->{error}{message} (cachd)" + ); } - )->wait; - - return $promise; -} - -sub get_p { - my ( $self, $train_no, $api_ts ) = @_; - - my $url - = "https://www.apps-bahn.de/wr/wagenreihung/1.0/${train_no}/${api_ts}"; - - my $cache = $self->{realtime_cache}; - - my $promise = Mojo::Promise->new; + return $promise->resolve( $content, \%param ); + } - if ( my $content = $cache->thaw($url) ) { + if ( my $content = $self->{realtime_cache}->thaw($url) ) { $self->{log}->debug("wagonorder->get_p($url): cached"); if ( $content->{error} ) { - return $promise->reject($content); + return $promise->reject( +"GET $url: HTTP $content->{error}{code} $content->{error}{message} (cachd)" + ); } - return $promise->resolve($content); + return $promise->resolve( $content, \%param ); } $self->{user_agent}->request_timeout(10)->get_p( $url => $self->{header} ) @@ -216,16 +87,18 @@ sub get_p { $self->{log}->debug( "wagonorder->get_p($url): HTTP $err->{code} $err->{message}" ); - $cache->freeze( $url, $json ); - $promise->reject($json); + $self->{realtime_cache}->freeze( $url, $json ); + $promise->reject("GET $url: HTTP $err->{code} $err->{message}"); return; } $self->{log}->debug("wagonorder->get_p($url): OK"); my $json = $tx->res->json; + $json->{ts} = DateTime->now( time_zone => 'Europe/Berlin' ) + ->strftime('%d.%m.%Y %H:%M'); - $cache->freeze( $url, $json ); - $promise->resolve($json); + $self->{main_cache}->freeze( $url, $json ); + $promise->resolve( $json, \%param ); return; } )->catch( |