Merge branch 'develop' of github.com:mps-youtube/yewtube into develop

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 <!--next-version-placeholder-->
 
+## v2.10.2 (2023-03-22)
+### Fix
+* #837 crashes if the video is blocked by the copyright holder ([`c472c7a`](https://github.com/mps-youtube/yewtube/commit/c472c7a7e428122e147422df84a819b58e790455))
+
 ## v2.10.1 (2023-03-21)
 ### Fix
 * #980 added pylast as dependency in req.txt ([`48cc757`](https://github.com/mps-youtube/yewtube/commit/48cc757a4e89c551d6bcbbe54614f11fedeabbe9))

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

setup.py

@@ -21,7 +21,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 with open('requirements.txt', 'r') as fh:
     requirements = fh.readlines()
 
-__version__ = "2.10.1"
+__version__ = "2.10.2"
 
 options = dict(
     name="yewtube",