Discard streams w/o name, change live radio type to live stream

usr/lib/hypnotix/xtream.py

@@ -58,7 +58,7 @@ class Channel():
  def __init__(self, xtream: object, group_title, stream_info):
  stream_type = stream_info['stream_type']
  # Adjust the odd "created_live" type
- if stream_type == "created_live":
+ if stream_type == "created_live" or stream_type == "radio_streams":
  stream_type = "live"
 
  if stream_type != "live" and stream_type != "movie":
@@ -578,61 +578,64 @@ def load_iptv(self):
  ## Add Streams to dictionaries
 
  for stream_channel in all_streams:
- # Generate Group Title
- if stream_channel['name'][0].isalnum():
-
- # Some channels have no group, 
- # so let's add them to the catche all group
- if stream_channel['category_id'] == None:
- stream_channel['category_id'] = '9999'
- elif stream_channel['category_id'] != '1':
- pass
-
- # Find the first occurence of the group that the
- # Channel or Stream is pointing to
- the_group = next(
- (x for x in self.groups if x.group_id == stream_channel['category_id']),
- None
- )
-
- if the_group != None:
- group_title = the_group.name
- else:
- group_title = self.catch_all_group.name
- the_group = self.catch_all_group
-
- if loading_stream_type == self.series_type:
- # Load all Series
- new_series = Serie(self, stream_channel)
- # To get all the Episodes for every Season of each 
- # Series is very time consuming, we will only 
- # populate the Series once the user click on the 
- # Series, the Seasons and Episodes will be loaded 
- # using x.getSeriesInfoByID() function
-
- else:
- new_channel = Channel(
- self, 
- group_title, 
- stream_channel
+ if stream_channel['name'] != "":
+ # Generate Group Title
+ if stream_channel['name'][0].isalnum():
+
+ # Some channels have no group, 
+ # so let's add them to the catche all group
+ if stream_channel['category_id'] == None:
+ stream_channel['category_id'] = '9999'
+ elif stream_channel['category_id'] != '1':
+ pass
+
+ # Find the first occurence of the group that the
+ # Channel or Stream is pointing to
+ the_group = next(
+ (x for x in self.groups if x.group_id == stream_channel['category_id']),
+ None
  )
+
+ if the_group != None:
+ group_title = the_group.name
+ else:
+ group_title = self.catch_all_group.name
+ the_group = self.catch_all_group
+
+ if loading_stream_type == self.series_type:
+ # Load all Series
+ new_series = Serie(self, stream_channel)
+ # To get all the Episodes for every Season of each 
+ # Series is very time consuming, we will only 
+ # populate the Series once the user click on the 
+ # Series, the Seasons and Episodes will be loaded 
+ # using x.getSeriesInfoByID() function
 
- # Save the new channel to the local list of channels
- if loading_stream_type == self.live_type:
- self.channels.append(new_channel)
- elif loading_stream_type == self.vod_type:
- self.movies.append(new_channel)
- else:
- self.series.append(new_series)
-
- # Add stream to the specific Group 
- if the_group != None:
- if loading_stream_type != self.series_type:
- the_group.channels.append(new_channel)
  else:
- the_group.series.append(new_series)
- else:
- print("Group not found `{}`".format(stream_channel['name']))
+ new_channel = Channel(
+ self, 
+ group_title, 
+ stream_channel
+ )
+
+ # Save the new channel to the local list of channels
+ if loading_stream_type == self.live_type:
+ self.channels.append(new_channel)
+ elif loading_stream_type == self.vod_type:
+ self.movies.append(new_channel)
+ else:
+ self.series.append(new_series)
+
+ # Add stream to the specific Group 
+ if the_group != None:
+ if loading_stream_type != self.series_type:
+ the_group.channels.append(new_channel)
+ else:
+ the_group.series.append(new_series)
+ else:
+ print("Group not found `{}`".format(stream_channel['name']))
+ else:
+ print("Stream has empty name `{}`".format(json.dumps(stream_channel)))
  else:
  print("Could not load {} Streams".format(loading_stream_type))