From b0e2ad0a3b723361eaea7f937a064d366cb15c91 Mon Sep 17 00:00:00 2001
From: Bryan Bailey <bcbailey84@gail.com>
Date: Wed, 9 Mar 2022 23:23:33 -0500
Subject: [PATCH] implemented comic download cli

---
 yoink/cli.py   | 13 ++++++++++++-
 yoink/comic.py |  8 +++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/yoink/cli.py b/yoink/cli.py
index a9a546d..050327b 100644
--- a/yoink/cli.py
+++ b/yoink/cli.py
@@ -1,6 +1,9 @@
+from pydoc import cli
 import click
 
 from yoink.common import qb_client, app_root, library_path, config_path
+from yoink.comic import Comic, ComicArchiver
+from yoink.torrent import Torrent, TorrentDownloader
 
 
 
@@ -17,7 +20,15 @@ def download(url):
         click.echo('url cannot be blank')
         return 1
 
-    click.echo('Downloading')
+    comic = Comic(url)
+    archiver = ComicArchiver(comic)
+    click.echo(f'Downloading {comic.title}')
+    archiver.download()
+    click.echo('Building comic archive')
+    archiver.generate_archive()
+    click.echo('Cleaning up')
+    archiver.cleanup_worktree()
+    click.echo('Success')
 
 if __name__=='__main__':
     yoink()
\ No newline at end of file
diff --git a/yoink/comic.py b/yoink/comic.py
index 2c1961b..36a1313 100644
--- a/yoink/comic.py
+++ b/yoink/comic.py
@@ -62,10 +62,11 @@ class ComicArchiver:
         if not os.path.exists(self.worktree):
             os.makedirs(self.worktree, mode=0o777)
 
+        opener = urllib.request.build_opener()
+        opener.addheaders = [('User-Agent', 'Mozilla/5.0')]
+        urllib.request.install_opener(opener)
+
         for index,url in enumerate(self.comic.filelist):
-            opener = urllib.request.build_opener()
-            opener.addheaders = [('User-Agent', 'Mozilla/5.0')]
-            urllib.request.install_opener(opener)
 
             if not url.endswith('.jpg'):
                 formatted_file = os.path.join(self.worktree, f'{self.comic.title} ' + ''.join([str(index).zfill(3), '.jpg']))
@@ -75,6 +76,7 @@ class ComicArchiver:
                 page_number = url.split('/')[-1].split('.')[0].zfill(3)
                 file_extension = url.split('/')[-1].split('.')[1]
                 urllib.request.urlretrieve(url, filename=os.path.join(self.worktree, f'{self.comic.title}{page_number}.{file_extension}'))
+        print()
 
     def generate_archive(self, archive_format='.cbr'):
         if os.path.exists(os.path.join(self.worktree, f'{self.comic.title}{archive_format}')):