From bb7678fd8d540ea98cef3e48299c5ccb71220b1a Mon Sep 17 00:00:00 2001
From: fcdev <feddycap97@gmail.com>
Date: Wed, 26 May 2021 04:35:45 +0200
Subject: [PATCH] small refactoring

renamed mainWindow to main so that pyinstaller doesn't make problems.
removed the settings file, they weren't even settings, they were just random Sankaku constants in a file
---
 Sankaku.py               | 22 +++++++++++++++-------
 Settings.py              |  6 ------
 mainWindow.py => main.py |  0
 3 files changed, 15 insertions(+), 13 deletions(-)
 rename mainWindow.py => main.py (100%)

diff --git a/Sankaku.py b/Sankaku.py
index 9568586..ca7f0a3 100644
--- a/Sankaku.py
+++ b/Sankaku.py
@@ -1,7 +1,15 @@
 import requests
 import mimetypes
 import json
-import Settings
+
+# region Sankaku stuff
+API_URL = "https://capi-v2.sankakucomplex.com/"
+HTTP_HEADERS = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36'}
+
+POST_ID = "id"
+POST_URL = "file_url"
+POST_MIME = "file_type"
+# endregion
 
 class Sankaku:
     __session = requests.Session()
@@ -22,10 +30,10 @@ def __getFileType(url):
 
     @staticmethod
     def download_post(post, folder):
-        if(post[Settings.POST_URL] == None):
+        if(post[POST_URL] == None):
             print(f"Can't download: {post}")
-        r = Sankaku.__session.get(post[Settings.POST_URL])
-        open(folder+"\\"+str(post[Settings.POST_ID]) + Sankaku.__getFileType(post[Settings.POST_URL]), 'wb').write(r.content)
+        r = Sankaku.__session.get(post[POST_URL])
+        open(folder+"\\"+str(post[POST_ID]) + Sankaku.__getFileType(post[POST_URL]), 'wb').write(r.content)
     #endregion
 
     def get_posts(self):
@@ -47,7 +55,7 @@ def _getPage(self, page = None):
         }
         if (page != None):
             params['next'] = page
-        return json.loads(Sankaku.__session.get(Settings.API_URL + 'posts/keyset', params = params).content)
+        return json.loads(Sankaku.__session.get(API_URL + 'posts/keyset', params = params).content)
 
 
     def __init__(self,tags,folder,print = None):
@@ -59,12 +67,12 @@ def output(self, string):
         if(callable(self.print)): self.print(string)
 
     def download(self):
-        Sankaku.__session.headers['User-Agent'] = Settings.HTTP_HEADERS['User-Agent']
+        Sankaku.__session.headers['User-Agent'] = HTTP_HEADERS['User-Agent']
         self.progress = 0
         posts = self.get_posts()
         self.total = len(posts)
         for i in range(self.total):
-            self.output("D("+str(i+1)+"/"+str(self.total)+"):"+ str(posts[i][Settings.POST_ID]))
+            self.output("D("+str(i+1)+"/"+str(self.total)+"):"+ str(posts[i][POST_ID]))
             Sankaku.download_post(posts[i],self.folder)
             self.progress += 1
         self.output("Complete")
diff --git a/Settings.py b/Settings.py
index a4e3513..e69de29 100644
--- a/Settings.py
+++ b/Settings.py
@@ -1,6 +0,0 @@
-API_URL = "https://capi-v2.sankakucomplex.com/"
-HTTP_HEADERS = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36'}
-
-POST_ID = "id"
-POST_URL = "file_url"
-POST_MIME = "file_type"
\ No newline at end of file
diff --git a/mainWindow.py b/main.py
similarity index 100%
rename from mainWindow.py
rename to main.py