fetch upstream changes (#1305)

* 2.10.3 Automatically generated by python-semantic-release * chore: use pipenv * fix: #806 - pressing q doesn't stops playback when in repeat mode * 2.10.4 Automatically generated by python-semantic-release * fix: #1243 bumped yt-dlp version Thanks to @galgot * 2.10.5 Automatically generated by python-semantic-release * docs: extend upgrade instructions (#1249) This adds the pip / pipx commands to upgrade all the dependencies. This makes directed actions like #1225 (comment) unnecessary. * added a notice * fix syntax warnings on 3.12 (#1263) * Update project URL and version maintenance (#1262) * Update project URL * Update __version__ in setup.py This suppresses the update notifications * help new: more accurate helptext `help new` doesn't actually check whether there's a new version, it shows the changelog for the latest release no matter what. Update helptext to reflect this. * Update COLLABORATORS.md * Fix Issue #1064 and #1283: User and Channel searches to return all videos including optional filtering of search terms (#1282) (#1288) * Updated the all_videos_from_channel function to return all videos from a channel, not just the first page of playlist results (previous method only returned up to 100 videos max). * Updated the usersearch_id function to filter the returned videos by search term in the title or description. This restores the ability to search a user's videos. Co-authored-by: Robert Hill <[email protected]> * 2.11.0 Automatically generated by python-semantic-release * 2.11.1 Automatically generated by python-semantic-release * 2.11.2 Automatically generated by python-semantic-release * 2.11.3 Automatically generated by python-semantic-release * 2.11.4 Automatically generated by python-semantic-release * 2.11.5 Automatically generated by python-semantic-release * chore: update author email * fix: wheel_recipe.sh * 2.11.6 Automatically generated by python-semantic-release * fix: semantic_release version for pypi setup.py was stuck * 2.11.7 Automatically generated by python-semantic-release * chore: clean up setup.cfg * 2.12.0 Automatically generated by python-semantic-release --------- Co-authored-by: github-actions <[email protected]> Co-authored-by: fslori <[email protected]> Co-authored-by: Branch Vincent <[email protected]> Co-authored-by: lawrence <[email protected]> Co-authored-by: Robert Hill <[email protected]> Co-authored-by: semantic-release <semantic-release>
mps-youtube · Jan 5, 2025 · 9f81417 · 9f81417
1 parent fe8165c
commit 9f81417
Show file tree

Hide file tree

Showing 15 changed files with 5,479 additions and 438 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/COLLABORATORS.md b/COLLABORATORS.md
@@ -14,7 +14,6 @@ You can also find lists of all contributors [in this file](./CONTRIBUTORS) or [i
 * maintained mps-youtube, a fork of [mps](https://web.archive.org/web/20180429034221/https://github.com/np1/mps) with [Darren a.k.a np1](https://github.com/np1)
 ## [Talha Asghar](https://github.com/iamtalhaasghar) 
 [![gh-sponsor](https://img.shields.io/badge/_-Github-orange.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/iamtalhaasghar)
-[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/iamtalhaasghar)
 *  created yewtube - a fork of mps-youtube with no Youtube API Key, vlc with no gui, vlc subtitles support
 * was made [owner of mps-youtube](https://github.com/mps-youtube/yewtube/discussions/1202) organization by [Ian Douglas Scott](https://github.com/orgs/mps-youtube/people/ids1024)
 ## [Jiri Hörner](https://github.com/hrnr) 

diff --git a/Pipfile b/Pipfile
@@ -0,0 +1,18 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+requests = "*"
+pyreadline3 = "*"
+pyperclip = "*"
+youtube-search-python = ">=1.6.5"
+yt-dlp = "*"
+colorama = "*"
+pylast = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.11"
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 
 ![](https://img.shields.io/pypi/v/yewtube.svg)  ![](https://img.shields.io/pypi/wheel/yewtube.svg)
 
+## STOP GENOCIDE OF INNOCENT PEOPLE
+
+![](https://upload.wikimedia.org/wikipedia/commons/thumb/0/00/Flag_of_Palestine.svg/1280px-Flag_of_Palestine.svg.png)
+
 <pre>
                       _         _          
                      | |       | |         
@@ -33,20 +37,20 @@ Installation
 # Latest Version
 
 ### Using pip
-1. Install using `pip install git+https://github.com/iamtalhaasghar/yewtube.git`
+1. Install using `pip install git+https://github.com/mps-youtube/yewtube.git`
 2. Run using, `yt`. Enjoy! 
 
 ### Using pipx
 1.  Install **_pipx_** using `pip install pipx`
-2.  Install `yewtube` using `pipx install git+https://github.com/iamtalhaasghar/yewtube.git`
+2.  Install `yewtube` using `pipx install git+https://github.com/mps-youtube/yewtube.git`
 3.  Now, type `yt` That's it.
 
 What's new in yewtube?
 ----------------------
 -   **No Youtube API Key required**
 -   **Run audio in VLC with no GUI**
 
-See complete and up-to-date changelog [here](https://github.com/iamtalhaasghar/yewtube/blob/master/CHANGELOG.md).
+See complete and up-to-date changelog [here](https://github.com/mps-youtube/yewtube/blob/master/CHANGELOG.md).
 
 These features are still inherited from [mps-youtube](https://github.com/mps-youtube/mps-youtube).
 -   Search and play audio/video from YouTube
@@ -65,7 +69,7 @@ implementation uses YouTube as a source of content and can play and
 download video as well as audio. The [pafy](https://github.com/mps-youtube/pafy)  library handles interfacing with YouTube.
 
 [mps-youtube wiki](https://github.com/mps-youtube/mps-youtube/wiki/Troubleshooting) <br>
-[yewtube wiki](https://github.com/iamtalhaasghar/yewtube/wiki/FAQ)
+[yewtube wiki](https://github.com/mps-youtube/yewtube/wiki/FAQ)
 
 Screenshots
 -----------
@@ -133,12 +137,20 @@ Upgrading
 
 ### If installed using pipx
 
-` pipx upgrade yewtube `
+`pipx upgrade yewtube`
+
+Optionally with upgrading all dependencies:
+
+`pipx runpip yewtube install --upgrade-strategy eager --upgrade yewtube`
 
 ### If installed using pip
 
 `pip install --upgrade yewtube`
 
+Optionally with upgrading all dependencies:
+
+`pip install --upgrade-strategy eager --upgrade yewtube`
+
 Usage
 -----
 
@@ -194,9 +206,9 @@ If everything working correctly, dbug and glib would have similar result as abov
 mps-youtube.instance567867
 ```
 
-Check also the [common-issue](https://github.com/iamtalhaasghar/yewtube/wiki/Common-issues) if you are having problem with yewtube.
+Check also the [common-issue](https://github.com/mps-youtube/yewtube/wiki/Common-issues) if you are having problem with yewtube.
 
 How to Contribute
 -----------------
 
-Contributions are warmly welcomed! However, please check out the [contribution page](https://github.com/iamtalhaasghar/yewtube/blob/master/CONTRIBUTING.md) before making a contribution.
+Contributions are warmly welcomed! However, please check out the [contribution page](https://github.com/mps-youtube/yewtube/blob/master/CONTRIBUTING.md) before making a contribution.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,8 +1,8 @@
 site_name: Yewtube
 site_description: Terminal based YouTube player and downloader.
 site_url: https://iamtalhaasghar.github.io/yewtube
-repo_url: https://github.com/iamtalhaasghar/yewtube
-repo_name: iamtalhaasghar/yewtube
+repo_url: https://github.com/mps-youtube/yewtube
+repo_name: mps-youtube/yewtube
 
 nav:
 - Home:

diff --git a/mps_youtube/__init__.py b/mps_youtube/__init__.py
@@ -3,5 +3,5 @@
 __version__ = next((p.version for p in pkg_resources.working_set if p.project_name.lower() == 'yewtube'), "unable to determine")
 __author__ = "iamtalhaasghar"
 __license__ = "GPLv3"
-__url__ = "https://github.com/iamtalhaasghar/yewtube"
+__url__ = "https://github.com/mps-youtube/yewtube"
 
diff --git a/mps_youtube/commands/misc.py b/mps_youtube/commands/misc.py
@@ -60,7 +60,7 @@ def quits(showlogo=True):
     if config.CHECKUPDATE.get and showlogo:
 
         try:
-            url = "https://raw.githubusercontent.com/iamtalhaasghar/yewtube/master/setup.py"
+            url = "https://raw.githubusercontent.com/mps-youtube/yewtube/master/setup.py"
             v = urlopen(url, timeout=1).read().decode()
             v = re.search(r'__version__\s*=\s*"\s*([\d\.]+)\s*"\s*', v, re.MULTILINE)
 

diff --git a/mps_youtube/g.py b/mps_youtube/g.py
@@ -96,7 +96,7 @@
 commands = []
 
 text = {
-    "exitmsg": ("*yewtube - https://github.com/iamtalhaasghar/yewtube is a fork of\nmps-youtube - *https://github.com/mps-youtube/mps-youtube*"
+    "exitmsg": ("*yewtube - https://github.com/mps-youtube/yewtube is a fork of\nmps-youtube - *https://github.com/mps-youtube/mps-youtube*"
                 "\nReleased under the GPLv3 license\n"
                 "(c) 2021 iamtalhaasghar\n(c) 2014, 2015 np1 and contributors*\n"""),
     "exitmsg_": (c.r, c.b, c.r, c.w),

diff --git a/mps_youtube/helptext.py b/mps_youtube/helptext.py
@@ -315,7 +315,7 @@ def helptext():
         ),
         (
             "new",
-            "Check if new version is available",
+            "Show online changelog for the latest version",
             """{0}What's New{1}\n{3}""".format(c.ul, c.w, c.y, "get_changelog()"),
         ),
         (
@@ -408,7 +408,7 @@ def indent(x):
 
 def get_changelog():
     try:
-        url = "https://raw.githubusercontent.com/iamtalhaasghar/yewtube/master/CHANGELOG.md"
+        url = "https://raw.githubusercontent.com/mps-youtube/yewtube/master/CHANGELOG.md"
         v = urlopen(url, timeout=1).read().decode()
         v = v.split('## v')[1]
         return v

diff --git a/mps_youtube/player.py b/mps_youtube/player.py
@@ -264,7 +264,8 @@ def previous(self):
 
     def stop(self):
         self.terminate_process()
-        self.song_no = len(self.songlist)
+        raise KeyboardInterrupt
+        #self.song_no = len(self.songlist)
 
     def terminate_process(self):
         self.p.terminate()

diff --git a/mps_youtube/util.py b/mps_youtube/util.py
@@ -492,7 +492,7 @@ def _get_mpv_version(exename):
 
 def _get_mplayer_version(exename):
     o = subprocess.check_output([exename]).decode()
-    m = re.search('MPlayer SVN[\s-]r([0-9]+)', o, re.MULTILINE|re.IGNORECASE)
+    m = re.search(r'MPlayer SVN[\s-]r([0-9]+)', o, re.MULTILINE|re.IGNORECASE)
 
     ver = 0
     if m:
@@ -510,7 +510,7 @@ def _get_mplayer_version(exename):
 
 def _get_metadata(song_title):
     ''' Get metadata from a song title '''
-    t = re.sub("[\(\[].*?[\)\]]", "", song_title.lower())
+    t = re.sub(r"[\(\[].*?[\)\]]", "", song_title.lower())
     t = t.split('-')
 
     if len(t) != 2:  # If len is not 2, no way of properly knowing title for sure

diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,2 @@
+[tool.semantic_release]
+version_variables = ["setup.py:__version__"]
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 """ setup.py for yewtube.
 
-https://github.com/iamtalhaasghar/yewtube
+https://github.com/mps-youtube/yewtube
 
 python setup.py sdist bdist_wheel
 """
@@ -21,17 +21,17 @@
 with open('requirements.txt', 'r') as fh:
     requirements = fh.readlines()
 
-__version__ = "2.10.2"
+__version__ = "2.12.0"
 
 options = dict(
     name="yewtube",
     version=__version__,
     description="A Terminal based YouTube player and downloader. No Youtube API key required. Forked from mps-youtube",
     keywords=["video", "music", "audio", "youtube", "stream", "download"],
     author="talha_programmer",
-    author_email="[email protected]",
-    url="https://github.com/iamtalhaasghar/yewtube",
-    download_url="https://github.com/iamtalhaasghar/yewtube/releases",
+    author_email="[email protected]",
+    url="https://github.com/mps-youtube/yewtube",
+    download_url="https://github.com/mps-youtube/yewtube/releases",
     packages=['mps_youtube', 'mps_youtube.commands', 'mps_youtube.listview', 'mps_youtube.players'],
     entry_points={'console_scripts': ['yt = mps_youtube:main.main']},
     python_requires='>=3.6',

diff --git a/wheel_recipe.sh b/wheel_recipe.sh
@@ -1,4 +1,7 @@
+# a script to build and upload wheel files on pypi.org
 rm -rf dist/
+semantic-release version
 python -m build --sdist
 python -m build --wheel
-twine upload --verbose dist/*
+twine upload --verbose dist/*
+semantic-release publish
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[tool.semantic_release]
		version_variables = ["setup.py:__version__"]