The Search Update

README.md

@@ -2,6 +2,23 @@
 YouTube Terminal Player and Search is a simple tools to search [youtube]('https://youtube.com') from the terminal. It also gives you the url, so you can use [mpv]('https://mpv.io') to watch the video. 
 This bypasses the need to use youtube at all. Also, ytps doesn't use the youtube REST API, it only uses programs that scrape youtube. ytps uses many modules that scrap youtube.
 *ytps doesn't on it's own provides no results. It only uses the below modules and compiles them to look beautiful and nice*.
+
+### Installation
+
+Pip Install
+```bash
+pip install ytps
+```
+
+Directly from Repository
+```bash
+git clone https://github.com/newtoallofthis123/ytps.git
+```
+
+```bash
+pip install -r requirements.txt
+```
+
 ## 3rd party modules used in ytps:
 *youtube-search-python*: [website]('https://github.com/alexmercerind/youtube-search-python') ; 
 *youtube-search*: [website]('https://github.com/joetats/youtube_search') ; 
@@ -15,7 +32,7 @@ This bypasses the need to use youtube at all. Also, ytps doesn't use the youtube
 ytps "youtube_search_term"
 ```
 
-2. Open latest video in mpv or vlc
+2. Open latest video in mpv
 ```bash
 ytps -o "youtube_search_term"
 ```
@@ -25,16 +42,36 @@ ytps -o "youtube_search_term"
 ytps -l "youtube_search_term"
 ```
 
-4. About
+4. Play Url or Most Relevant Result based on string
 ```bash
-ytps -a "Any String"
+ytps -p "youtube_search_term"
 ```
 
-5. Help
+5. Channel Info
+```bash
+ytps -c "channel_name"
+```
+
+6. Video Info
+```bash
+ytps --info "video_url"
+```
+
+7. About
+```bash
+ytps -a "any_string"
+```
+
+8. Help
 ```bash
 ytps --help
 ```
 
+9. Version
+```bash
+ytps --version
+```
+
 ## License 
 
 ### The MIT License (MIT) 

requirements.txt

@@ -0,0 +1,7 @@
+# Required Libraries for ytps
+
+rich
+youtube-search-python
+youtube-search
+
+# Made by NoobScience

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="ytps",
-    version="0.0.1",
+    version="0.1.1",
     description="Youtube Search in the CLI - Improved",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/ytps/__main__.py

@@ -1,37 +1,49 @@
 def ytps():
 	from youtube_search import YoutubeSearch
-	from youtubesearchpython import CustomSearch, VideoSortOrder, ChannelsSearch
+	from youtubesearchpython import CustomSearch, VideoSortOrder, ChannelsSearch, Search, Video
+	from youtubesearchpython import ChannelSearch
 	from rich.console import Console
 	from rich.panel import Panel
 	from rich.progress import Progress
+	from rich.prompt import Prompt, Confirm
 	from rich.markdown import Markdown
 	from rich.table import Table
 	from rich import print
 	from rich.text import Text
+	import requests
 	import os
+	import webbrowser
 	import time
 	import argparse
 
 	console = Console()
 	parser = argparse.ArgumentParser(prog='Youtube Terminal Play and Search')
 	parser.add_argument("search_term", help="Youtube Search Query")
-	parser.add_argument('-v','--version', action='version', version='%(prog)s 0.1')
+	parser.add_argument('-v','--version', action='version', version='%(prog)s 1.1 : The Search Update')
 	parser.add_argument("-o", help="Open Latest Video in mpv", action='store_true')
-	parser.add_argument("-c", help="Search Only in this Channel")
+	parser.add_argument("-c", help="Channel Info", action='store_true')
+	parser.add_argument("-p", help="Play the Video Link or First Relevant Video", action='store_true')
+	parser.add_argument("--info", help="Video Info", action='store_true')
 	parser.add_argument("-l", help="More Relevant Results and more formatting, but slower", action='store_true')
 	parser.add_argument("-a", help="About ytps and license", action='store_true')
 	args = parser.parse_args()
 
+	def shortener(url):
+		web_to_visit = f'https://tinyurl.com/api-create.php?url={url}'
+		website = requests.get(web_to_visit)
+		final_url_raw = str(website.content)
+		final_url_semi_raw = final_url_raw.replace("b'", "")
+		final_url = final_url_semi_raw.replace("'", "")
+		return final_url
+
 	def search_yt(search_term):
 		if args.o:
 			customSearch = CustomSearch(search_term, VideoSortOrder.uploadDate, limit = 1)
 			latest_video = customSearch.result()
 			console.print(f':new: Latest Video from {latest_video["result"][0]["channel"]["name"]}')
 			console.print(f'{latest_video["result"][0]["title"]} released {latest_video["result"][0]["publishedTime"]}.')
-			watch_in_mpv = str.lower(input("Press any key to watch or exit to exit: "))
-			if watch_in_mpv == "exit":
-				quit()
-			else:
+			play_video = Confirm.ask("Do you want to play in mpv")
+			if play_video:
 				with Progress() as progress:
 					task1 = progress.add_task("[green]Loading Player...", total=1000)
 					while not progress.finished:
@@ -40,7 +52,7 @@ def search_yt(search_term):
 				try:
 					os.system(f'mpv --fullscreen --no-terminal --title="ytps - Playing {latest_video["result"][0]["title"]} from {latest_video["result"][0]["channel"]["name"]}"  {latest_video["result"][0]["link"]}')
 				except:
-					os.system(f'vlc {latest_video["result"][0]["link"]}')
+					webbrowser.open(f'https://www.youtube-nocookie.com/embed/{custom_play_search_content["result"][0]["id"]}')
 			quit()
 		if args.l:
 			table = Table(title=Panel(f'Results for [red]{search_term.capitalize()}'), show_header=True, header_style="bold green")
@@ -65,16 +77,79 @@ def search_yt(search_term):
 			console.print(table)
 			quit()
 		if args.c:
-			channel_to_search = args.c
+			channel_to_search = args.search_term
 			channelsSearch = ChannelsSearch(channel_to_search, limit = 10, region = 'US')
 			channelsSearch_content = channelsSearch.result()
-			console.print(Panel(f'[red]{channel_to_search.capitalize()} Videos'), justify="center")
+			console.print(Panel(f'Details for [red]{channel_to_search.capitalize()}'), justify="center")
+			console.print(Panel(f'[green bold]Channel Name: [/] {channelsSearch_content["result"][0]["title"]}\n[green bold]Subscribers: [/] {channelsSearch_content["result"][0]["subscribers"]}\n[green bold]Link: [/] [cyan dim]{shortener(channelsSearch_content["result"][0]["link"])}[/]\n[green bold]Description: [/]{channelsSearch_content["result"][0]["descriptionSnippet"][0]["text"]}\n[green bold]Video Count: [/]{channelsSearch_content["result"][0]["videoCount"]}'), justify="center")
+			console.print(":zap: Made by [link=https://newtoallofthis123.github.io/About]NoobScience[/link]", justify="center")
+			quit()
+		if args.p:
+			custom_play_search_term = args.search_term
+			if "https://youtu" in custom_play_search_term:
+				video_url = args.search_term
+				video_info = Video.getInfo(video_url)
+				console.print(Panel(f'[cyan]{video_info["title"]}[/]\n\n[green bold]Url: [/]{video_info["link"]}\n[green bold]View Count: [/]{video_info["viewCount"]["text"]}\n[green bold]Channel: [/]{video_info["channel"]["name"]}\n[green bold]Channel Link: [/]{video_info["channel"]["link"]}\n[green bold]Description: \n[/]{video_info["description"]}'), justify="center")
+				play_video = Prompt.ask("Continue to Play the Video with mpv[violet](mpv)[/] or open embeded[violet](w)[/] or open in youtube[violet](yt)[/] or quit[violet](q)[/]", choices=["mpv", "w", "yt", "quit"], default="mpv")
+				if play_video == "mpv":
+					with Progress() as progress:
+						task1 = progress.add_task("[green]Loading Player...", total=1000)
+						while not progress.finished:
+							time.sleep(0.01)
+							progress.update(task1, advance=5)
+					try:
+						os.system(f'mpv --fullscreen --no-terminal --title="ytps - Playing {video_info["title"]} from {video_info["channel"]["name"]}"  {video_info["link"]}')
+					except:
+						webbrowser.open(f'https://www.youtube-nocookie.com/embed/{video_info["id"]}')
+				if play_video == "w":
+					try:
+						webbrowser.open(f'https://www.youtube-nocookie.com/embed/{video_info["id"]}')
+					except:
+						webbrowser.open(f'https://youtu.be/{video_info["id"]}')
+				if play_video == "yt":
+					webbrowser.open(f'https://youtu.be/{video_info["id"]}')
+				if play_video == "quit":
+					quit()
+				console.print(":zap: Made by [link=https://newtoallofthis123.github.io/About]NoobScience[/link]", justify="center")
+				quit()
+			custom_play_search = CustomSearch(custom_play_search_term, VideoSortOrder.relevance, limit = 1)
+			custom_play_search_content = custom_play_search.result()
+			console.print(Panel(f'Details for [red]{custom_play_search_term.capitalize()}[/]\'s video'), justify="center")
+			console.print(Panel(f'[green bold]Most Relevant Video: [/]{custom_play_search_content["result"][0]["title"]}\n[green bold]Url: [/]{custom_play_search_content["result"][0]["link"]}\n[green bold]Channel: [/]{custom_play_search_content["result"][0]["channel"]["name"]}\n[green bold]Duration: [/]{custom_play_search_content["result"][0]["duration"]}\n[green bold]Released: [/]{custom_play_search_content["result"][0]["publishedTime"]}\n[green bold]Views: [/]{custom_play_search_content["result"][0]["viewCount"]["short"]}\n[green bold]Description: [/]{custom_play_search_content["result"][0]["descriptionSnippet"][0]["text"]}'), justify="center")
+			play_video = Prompt.ask("Continue to Play the Video with mpv[violet](mpv)[/] or open embeded[violet](w)[/] or open in youtube[violet](yt)[/] or quit[violet](q)[/]", choices=["mpv", "w", "yt", "q"], default="mpv")
+			if play_video == "mpv":
+				with Progress() as progress:
+					task1 = progress.add_task("[green]Loading Player...", total=1000)
+					while not progress.finished:
+						time.sleep(0.01)
+						progress.update(task1, advance=5)
+				try:
+					os.system(f'mpv --fullscreen --no-terminal --title="ytps - Playing {custom_play_search_content["result"][0]["title"]} from {custom_play_search_content["result"][0]["channel"]["name"]}"  {custom_play_search_content["result"][0]["link"]}')
+				except:
+					webbrowser.open(f'https://www.youtube-nocookie.com/embed/{custom_play_search_content["result"][0]["id"]}')
+			if play_video == "w":
+				try:
+					webbrowser.open(f'https://www.youtube-nocookie.com/embed/{custom_play_search_content["result"][0]["id"]}')
+				except:
+					webbrowser.open(f'https://youtu.be/{custom_play_search_content["result"][0]["id"]}')
+			if play_video == "yt":
+				webbrowser.open(f'https://youtu.be/{custom_play_search_content["result"][0]["id"]}')
+			if play_video == "q":
+				quit()
+			console.print(":zap: Made by [link=https://newtoallofthis123.github.io/About]NoobScience[/link]", justify="center")
+			quit()
+		if args.info:
+			video_url = args.search_term
+			video_info = Video.getInfo(video_url) 
+			console.print(Panel(f'Details for [red]{video_info["channel"]["name"].capitalize()}[/]\'s video'), justify="center")
+			console.print(Panel(f'[cyan]{video_info["title"]}[/]\n\n[green bold]Url: [/]{video_info["link"]}\n[green bold]View Count: [/]{video_info["viewCount"]["text"]}\n[green bold]Channel: [/]{video_info["channel"]["name"]}\n[green bold]Channel Link: [/]{video_info["channel"]["link"]}\n[green bold]Description: \n[/]{video_info["description"]}'), justify="center")
+			console.print(":zap: Made by [link=https://newtoallofthis123.github.io/About]NoobScience[/link]", justify="center")
 			quit()
 		if args.a:
 			about_content = "# YouTube Terminal Player and Search\n\n YouTube Terminal Player and Search is a simple tools to search [youtube]('https://youtube.com') from the terminal. It also gives you the url, so you can use [mpv]('https://mpv.io') to watch the video. This bypasses the need to use youtube at all. Also, ytps doesn't use the youtube REST API, it only uses programs that scrape youtube. ytps uses many modules that scrap youtube.\n\n*ytps doesn't on it's own provides no results. It only uses the below modules and compiles them to look beautiful and nice*. \n\n ## 3rd party modules used in ytps: \n\n *youtube-search-python*: [website]('https://github.com/alexmercerind/youtube-search-python') ; \n *youtube-search*: [website]('https://github.com/joetats/youtube_search') ; \n *rich*: [website]('https://github.com/willmcgugan/rich') \n\n ## License \n\n The MIT License (MIT) \n\n Copyright © 2021 NoobScience \n\n Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: \n\n The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. \n\n THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
 			about_md = Markdown(about_content)
 			console.print(about_md)
-			console.print("\n :zap: Made by [link=https://newtoallofthis123.github.io/About]NoobScience[/link]")
+			console.print("\n\n :zap: Made by [link=https://newtoallofthis123.github.io/About]NoobScience[/link]")
 			quit()
 		try:
 			table = Table(title=Panel(f'Results for [red]{search_term.capitalize()}'), show_header=True, header_style="bold green")