From ca1df871a4e54ee49b106ca0a1275c988dea2d2b Mon Sep 17 00:00:00 2001
From: Bryan Bailey <bcbailey84@gail.com>
Date: Tue, 15 Mar 2022 00:09:40 -0400
Subject: [PATCH] Fixed output path of generate_archive

---
 results.xml    | 2 +-
 yoink/comic.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/results.xml b/results.xml
index 5244be7..24fb4aa 100644
--- a/results.xml
+++ b/results.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="10" time="34.845" timestamp="2022-03-14T23:19:17.583858" hostname="DESKTOP-SE506CG"><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_000_comic_generates_valid_markup" time="1.106" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_001_comic_has_valid_title" time="1.698" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_002_comic_has_valid_category" time="1.569" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_003_empty_comic_folder" time="0.928" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_004_comic_folder_created_and_populated" time="21.874" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_005_comic_archive_generated" time="3.659" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_006_folder_cleaned_after_archive_generation" time="1.251" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_007_comic_instance_has_archiver" time="0.724" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_008_comic_is_subclass_scrapable" time="0.758" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_009_invalid_comic_link" time="1.094" /></testsuite></testsuites>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="10" time="30.737" timestamp="2022-03-14T23:54:43.215810" hostname="DESKTOP-SE506CG"><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_000_comic_generates_valid_markup" time="1.118" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_001_comic_has_valid_title" time="0.914" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_002_comic_has_valid_category" time="0.930" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_003_empty_comic_folder" time="0.552" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_004_comic_folder_created_and_populated" time="20.888" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_005_comic_archive_generated" time="3.381" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_006_folder_cleaned_after_archive_generation" time="0.844" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_007_comic_instance_has_archiver" time="0.537" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_008_comic_is_subclass_scrapable" time="0.565" /><testcase classname="yoink.tests.test_basic.BasicTestCase" name="test_009_invalid_comic_link" time="0.824" /></testsuite></testsuites>
\ No newline at end of file
diff --git a/yoink/comic.py b/yoink/comic.py
index e7a5567..c896f21 100644
--- a/yoink/comic.py
+++ b/yoink/comic.py
@@ -94,10 +94,12 @@ class ComicArchiver:
         print()
 
     def generate_archive(self, archive_format='.cbr'):
+
+        archive_from = os.path.basename(self.worktree)
         if os.path.exists(os.path.join(self.worktree, f'{self.comic.title}{archive_format}')):
             return
 
-        output = shutil.make_archive(os.path.join(self.worktree, self.comic.title), 'zip', self.worktree)
+        output = shutil.make_archive(os.path.join(self.worktree, self.comic.title), 'zip', self.worktree, self.worktree)
         os.rename(output, os.path.join(self.worktree, f'{self.comic.title}{archive_format}'))