Merge pull request #1222 from mps-youtube/master

merge changes from upstream

mps_youtube/commands/search.py

@@ -558,7 +558,7 @@ def yt_url(url: str, print_title: bool = False):
             if v_id in v_ids:
                 continue
             p = pafy.get_video_info(v_id)
-        except (IOError, ValueError) as e:
+        except (IOError, ValueError, Exception) as e:
             g.message = c.r + str(e) + c.w
             g.content = g.content or content.generate_songlist_display(
                     zeromsg=g.message)

mps_youtube/pafy.py

@@ -131,12 +131,15 @@ def get_comments(video_id):
     return comments['result']
 
 def get_video_info(video_id):
-    videoInfo = Video.getInfo(video_id)
-    response = return_dislikes(video_id)
-    videoInfo['likes'] = response['likes']
-    videoInfo['dislikes'] = response['dislikes']
-    videoInfo['averageRating'] = response['rating']
-    return videoInfo
+    try:
+        videoInfo = Video.getInfo(video_id)
+        response = return_dislikes(video_id)
+        videoInfo['likes'] = response['likes']
+        videoInfo['dislikes'] = response['dislikes']
+        videoInfo['averageRating'] = response['rating']
+        return videoInfo
+    except:
+        raise Exception("Can't get video info. Video is either private or unavailable in your country.")
 
 def return_dislikes(video_id):
     return json.loads(requests.get('https://returnyoutubedislikeapi.com/votes?videoId=' + video_id).text)

mps_youtube/player.py

@@ -88,7 +88,7 @@ class BasePlayer:
                 break
 
             # skip forbidden, video removed/no longer available, etc. tracks
-            except TypeError as e:
+            except (TypeError, Exception) as e:
                 import traceback
                 traceback.print_exception(type(e), e, e.__traceback__)
                 self.song_no += 1