Added download types

5 files changed, 77 insertions, 25 deletions

diff --git a/src/main.py b/src/main.py
index b3a5503..98838fa 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,4 +1,4 @@
-from model.youload_app import YouloadApp
+from view.app import YouloadApp
 
 if __name__ == "__main__":
     app = YouloadApp()
diff --git a/src/youload_playlist.py b/src/model/youload_playlist.py
index 803b1c1..f23533f 100644
--- a/src/youload_playlist.py
+++ b/src/model/youload_playlist.py
@@ -7,10 +7,14 @@ def make_alpha_numeric(string: str) -> str:
 class YouLoadPlayList:
     """A class for download and handling youtube playlists"""
 
+    DOWNLOAD_TYPES = ["highest", "lowest", "audio", "720p", "480p", "360p", "240p", "144p"]
+    DEFAULT_DOWNLOAD_TYPE = "highest"
+
     def __init__(self, link: str):
         self.yt_playlist = Playlist(link)
         self.video_count = len(self.yt_playlist.videos)
         self.folder_name = make_alpha_numeric(self.yt_playlist.title)
+        self.download_type = self.DEFAULT_DOWNLOAD_TYPE
 
     def generate_video_info(self, video_num: int) -> str:
         """Returns information on video in playlist at 'video_num'"""
@@ -31,7 +35,16 @@ class YouLoadPlayList:
         """Download video at 'video_num'"""
         video = self.yt_playlist.videos[video_num]
         video_size = video.streams.get_highest_resolution().filesize
-        video.streams.get_highest_resolution().download(output_path=self.folder_name)
+
+        # Download this fucker.
+        if self.download_type == "highest":
+            video.streams.get_highest_resolution().download(output_path=self.folder_name)
+        elif self.download_type == "lowest":
+            video.streams.get_lowest_resolution().download(output_path=self.folder_name)
+        elif self.download_type == "audio":
+            video.streams.get_audio_only().download(output_path=self.folder_name)
+        else:
+            video.streams.get_by_resolution(self.download_type).download(output_path=self.folder_name)
 
         return f"Title: {video.title}, Size: {video_size // (1024 ** 2)} MB"
 
diff --git a/src/model/youload_app.py b/src/view/app.py
index 6d20b22..203cc56 100644
--- a/src/model/youload_app.py
+++ b/src/view/app.py
@@ -4,27 +4,35 @@ from kivy.app import App
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.button import Button
 from kivy.uix.floatlayout import FloatLayout
-from kivy.uix.gridlayout import GridLayout
 from kivy.uix.textinput import TextInput
+from kivy.uix.popup import Popup
 from kivy.uix.label import Label
-from kivy.uix.filechooser import FileChooser
 
 import threading
 from pathlib import Path
-import pytube
+import os
 
-from youload_playlist import YouLoadPlayList
-from model.youload_file_chooser import YouloadFileChooser
+from model.youload_playlist import YouLoadPlayList
+from view.file_chooser import YouloadFileChooser
+from view.download_type_chooser import YouloadDownloadTypeChooser
 
 class YouloadApp(App):
     def build(self):
         layout = BoxLayout(orientation='vertical')
 
         # Data members
-        self.url = "https://youtube.com/playlist?list=PLuZUmvZz4WI78uqT5S71yBHNBMJ97HzhY&si=SI2qN9MgxmmK2rbf"
+        self.url = "https://youtube.com/playlist?list=PLXbRgJ9vx_KuA5CljV3BpiV58qx6znmRk&si=JFaVyspkeoMWUDNL"
         self.is_downloading = False
         self.should_stop_download = False
 
+        # File chooser.
+        self.file_chooser = YouloadFileChooser()
+        self.file_chooser.set_app(self)
+
+        # Download type chooser.
+        self.download_type_chooser = YouloadDownloadTypeChooser()
+        self.download_type_chooser.set_app(self)
+
         # Url input.
         url_input = TextInput(text=self.url, multiline=False, size_hint=(0.8, 1.0))
         url_input.bind(text=self.uid_url_input)
@@ -39,10 +47,14 @@ class YouloadApp(App):
         url_and_submit.add_widget(self.submit)
 
         # Download status.
-        self.download_status = Label(text="Nothing downloading", size_hint=(0.4, 1.0))
+        self.download_status = Label(text="Nothing downloading", size_hint=(0.3, 1.0))
+
+        # Download type chooser button.
+        self.download_type_button = Button(text=self.download_type_chooser.current_type, size_hint=(0.1, 1.0))
+        self.download_type_button.bind(on_press=self.download_type_chooser.open)
 
         # Folder display.
-        self.folder_display = Label(text=str(Path.home()), size_hint=(0.4, 1.0))
+        self.folder_display = Label(text=os.getcwd(), size_hint=(0.4, 1.0))
 
         # choose folder button.
         self.choose_folder_button = Button(text="Folder", size_hint=(0.2, 1.0))
@@ -51,6 +63,7 @@ class YouloadApp(App):
         # Info line.
         info_line = BoxLayout(size_hint=(1.0, 0.1))
         info_line.add_widget(self.download_status)
+        info_line.add_widget(self.download_type_button)
         info_line.add_widget(self.folder_display)
         info_line.add_widget(self.choose_folder_button)
 
@@ -62,15 +75,7 @@ class YouloadApp(App):
         layout.add_widget(info_line)
         layout.add_widget(self.downloads_display)
 
-        # File chooser.
-        self.file_chooser = YouloadFileChooser()
-        self.file_chooser.set_app(self)
-
-        # Screen layout.
-        self.screen_layout = FloatLayout()
-        self.screen_layout.add_widget(layout)
-
-        return self.screen_layout
+        return layout
 
     def uid_url_input(self, instance, value):
         self.url = value
@@ -87,6 +92,7 @@ class YouloadApp(App):
 
             # Set directory and other stuff.
             playlist.set_download_directory(self.folder_display.text)
+            playlist.download_type = self.download_type_chooser.current_type
             playlist.prepare_for_download()
             self.downloads_display.text = f"Downloading to {playlist.folder_name}\n"
 
@@ -105,17 +111,19 @@ class YouloadApp(App):
             self.download_status.text = "Folder already exists"
         except KeyError:
             self.download_status.text = "Error getting playlist"
+        except AttributeError:
+            self.download_status.text = "Download type not supported"
 
         self.submit.text = "Download"
         self.is_downloading = False
 
     def stop_download(self):
+        self.download_status.text = "Stopping download"
         self.should_stop_download = True
 
     def submit_cb(self, instance):
         # Is already downloading something.
         if self.is_downloading:
-            self.download_status.text = "Stopping download"
             self.stop_download()
             return
 
@@ -125,7 +133,7 @@ class YouloadApp(App):
         download_thread.start()
 
     def choose_folder_cb(self, instance):
-        self.screen_layout.add_widget(self.file_chooser)
+        self.file_chooser.open()
 
     def on_stop(self):
         self.stop_download()
diff --git a/src/view/download_type_chooser.py b/src/view/download_type_chooser.py
new file mode 100644
index 0000000..927d7a4
--- /dev/null
+++ b/src/view/download_type_chooser.py
@@ -0,0 +1,33 @@
+from kivy.uix.label import Label
+from kivy.uix.button import Button
+from kivy.uix.popup import Popup
+from kivy.uix.boxlayout import BoxLayout
+
+from model.youload_playlist import YouLoadPlayList
+
+class YouloadDownloadTypeChooser(Popup):
+
+    def __init__(self, **kwargs):
+        super(YouloadDownloadTypeChooser, self).__init__(**kwargs)
+
+        self.title = "Download types"
+
+        layout = BoxLayout(orientation="vertical")
+        self.current_type = YouLoadPlayList.DEFAULT_DOWNLOAD_TYPE
+
+        # Add option buttons.
+        for download_type in YouLoadPlayList.DOWNLOAD_TYPES:
+            item = Button(text=download_type)
+            item.bind(on_press=self.option_button_cb)
+            layout.add_widget(item)
+
+        self.content = layout
+
+    def set_app(self, app):
+        self.app = app
+
+    def option_button_cb(self, instance):
+        self.current_type = instance.text
+        self.app.download_type_button.text = self.current_type
+        self.dismiss()
+
diff --git a/src/model/youload_file_chooser.py b/src/view/file_chooser.py
index ab37a2d..dfba199 100644
--- a/src/model/youload_file_chooser.py
+++ b/src/view/file_chooser.py
@@ -15,8 +15,6 @@ class YouloadFileChooser(Popup):
 
         self.title = "Find folder"
 
-        self.dirselect = True
-
         # Path input.
         self.path_input = TextInput(text=str(Path.home()), multiline=False, size_hint=(0.9, 1.0))
         self.path_input.bind(text=self.uid_path_input)
@@ -35,14 +33,14 @@ class YouloadFileChooser(Popup):
 
         layout.add_widget(top_bar_layout)
         layout.add_widget(self.file_chooser)
-        self.add_widget(layout)
+        self.content = layout
 
     def set_app(self, app):
         self.app = app
 
     def close_button_cb(self, instance):
         self.app.folder_display.text = self.get_folder()
-        self.parent.remove_widget(self)
+        self.dismiss()
 
     def uid_path_input(self, instance, value):
         if os.path.exists(value):