Merge pull request #3 from ovear/html-description

Thanks for your pull request, and sorry for the waiting xd

Modules/config.py

@@ -127,6 +127,13 @@ parser.add_argument(
     action="store_true",
     help="download description as a JSON list",
 )
+parser.add_argument(
+    "--html-description",
+    "-hd",
+    dest="html_description",
+    action="store_true",
+    help="download description as original html format, this won't work if json-description is enabled",
+)
 parser.add_argument(
     "--login",
     action="store_true",
@@ -167,6 +174,7 @@ login = args.login
 check = args.check
 index = args.index
 submissions = args.submissions
+html_description = args.html_description
 json_description = args.json_description
 metadata = args.metadata
 dont_redownload = args.redownload

Modules/download.py

@@ -76,6 +76,9 @@ def download(path):
             idx.write(f"({view_id})\n")
 
     if config.metadata is True:
+        if config.html_description is True:
+            dsc = s.find(class_="submission-description").prettify()
+        else:
             dsc = s.find(class_="submission-description").text.strip().replace("\r\n", "\n")
         if config.json_description is True:
             dsc = []

Modules/functions.py

@@ -145,8 +145,10 @@ def next_button(page_url):
     else:
         parse_next_button = s.find("a", class_="button standard right", text="Next")
         page_num = fav_next_button(parse_next_button)
+    next_page_url = (parse_next_button.parent.attrs['action'] if 'action'
+                    in parse_next_button.parent.attrs else parse_next_button.attrs['href'])
     print(
-        f"Downloading page {page_num} - {config.BASE_URL}{parse_next_button.parent.attrs['action']}"
+        f"Downloading page {page_num} - {config.BASE_URL}{next_page_url}"
     )
     return page_num
 

README.md

@@ -54,6 +54,8 @@ options:
   --filter              enable submission filter
   --metadata, -m        enable metadata saving
   --download DOWNLOAD   download a specific submission by providing its id
+  --html-description, -hd
+                        download description as original html format, this won't work if json-description is enabled
   --json-description, -jd
                         download description as a JSON list
   --login               extract furaffinity cookies directly from your browser