refactoring

topscoder · May 16, 2024 · 8c61e47 · 8c61e47
1 parent 5224c70
commit 8c61e47
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/src/lib/download_worker.py b/src/lib/download_worker.py
@@ -1,5 +1,5 @@
 from threading import Thread
-from lib.parsers.WordfenceParser import WordfenceParser
+from lib.wordfence_parser import WordfenceParser
 
 
 class DownloadWorker(Thread):

diff --git a/src/lib/parsers/edge-cases.yaml → src/lib/edge-cases.yaml b/src/lib/parsers/edge-cases.yaml → src/lib/edge-cases.yaml
diff --git a/src/lib/parsers/parser_interface.py → src/lib/parser_interface.py b/src/lib/parsers/parser_interface.py → src/lib/parser_interface.py
diff --git a/src/lib/parsers/__init__.py b/src/lib/parsers/__init__.py
diff --git a/src/lib/parsers/wordfence_api_parser.py → src/lib/wordfence_api_parser.py b/src/lib/parsers/wordfence_api_parser.py → src/lib/wordfence_api_parser.py
@@ -1,5 +1,5 @@
-from src.lib.colors import red, green, yellow
-from src.lib.logger import logger
+from .colors import red, green, yellow
+from .logger import logger
 import hashlib
 import json
 import os
@@ -58,8 +58,13 @@ def execute(self, source, is_local=False, overwrite=False, force=False, overwrit
             self.tpl_main_no_ref = template.read()
 
         if is_local is True:
-            file_path = source # "./vulnerabilities.production.json"
-            with open(file_path, "r") as file:
+            if not source.lower().endswith(".json"):
+                return False
+
+            if not os.path.exists(source):
+                return False
+
+            with open(source, "r") as file:
                 vulnerabilities = json.load(file)
 
                 # Print the vulnerabilities

diff --git a/src/lib/parsers/wordfence_parser.py → src/lib/wordfence_parser.py b/src/lib/parsers/wordfence_parser.py → src/lib/wordfence_parser.py
@@ -6,7 +6,7 @@
 import requests
 import re
 
-from lib.parsers.parser_interface import ParserInterface
+from lib.parser_interface import ParserInterface
 
 
 class WordfenceParser(ParserInterface):

diff --git a/src/main.py b/src/main.py
@@ -7,8 +7,8 @@
 
 from lib.colors import yellow
 from lib.logger import logger
-from lib.parsers.wordfence_api_parser import WordfenceAPIParser
-from lib.parsers.wordfence_parser import WordfenceParser
+from lib.wordfence_api_parser import WordfenceAPIParser
+from lib.wordfence_parser import WordfenceParser
 
 
 def main():

diff --git a/tests/test_wordfence_api_parser.py b/tests/test_wordfence_api_parser.py
@@ -1,5 +1,5 @@
 import unittest
-from src.lib.parsers.wordfence_api_parser import WordfenceAPIParser
+from src.lib.wordfence_api_parser import WordfenceAPIParser
 
 
 class TestWordfenceAPIParser(unittest.TestCase):