From 8ef87c285fbbfd615dac9a5efa5c5ec927bc8ff6 Mon Sep 17 00:00:00 2001
From: lededev <lededev@noreplay.github.com>
Date: Sun, 3 Oct 2021 10:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E5=B0=86=E5=85=B6=E5=AE=83=E5=87=A0?=
 =?UTF-8?q?=E4=B8=AAmakedirs()=E4=B8=80=E8=B5=B7=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=94=99=E4=B8=8A=E5=8A=A0=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E5=8D=87=E5=88=B0admin=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AV_Data_Capture.py |  6 ++----
 core.py            | 40 ++++++++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/AV_Data_Capture.py b/AV_Data_Capture.py
index 1f2df85..766d826 100755
--- a/AV_Data_Capture.py
+++ b/AV_Data_Capture.py
@@ -214,13 +214,11 @@ def movie_lists(root, conf, regexstr):
 
 
 def create_failed_folder(failed_folder):
-    if not os.path.isdir(failed_folder):  # 新建failed文件夹
+    if not os.path.exists(failed_folder):  # 新建failed文件夹
         try:
             os.makedirs(failed_folder)
-            if not os.path.isdir(failed_folder):
-                raise
         except:
-            print("[-]failed!can not be make folder 'failed'\n[-](Please run as Administrator)")
+            print(f"[-]Fatal error! Can not make folder '{failed_folder}'")
             sys.exit(0)
 
 
diff --git a/core.py b/core.py
index cb1a782..90da00c 100755
--- a/core.py
+++ b/core.py
@@ -83,17 +83,19 @@ def create_folder(json_data, conf: config.Config):  # 创建文件夹
         location_rule = location_rule.replace(title, shorttitle)
 
     path = os.path.join(success_folder, location_rule).strip()
-    if not os.path.isdir(path):
+    if not os.path.exists(path):
         path = escape_path(path, conf.escape_literals())
         try:
             os.makedirs(path)
-            if not os.path.isdir(path):
-                raise
         except:
             path = success_folder + '/' + location_rule.replace('/[' + number + ')-' + title, "/number")
             path = escape_path(path, conf.escape_literals())
+            try:
+                os.makedirs(path)
+            except:
+                print(f"[-]Fatal error! Can not make folder '{path}'")
+                sys.exit(0)
 
-            os.makedirs(path)
     return path
 
 
@@ -106,10 +108,12 @@ def download_file_with_filename(url, filename, path, conf: config.Config, filepa
     for i in range(configProxy.retry):
         try:
             if configProxy.enable:
-                if not os.path.isdir(path):
-                    os.makedirs(path)
-                    if not os.path.isdir(path):
-                        raise IOError
+                if not os.path.exists(path):
+                    try:
+                        os.makedirs(path)
+                    except:
+                        print(f"[-]Fatal error! Can not make folder '{path}'")
+                        sys.exit(0)
                 proxies = configProxy.proxies()
                 headers = {
                     'User-Agent': G_USER_AGENT}
@@ -121,10 +125,12 @@ def download_file_with_filename(url, filename, path, conf: config.Config, filepa
                     code.write(r.content)
                 return
             else:
-                if not os.path.isdir(path):
-                    os.makedirs(path)
-                    if not os.path.isdir(path):
-                        raise IOError
+                if not os.path.exists(path):
+                    try:
+                        os.makedirs(path)
+                    except:
+                        print(f"[-]Fatal error! Can not make folder '{path}'")
+                        sys.exit(0)
                 headers = {
                     'User-Agent': G_USER_AGENT}
                 r = requests.get(url, timeout=configProxy.timeout, headers=headers)
@@ -224,10 +230,12 @@ def print_files(path, leak_word, c_word, naming_rule, part, cn_sub, json_data, f
     else:
         nfo_path = os.path.join(path,f"{number}{part}{leak_word}{c_word}.nfo")
     try:
-        if not os.path.isdir(path):
-            os.makedirs(path)
-            if not os.path.isdir(path):
-                raise IOError
+        if not os.path.exists(path):
+            try:
+                os.makedirs(path)
+            except:
+                print(f"[-]Fatal error! can not make folder '{path}'")
+                sys.exit(0)
         with open(nfo_path, "wt", encoding='UTF-8') as code:
             print('<?xml version="1.0" encoding="UTF-8" ?>', file=code)
             print("<movie>", file=code)