xmltv/grab/sd_json tv_grab_sd_json,1.17,1.18

Update of /cvsroot/xmltv/xmltv/grab/sd_json
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22128

Modified Files:
	tv_grab_sd_json 
Log Message:
tv_grab_sd_json: Fix issue with removing a deleted lineup from your account.
    
When your account had a deleted lineup the list of lineups was not shown
correctly and you could not remove the deleted lineup.


Index: tv_grab_sd_json
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/sd_json/tv_grab_sd_json,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tv_grab_sd_json	8 Jul 2016 23:02:17 -0000	1.17
--- tv_grab_sd_json	8 Jul 2016 23:03:48 -0000	1.18
***************
*** 307,316 ****
  sub sd_json_add_lineup {
  	my ($lineup) = @_;
! 	return sd_json_request('put', $lineup);
  }
  
  sub sd_json_delete_lineup {
  	my ($lineup) = @_;
! 	return sd_json_request('delete', $lineup);
  }
  
--- 307,316 ----
  sub sd_json_add_lineup {
  	my ($lineup) = @_;
! 	return sd_json_request('put', "lineups/$lineup");
  }
  
  sub sd_json_delete_lineup {
  	my ($lineup) = @_;
! 	return sd_json_request('delete', "lineups/$lineup");
  }
  
***************
*** 376,382 ****
  	my $transport = $lineup->{'transport'} // 'unknown';
  	my $name      = $lineup->{'name'}      // 'unknown';
! 	my ($id)      = $lineup->{'uri'} =~ m{.*/(.*)};
  
! 	if($transport eq 'QAM') {
  		return "$id | $transport";
  	}
--- 376,385 ----
  	my $transport = $lineup->{'transport'} // 'unknown';
  	my $name      = $lineup->{'name'}      // 'unknown';
! 	my $id        = $lineup->{'lineup'}    // 'unknown';
  
! 	if($lineup->{'isDeleted'}) {
! 		return "$id | $name";
! 	}
! 	elsif($transport eq 'QAM') {
  		return "$id | $transport";
  	}
***************
*** 512,520 ****
  					my $country = uc(ask('Lineup ID or Country (ISO-3166-1 alpha 3 such as USA or CAN):'));
  					if(length($country) > 3) {
! 						sd_json_add_lineup("lineups/$country");
  					}
  					else {
  						my $count = 0;
! 						my @uri;
  
  						if(ask_search_by_transmitter($country)) {
--- 515,523 ----
  					my $country = uc(ask('Lineup ID or Country (ISO-3166-1 alpha 3 such as USA or CAN):'));
  					if(length($country) > 3) {
! 						sd_json_add_lineup("$country");
  					}
  					else {
  						my $count = 0;
! 						my @lineups;
  
  						if(ask_search_by_transmitter($country)) {
***************
*** 525,529 ****
  								$count++;
  								my $lineup = $transmitters->{$transmitter};
! 								push(@uri, "lineups/$lineup");
  								say("$count. $lineup | $transmitter");
  							}
--- 528,532 ----
  								$count++;
  								my $lineup = $transmitters->{$transmitter};
! 								push(@lineups, $lineup);
  								say("$count. $lineup | $transmitter");
  							}
***************
*** 537,542 ****
  								for my $lineup (@{$headend->{'lineups'}}) {
  									$count++;
! 									push(@uri, $lineup->{'uri'});
! 									my ($id) = $lineup->{'uri'} =~ m{.*/(.*)};
  									say("$count. $id | $lineup->{'name'} | $headend->{'location'} | $headend->{'transport'}");
  								}
--- 540,545 ----
  								for my $lineup (@{$headend->{'lineups'}}) {
  									$count++;
! 									my $id = $lineup->{'lineup'};
! 									push(@lineups, $id);
  									say("$count. $id | $lineup->{'name'} | $headend->{'location'} | $headend->{'transport'}");
  								}
***************
*** 546,550 ****
  						my $add = ask_choice('Add lineup (0 = none):', 0, (0 .. $count));
  						if($add) {
! 							sd_json_add_lineup($uri[$add - 1]);
  						}
  					}
--- 549,553 ----
  						my $add = ask_choice('Add lineup (0 = none):', 0, (0 .. $count));
  						if($add) {
! 							sd_json_add_lineup($lineups[$add - 1]);
  						}
  					}
***************
*** 553,557 ****
  					my $delete = ask_choice('Delete lineup (0 = none):', 0, (0 .. $count));
  					if($delete) {
! 						sd_json_delete_lineup($lineups->[$delete - 1]->{'uri'});
  					}
  				}
--- 556,560 ----
  					my $delete = ask_choice('Delete lineup (0 = none):', 0, (0 .. $count));
  					if($delete) {
! 						sd_json_delete_lineup($lineups->[$delete - 1]->{'lineup'});
  					}
  				}
***************
*** 601,605 ****
  		});
  		for my $lineup (@{$lineups}) {
! 			my ($id) = $lineup->{'uri'} =~ m{.*/(.*)};
  			$w->write_option({
  				value => $id,
--- 604,608 ----
  		});
  		for my $lineup (@{$lineups}) {
! 			my $id = $lineup->{'lineup'};
  			$w->write_option({
  				value => $id,


------------------------------------------------------------------------------
Attend Shape: An AT&T Tech Expo July 15-16. Meet us at AT&T Park in San
Francisco, CA to explore cutting-edge tech and listen to tech luminaries
present their vision of the future. This family event has something for
everyone, including kids. Get more information and register today.
http://sdm.link/attshape