From 2ca4a50194108d378b961fb8ddc9a0455933d96d Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 16 Sep 2020 17:21:49 +0200
Subject: all requests but IRIS are async now

---
 lib/DBInfoscreen/Controller/Wagenreihung.pm | 43 +----------------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

(limited to 'lib/DBInfoscreen/Controller/Wagenreihung.pm')

diff --git a/lib/DBInfoscreen/Controller/Wagenreihung.pm b/lib/DBInfoscreen/Controller/Wagenreihung.pm
index 7b59227..ecdb129 100644
--- a/lib/DBInfoscreen/Controller/Wagenreihung.pm
+++ b/lib/DBInfoscreen/Controller/Wagenreihung.pm
@@ -4,53 +4,12 @@ use Mojo::Base 'Mojolicious::Controller';
 # Copyright (C) 2011-2019 Daniel Friesel <derf+dbf@finalrewind.org>
 # License: 2-Clause BSD
 
-use Encode qw(decode);
-use JSON;
-use Mojo::Promise;
 use Travel::Status::DE::DBWagenreihung;
 
 my $dbf_version = qx{git describe --dirty} || 'experimental';
 
 chomp $dbf_version;
 
-sub get_wagenreihung_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->app->cache_iris_rt;
-
-	my $promise = Mojo::Promise->new;
-
-	if ( my $content = $cache->thaw($url) ) {
-		$promise->resolve($content);
-		$self->app->log->debug("GET $url (cached)");
-		return $promise;
-	}
-
-	$self->ua->request_timeout(10)
-	  ->get_p( $url, { 'User-Agent' => "dbf.finalrewind.org/${dbf_version}" } )
-	  ->then(
-		sub {
-			my ($tx) = @_;
-			$self->app->log->debug("GET $url (OK)");
-			my $body = decode( 'utf-8', $tx->res->body );
-			my $json = JSON->new->decode($body);
-
-			$cache->freeze( $url, $json );
-			$promise->resolve($json);
-		}
-	)->catch(
-		sub {
-			my ($err) = @_;
-			$self->app->log->debug("GET $url (error: $err)");
-			$promise->reject($err);
-		}
-	)->wait;
-	return $promise;
-}
-
 sub wagenreihung {
 	my ($self)    = @_;
 	my $train     = $self->stash('train');
@@ -58,7 +17,7 @@ sub wagenreihung {
 
 	$self->render_later;
 
-	$self->get_wagenreihung_p( $train, $departure )->then(
+	$self->wagonorder->get_p( $train, $departure )->then(
 		sub {
 			my ($json) = @_;
 			my $wr;
-- 
cgit v1.2.3