media-downloader 0.11.2__py2.py3-none-any.whl → 0.11.4__py2.py3-none-any.whl

media_downloader/__init__.py

@@ -13,3 +13,5 @@ Download videos and audio from the internet!
 __version__ = __version__
 __author__ = __author__
 __credits__ = __credits__
+
+__all__ = ["media_downloader", "main", "MediaDownloader"]

media_downloader/media_downloader.py

@@ -13,13 +13,13 @@ from media_downloader.version import __version__, __author__, __credits__
 
 class StdOutLogger(object):
     def debug(self, msg):
-        print(f'{msg}')
+        print(f"{msg}")
 
     def warning(self, msg):
-        print(f'{msg}')
+        print(f"{msg}")
 
     def error(self, msg):
-        print(f'{msg}')
+        print(f"{msg}")
 
 
 class MediaDownloader:
@@ -30,7 +30,7 @@ class MediaDownloader:
         self.audio = False
 
     def open_file(self, file):
-        youtube_urls = open(file, 'r')
+        youtube_urls = open(file, "r")
         for url in youtube_urls:
             self.links.append(url)
         self.links = list(dict.fromkeys(self.links))
@@ -40,7 +40,7 @@ class MediaDownloader:
 
     def set_save_path(self, download_directory):
         self.download_directory = download_directory
-        self.download_directory = self.download_directory.replace(os.sep, '/')
+        self.download_directory = self.download_directory.replace(os.sep, "/")
 
     def reset_links(self):
         print("Links Reset")
@@ -72,62 +72,68 @@ class MediaDownloader:
         self.reset_links()
 
     def download_video(self, link):
-        outtmpl = f'{self.download_directory}/%(uploader)s - %(title)s.%(ext)s'
+        outtmpl = f"{self.download_directory}/%(uploader)s - %(title)s.%(ext)s"
         if "rumble.com" in link:
-                rumble_url = requests.get(link)
-                for rumble_embedded_url in rumble_url.text.split(","):
-                    if "embedUrl" in rumble_embedded_url:
-                        rumble_embedded_url = re.sub('"', '', re.sub('"embedUrl":', '', rumble_embedded_url))
-                        link = rumble_embedded_url
-                        outtmpl = f'{self.download_directory}/%(title)s.%(ext)s'
+            rumble_url = requests.get(link)
+            for rumble_embedded_url in rumble_url.text.split(","):
+                if "embedUrl" in rumble_embedded_url:
+                    rumble_embedded_url = re.sub(
+                        '"', "", re.sub('"embedUrl":', "", rumble_embedded_url)
+                    )
+                    link = rumble_embedded_url
+                    outtmpl = f"{self.download_directory}/%(title)s.%(ext)s"
 
         if self.audio:
             ydl_opts = {
-                'format': 'bestaudio/best',
-                'postprocessors': [{
-                    'key': 'FFmpegExtractAudio',
-                    'preferredcodec': 'mp3',
-                    'preferredquality': '320',
-                }],
-                'progress_with_newline': True,
-                'logger': StdOutLogger(),
-                'outtmpl': outtmpl
+                "format": "bestaudio/best",
+                "postprocessors": [
+                    {
+                        "key": "FFmpegExtractAudio",
+                        "preferredcodec": "mp3",
+                        "preferredquality": "320",
+                    }
+                ],
+                "progress_with_newline": True,
+                "logger": StdOutLogger(),
+                "outtmpl": outtmpl,
             }
         else:
             ydl_opts = {
-                'format': 'best',
-                'progress_with_newline': True,
-                'logger': StdOutLogger(),
-                'outtmpl': outtmpl
+                "format": "best",
+                "progress_with_newline": True,
+                "logger": StdOutLogger(),
+                "outtmpl": outtmpl,
             }
         try:
             with yt_dlp.YoutubeDL(ydl_opts) as ydl:
                 print(ydl.download([link]))
-        except Exception as e:
+        except Exception:
             try:
                 if self.audio:
-                    outtmpl = f'{self.download_directory}/%(id)s.%(ext)s'
+                    outtmpl = f"{self.download_directory}/%(id)s.%(ext)s"
                     ydl_opts = {
-                        'format': 'bestaudio/best',
-                        'progress_with_newline': True,
-                        'logger': StdOutLogger(),
-                        'postprocessors': [{
-                            'key': 'FFmpegExtractAudio',
-                            'preferredcodec': 'mp3',
-                            'preferredquality': '320',
-                        }],
-                        'outtmpl': outtmpl
+                        "format": "bestaudio/best",
+                        "progress_with_newline": True,
+                        "logger": StdOutLogger(),
+                        "postprocessors": [
+                            {
+                                "key": "FFmpegExtractAudio",
+                                "preferredcodec": "mp3",
+                                "preferredquality": "320",
+                            }
+                        ],
+                        "outtmpl": outtmpl,
                     }
                 else:
                     ydl_opts = {
-                        'format': 'best',
-                        'progress_with_newline': True,
-                        'logger': StdOutLogger(),
-                        'outtmpl': outtmpl
+                        "format": "best",
+                        "progress_with_newline": True,
+                        "logger": StdOutLogger(),
+                        "outtmpl": outtmpl,
                     }
                 with yt_dlp.YoutubeDL(ydl_opts) as ydl:
                     print(ydl.download([link]))
-            except Exception as e:
+            except Exception:
                 print(f"Unable to download video: {link}")
 
     def get_channel_videos(self, channel, limit=-1):
@@ -137,10 +143,11 @@ class MediaDownloader:
         while attempts < 3:
             url = f"https://www.youtube.com/user/{username}/videos"
             page = requests.get(url).content
-            data = str(page).split(' ')
+            data = str(page).split(" ")
             item = 'href="/watch?'
-            vids = [line.replace('href="', 'youtube.com') for line in data if
-                    item in line]  # list of all videos listed twice
+            vids = [
+                line.replace('href="', "youtube.com") for line in data if item in line
+            ]  # list of all videos listed twice
             # print(vids)  # index the latest video
             x = 0
             if vids:
@@ -158,19 +165,21 @@ class MediaDownloader:
                 print("URL: ", url)
                 page = requests.get(url).content
                 print("Page: ", page)
-                data = str(page).split(' ')
+                data = str(page).split(" ")
                 print("Data: ", data)
-                item = 'https://i.ytimg.com/vi/'
+                item = "https://i.ytimg.com/vi/"
                 vids = []
                 for line in data:
                     if item in line:
                         vid = line
-                        #vid = line.replace('https://i.ytimg.com/vi/', '')
+                        # vid = line.replace('https://i.ytimg.com/vi/', '')
                         try:
-                            found = re.search('https://i.ytimg.com/vi/(.+?)/hqdefault.', vid).group(1)
+                            found = re.search(
+                                "https://i.ytimg.com/vi/(.+?)/hqdefault.", vid
+                            ).group(1)
                         except AttributeError:
                             # AAA, ZZZ not found in the original string
-                            found = ''  # apply your error handling
+                            found = ""  # apply your error handling
                         print("Vid, ", vid)
                         vid = f"https://www.youtube.com/watch?v={found}"
                         vids.append(vid)
@@ -188,8 +197,11 @@ class MediaDownloader:
                         x += 1
                 else:
                     print("Trying Old Method")
-                    vids = [line.replace('href="', 'youtube.com') for line in data if
-                            item in line]  # list of all videos listed twice
+                    vids = [
+                        line.replace('href="', "youtube.com")
+                        for line in data
+                        if item in line
+                    ]  # list of all videos listed twice
                     if vids:
                         for vid in vids:
                             if limit < 0:
@@ -208,7 +220,11 @@ def media_downloader(argv):
     video_downloader_instance = MediaDownloader()
     audio_only = False
     try:
-        opts, args = getopt.getopt(argv, "hac:d:f:l:", ["help", "audio", "channel=", "directory=", "file=", "links="])
+        opts, args = getopt.getopt(
+            argv,
+            "hac:d:f:l:",
+            ["help", "audio", "channel=", "directory=", "file=", "links="],
+        )
     except getopt.GetoptError:
         usage()
         sys.exit(2)
@@ -234,19 +250,21 @@ def media_downloader(argv):
 
 
 def usage():
-    print(f'Media-Downloader: A tool to download any video off the internet!\n'
-          f'Version: {__version__}\n'
-          f'Author: {__author__}\n'
-          f'Credits: {__credits__}\n'
-          f'\nUsage:\n'
-          f'-h | --help      [ See usage ]\n'
-          f'-a | --audio     [ Download audio only ]\n'
-          f'-c | --channel   [ YouTube Channel/User - Downloads all videos ]\n'
-          f'-d | --directory [ Location where the images will be saved ]\n'
-          f'-f | --file      [ Text file to read the URLs from ]\n'
-          f'-l | --links     [ Comma separated URLs (No spaces) ]\n'
-          f'\nExample:\n'
-          f'media-downloader -f "file_of_urls.txt" -l "URL1,URL2,URL3" -c "WhiteHouse" -d "~/Downloads"\n')
+    print(
+        f"Media-Downloader: A tool to download any video off the internet!\n"
+        f"Version: {__version__}\n"
+        f"Author: {__author__}\n"
+        f"Credits: {__credits__}\n"
+        f"\nUsage:\n"
+        f"-h | --help      [ See usage ]\n"
+        f"-a | --audio     [ Download audio only ]\n"
+        f"-c | --channel   [ YouTube Channel/User - Downloads all videos ]\n"
+        f"-d | --directory [ Location where the images will be saved ]\n"
+        f"-f | --file      [ Text file to read the URLs from ]\n"
+        f"-l | --links     [ Comma separated URLs (No spaces) ]\n"
+        f"\nExample:\n"
+        f'media-downloader -f "file_of_urls.txt" -l "URL1,URL2,URL3" -c "WhiteHouse" -d "~/Downloads"\n'
+    )
 
 
 def main():

media_downloader/version.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-__version__ = '0.11.2'
-__author__ = 'Audel Rouhi'
-__credits__ = 'Audel Rouhi'
+__version__ = '0.11.4'
+__author__ = "Audel Rouhi"
+__credits__ = "Audel Rouhi"

{media_downloader-0.11.2.dist-info → media_downloader-0.11.4.dist-info}/LICENSE

@@ -17,4 +17,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{media_downloader-0.11.2.dist-info → media_downloader-0.11.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: media-downloader
-Version: 0.11.2
+Version: 0.11.4
 Summary: Download audio/videos from the internet!
 Home-page: https://github.com/Knuckles-Team/media-downloader
 Author: Audel Rouhi
@@ -18,8 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests (>=2.28.1)
-Requires-Dist: yt-dlp (>=2023.3.4)
+Requires-Dist: yt-dlp (>=2023.12.30)
 
 # Media Downloader
 
@@ -43,9 +42,9 @@ Requires-Dist: yt-dlp (>=2023.3.4)
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/media-downloader)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/media-downloader)
 
-*Version: 0.11.2*
+*Version: 0.11.4*
 
-Download videos and audio from the internet! 
+Download videos and audio from the internet!
 
 This is a wrapper for the pytube library to simplify downloading from these various sources.
 

media_downloader-0.11.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+media_downloader/__init__.py,sha256=NdFVoFJM5ltTmSM7Be2Hfx7u8CHFwdYYw2zciU1Z-Qw,407
+media_downloader/media_downloader.py,sha256=ba0Gwb6F-rwU5gQvNiJEAwwSAZypemWknisCYJFjwkc,9548
+media_downloader/version.py,sha256=t2A8GmmzAMdHlb-dIVO4LBLobVCFAwjTCKZsk9GuqR0,117
+media_downloader-0.11.4.dist-info/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
+media_downloader-0.11.4.dist-info/METADATA,sha256=EbJ6m3vi93K5zEcoNwShChpa-1nuco8w-q5gAFP9HB0,5228
+media_downloader-0.11.4.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
+media_downloader-0.11.4.dist-info/entry_points.txt,sha256=ZYFDwE25i9D2Mc_ZkLbA0ASaUJo_IEOGDU2gXO7OQnE,77
+media_downloader-0.11.4.dist-info/top_level.txt,sha256=B2OBmgONOm0hIyx2HJ8qFPOI_p5HOeolrYvmslVC1fc,17
+media_downloader-0.11.4.dist-info/RECORD,,

media_downloader-0.11.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-media_downloader/__init__.py,sha256=iCl7rzarsiHgt6a5R_A1aANqNfD5rhJi4Zvj8oQ47zo,348
-media_downloader/media_downloader.py,sha256=w84xa7AZWmjIO_PqSH8KVys4jD4xid194vW_lgkhCQI,9232
-media_downloader/version.py,sha256=yxv0e6afUDKHlFSnywVYTvmSjDdB395pwU3u3FQTpEs,117
-media_downloader-0.11.2.dist-info/LICENSE,sha256=wtI1_YjppxJA2UTLHLbj_goBi-f3DebTfIFbe_XqJmY,1059
-media_downloader-0.11.2.dist-info/METADATA,sha256=6zyM5-n8ZZLgNEgoQd-8gvTSnH_fU3fHpv2uaYbQMwY,5262
-media_downloader-0.11.2.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-media_downloader-0.11.2.dist-info/entry_points.txt,sha256=ZYFDwE25i9D2Mc_ZkLbA0ASaUJo_IEOGDU2gXO7OQnE,77
-media_downloader-0.11.2.dist-info/top_level.txt,sha256=B2OBmgONOm0hIyx2HJ8qFPOI_p5HOeolrYvmslVC1fc,17
-media_downloader-0.11.2.dist-info/RECORD,,