Automatically convert to new filepath

If you're using the legacy filepath but want to use the new filepath, the script will automatically handle it for you.

Posts > Images > img.jpg >> Posts > Paid > Images > img.jpg

Image folder will automatically be removed IF there's nothing left in there.

extras/OFSorter/ofsorter.py

@@ -0,0 +1,21 @@
+import os
+import json
+from itertools import chain
+import shutil
+
+
+def sorter(user_directory, api_type, location, metadata):
+    legacy_directory = os.path.join(user_directory, api_type, location)
+    if not os.path.isdir(legacy_directory):
+        return
+    legacy_files = os.listdir(legacy_directory)
+    metadata_directory = os.path.join(
+        user_directory, "Metadata", api_type+".json")
+    results = list(chain(*metadata["valid"]))
+    for result in results:
+        legacy_filepath = os.path.join(legacy_directory, result["filename"])
+        filepath = os.path.join(result["directory"], result["filename"])
+        if result["filename"] in legacy_files:
+            shutil.move(legacy_filepath, filepath)
+    if not os.listdir(legacy_directory):
+        os.removedirs(legacy_directory)

modules/onlyfans.py

@@ -10,7 +10,7 @@
 import math
 from urllib.parse import urlparse
 from itertools import groupby
-# import extras.OFSorter.ofsorter as ofsorter
+import extras.OFSorter.ofsorter as ofsorter
 
 log_download = setup_logger('downloads', 'downloads.log')
 
@@ -476,6 +476,8 @@ def process_mass_messages(message, limit):
         if results["invalid"]:
             results["invalid"] = [list(g) for k, g in groupby(
                 results["invalid"], key=lambda x: x["post_id"])]
+        if sort_free_paid_posts:
+            ofsorter.sorter(user_directory, api_type, location[0], results)
         metadata_set.append(results)
         media_set.append(results)
 
@@ -485,9 +487,6 @@ def process_mass_messages(message, limit):
                 os.makedirs(metadata_directory, exist_ok=True)
                 archive_directory = metadata_directory+api_type
                 export_archive(metadata_set, archive_directory)
-    # if sort_free_paid_posts:
-    #     ofsorter.sorter(user_directory)
-    #     print
     return [media_set, directory]
 
 

requirements.txt

@@ -3,4 +3,4 @@ beautifulsoup4
 urllib3
 win32-setctime
 lxml
-pysocks
+pysocks