1 files changed, 16 insertions, 150 deletions

diff --git a/lib/DBInfoscreen/Helper/Wagonorder.pm b/lib/DBInfoscreen/Helper/Wagonorder.pm
index dbae538..5cdee40 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
 
@@ -24,161 +24,21 @@ 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;
-
-	my $cache = $self->{main_cache};
-
-	if ( my $content = $cache->get($url) ) {
-		if ($content) {
-			return $promise->resolve($content);
-		}
-		else {
-			return $promise->reject;
-		}
-	}
-
-	$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) ) {
-		if ( $content eq 'y' ) {
-			return $promise->resolve;
-		}
-		else {
-			return $promise->reject;
-		}
-	}
-
-	$self->{user_agent}->request_timeout(5)->head_p( $url => $self->{header} )
-	  ->then(
-		sub {
-			my ($tx) = @_;
-			if ( $tx->result->is_success ) {
-				$cache->set( $url, 'y' );
-				$promise->resolve;
-			}
-			else {
-				$cache->set( $url, 'n' );
-				$promise->reject;
-			}
-			return;
-		}
-	)->catch(
-		sub {
-			$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 ) = @_;
-
-	return $self->get_dbdb_p(
-		"https://lib.finalrewind.org/dbdb/has_wagonorder/${train_no}/${wr_link}"
-	);
-}
-
 sub get_p {
 	my ( $self, $train_no, $api_ts ) = @_;
 
 	my $url
 	  = "https://ist-wr.noncd.db.de/wagenreihung/1.0/${train_no}/${api_ts}";
 
-	if (
-		my $content = $self->{main_cache}->get(
-"https://lib.finalrewind.org/dbdb/has_wagonorder/${train_no}/${api_ts}"
-		)
-	  )
-	{
-		if ( $content !~ m{i} and $content =~ m{a} ) {
-			$url
-			  = "https://www.apps-bahn.de/wr/wagenreihung/1.0/${train_no}/${api_ts}";
-		}
-	}
-
 	my $cache = $self->{realtime_cache};
 
 	my $promise = Mojo::Promise->new;
 
 	if ( my $content = $cache->thaw($url) ) {
-		$self->{log}->debug("GET $url (cached)");
+		$self->{log}->debug("wagonorder->get_p($url): cached");
+		if ( $content->{error} ) {
+			return $promise->reject($content);
+		}
 		return $promise->resolve($content);
 	}
 
@@ -188,15 +48,21 @@ sub get_p {
 			my ($tx) = @_;
 
 			if ( my $err = $tx->error ) {
-				$self->{log}->warn(
+				my $json = {
+					error => {
+						id  => $err->{code},
+						msg => $err->{message}
+					}
+				};
+				$self->{log}->debug(
 					"wagonorder->get_p($url): HTTP $err->{code} $err->{message}"
 				);
-				$promise->reject(
-					"GET $url returned HTTP $err->{code} $err->{message}");
+				$cache->freeze( $url, $json );
+				$promise->reject($json);
 				return;
 			}
 
-			$self->{log}->debug("GET $url (OK)");
+			$self->{log}->debug("wagonorder->get_p($url): OK");
 			my $json = $tx->res->json;
 
 			$cache->freeze( $url, $json );
@@ -206,7 +72,7 @@ sub get_p {
 	)->catch(
 		sub {
 			my ($err) = @_;
-			$self->{log}->warn("GET $url: $err");
+			$self->{log}->warn("wagonorder->get_p($url): $err");
 			$promise->reject("GET $url: $err");
 			return;
 		}