From b3eb914e60ad475abfd73346f46a5de25c649942 Mon Sep 17 00:00:00 2001
From: nathom <nathanthomas707@gmail.com>
Date: Fri, 26 Mar 2021 12:26:50 -0700
Subject: [PATCH] Added support for txt files as input

---
 .gitignore        |  1 +
 streamrip/cli.py  |  7 +++++++
 streamrip/core.py | 22 ++++++++++------------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index fcad2c3..03213b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ secrets.py
 dist
 build
 test.py
+/urls.txt
diff --git a/streamrip/cli.py b/streamrip/cli.py
index 12ce869..86c2eee 100644
--- a/streamrip/cli.py
+++ b/streamrip/cli.py
@@ -21,6 +21,7 @@ if not os.path.isdir(CACHE_DIR):
 @click.group(invoke_without_command=True)
 @click.option("-c", "--convert", metavar="CODEC")
 @click.option("-u", "--urls", metavar="URLS")
+@click.option("-t", "--text", metavar='PATH')
 @click.option("-nd", "--no-db", is_flag=True)
 @click.option("--debug", is_flag=True)
 @click.option("--reset-config", is_flag=True)
@@ -52,6 +53,12 @@ def cli(ctx, **kwargs):
         logger.debug(f"handling {kwargs['urls']}")
         core.handle_urls(kwargs["urls"])
 
+    if os.path.isfile(kwargs['text']):
+        logger.debug(f"Handling {kwargs['text']}")
+        core.handle_txt(kwargs['text'])
+    elif kwargs['txt'] is not None:
+        click.secho(f"Text file {kwargs['text']} does not exist.")
+
     if ctx.invoked_subcommand is None:
         core.download()
 
diff --git a/streamrip/core.py b/streamrip/core.py
index 97ccb28..fcd3e82 100644
--- a/streamrip/core.py
+++ b/streamrip/core.py
@@ -96,13 +96,13 @@ class MusicDL(list):
         :raises InvalidSourceError
         :raises ParsingError
         """
-        source, url_type, item_id = self.parse_urls(url)[0]
-        if item_id in self.db:
-            logger.info(f"{url} already downloaded, use --no-db to override.")
-            click.secho(f"{url} already downloaded, use --no-db to override.", fg='magenta')
-            return
+        for source, url_type, item_id in self.parse_urls(url):
+            if item_id in self.db:
+                logger.info(f"{url} already downloaded, use --no-db to override.")
+                click.secho(f"{url} already downloaded, use --no-db to override.", fg='magenta')
+                break
 
-        self.handle_item(source, url_type, item_id)
+            self.handle_item(source, url_type, item_id)
 
     def handle_item(self, source: str, media_type: str, item_id: str):
         self.assert_creds(source)
@@ -138,6 +138,7 @@ class MusicDL(list):
             else:
                 item.download(**arguments)
 
+            self.db.add(item.id)
             if self.config.session["conversion"]["enabled"]:
                 click.secho(
                     f"Converting {item!s} to {self.config.session['conversion']['codec']}",
@@ -193,13 +194,14 @@ class MusicDL(list):
         :raises exceptions.ParsingError
         """
         parsed = self.url_parse.findall(url)
+        logger.debug(f"Parsed urls: {parsed}")
 
         if parsed != []:
             return parsed
 
         raise ParsingError(f"Error parsing URL: `{url}`")
 
-    def from_txt(self, filepath: Union[str, os.PathLike]):
+    def handle_txt(self, filepath: Union[str, os.PathLike]):
         """
         Handle a text file containing URLs. Lines starting with `#` are ignored.
 
@@ -209,11 +211,7 @@ class MusicDL(list):
         :raises exceptions.ParsingError
         """
         with open(filepath) as txt:
-            lines = " ".join(
-                line for line in txt.readlines() if not line.strip().startswith("#")
-            )
-
-        return self.parse_urls(lines)
+            self.handle_urls(txt.read())
 
     def search(
         self, source: str, query: str, media_type: str = "album", limit: int = 200