Unverified Commit 0fdc2e67 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

bin/hafas-m: remove --url support

parent bd863926
Loading
Loading
Loading
Loading
+3 −21
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ my ( $date, $time );
my $arrivals = 0;
my $types    = q{};
my $developer_mode;
my ( $list_services, $service, $hafas_url );
my ( $list_services, $service );
my ( @excluded_mots, @exclusive_mots );

my @output;
@@ -34,7 +34,6 @@ GetOptions(
	'm|mot=s'     => \$types,
	's|service=s' => \$service,
	't|time=s'    => \$time,
	'u|url=s'     => \$hafas_url,
	'V|version'   => \&show_version,
	'devmode'     => \$developer_mode,
	'list'        => \$list_services,
@@ -58,7 +57,6 @@ my %opt = (
	arrivals       => $arrivals,
	developer_mode => $developer_mode,
	service        => $service,
	url            => $hafas_url,
);

if ( $opt{station} =~ m{[|]} ) {
@@ -124,16 +122,9 @@ sub parse_mot_options {

	my $default_yes = 1;

	if ( $types and $hafas_url ) {
		say STDERR 'The options -u and -m cannot be combined. Discarding -m';
		return;
	}

	for my $type ( split( qr{,}, $types ) ) {
		if ( $type eq 'help' or $type eq 'list' or $type eq q{?} ) {
			if ( not $hafas_url ) {
			$service //= 'DB';
			}
			my $desc = Travel::Status::DE::HAFAS::get_service($service);
			if ($desc) {
				my @mots = @{ $desc->{productbits} };
@@ -329,8 +320,7 @@ Date to list departures for. Default: today.
=item B<--list>

List known HAFAS installations. A HAFAS service from this list can be querie
using B<--service>. Use B<--url> for HAFAS entrypoints not included in the
list (and consider notifying me so I can include them in the next release).
using B<--service>.

=item B<-m>, B<--mot> I<motlist>

@@ -344,9 +334,6 @@ To show them exclusively, set I<motlist> to I<mot1>,I<mot2>,...

The I<mot> types depend on the used service. Use C<< -m help >> to list them.

This option is not available when the HAFAS entrypoint has been specified via
B<--url>.

=item B<-s>, B<--service> I<service>

Request arrivals/departures using the API provided by I<service>, defaults
@@ -356,11 +343,6 @@ to DB (Deutsche Bahn). See B<--list> for a list of known services.

Time to list departures for.  Default: now.

=item B<-u>, B<--url> I<url>

Request arrivals/departures using the API entry point at I<url>.
Note that B<--mot> will not work when using this opton.

=item B<-V>, B<--version>

Show version information.