made changes to webhook method

file_utils.py

@@ -24,14 +24,13 @@
 SOFTWARE.
 """
 
-import requests, xmltodict, json, requests, cv2, urllib, http, traceback, os, textract
+import requests, xmltodict, json, requests, cv2, urllib, http, traceback, os, textract, webhook, octopii
 from skimage import io
 import numpy as np
 from urllib.request import Request, urlopen, re
 from bs4 import BeautifulSoup
 from pdf2image import convert_from_path
 from PIL import Image
-import webhook, octopii
 
 def truncate(local_location):
     characters_per_file = 1232500
@@ -143,9 +142,9 @@ def append_to_output_file(data, file_name):
 
         with open(file_name, 'w') as write_file:
             loaded_json.append(data)
-            if octopii.notifyURL is not None:
-                webhook.push_data(json.dumps(loaded_json, indent=4), octopii.notifyURL)
+            if len(octopii.notifyURL) > 0: webhook.push_data(json.dumps(loaded_json, indent=4), octopii.notifyURL)
             write_file.write(json.dumps(loaded_json, indent=4))
 
     except:
+        traceback.print_exc()
         print ("Couldn't write to "+ file_name +". Please check if the path is correct and try again.")

octopii.py

@@ -121,7 +121,7 @@ def search_pii(file_path):
         location = sys.argv[1]
 
         # Check for the -notify flag
-        notify_index = sys.argv.index('-notify') if '-notify' in sys.argv else -1
+        notify_index = sys.argv.index('--notify') if '--notify' in sys.argv else -1
 
         if notify_index != -1 and notify_index + 1 < len(sys.argv):
             notifyURL = sys.argv[notify_index + 1]
@@ -208,11 +208,9 @@ def search_pii(file_path):
             file_utils.append_to_output_file(results, output_file)
             print ("\nOutput saved in " + output_file)
 
-        except textract.exceptions.MissingFileError:
-            print ("\nCouldn't find file '" + file_path + "', skipping...")
+        except textract.exceptions.MissingFileError: print ("\nCouldn't find file '" + file_path + "', skipping...")
 
-        except textract.exceptions.ShellError:
-            print ("\nFile '" + file_path + "' is empty or corrupt, skipping...")
+        except textract.exceptions.ShellError: print ("\nFile '" + file_path + "' is empty or corrupt, skipping...")
 
     if temp_exists: shutil.rmtree(temp_dir)
 

webhook.py

@@ -28,10 +28,8 @@
 
 def push_data(data: str, url: str):
     headers = {'Content-type': 'application/json'}
-    if "discord" in url:
-        data = f"{'content':'{data}'}"
-    else:
-        data = f"{'text':'{data}'}"
+    if "discord" in url: data = "{\"content\":\"{" + data + "}\"}"
+    else: data = "{\"text\":\"{" + data + "}\"}"
 
     req = requests.post (
         url, # Example: https://hooks.slack.com/services/<>/<>/<>