waymore 8.1__tar.gz → 8.2__tar.gz

{waymore-8.1/waymore.egg-info → waymore-8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waymore
-Version: 8.1
+Version: 8.2
 Summary: Find way more from the Wayback Machine, Common Crawl, Alien Vault OTX, URLScan, VirusTotal & Intelligence X!
 Home-page: https://github.com/xnl-h4ck3r/waymore
 Author: xnl-h4ck3r
@@ -21,7 +21,7 @@ Dynamic: license-file
 
 <center><img src="https://github.com/xnl-h4ck3r/waymore/blob/main/waymore/images/title.png"></center>
 
-## About - v8.0
+## About - v8.2
 
 The idea behind **waymore** is to find even more links from the Wayback Machine (plus other sources) than other existing tools.
 

{waymore-8.1 → waymore-8.2}/README.md

@@ -1,6 +1,6 @@
 <center><img src="https://github.com/xnl-h4ck3r/waymore/blob/main/waymore/images/title.png"></center>
 
-## About - v8.0
+## About - v8.2
 
 The idea behind **waymore** is to find even more links from the Wayback Machine (plus other sources) than other existing tools.
 

waymore-8.2/setup.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+import os
+import re
+
+from setuptools import find_packages, setup
+
+# Read version from __init__.py without importing
+
+
+def get_version():
+    init_path = os.path.join(os.path.dirname(__file__), "waymore", "__init__.py")
+    with open(init_path, encoding="utf-8") as f:
+        content = f.read()
+        match = re.search(r'__version__\s*=\s*["\']([^"\']+)["\']', content)
+        if match:
+            return match.group(1)
+    raise RuntimeError("Unable to find version string.")
+
+
+setup(
+    name="waymore",
+    packages=find_packages(),
+    version=get_version(),
+    description="Find way more from the Wayback Machine, Common Crawl, Alien Vault OTX, URLScan & VirusTotal!",
+    long_description=open("README.md", encoding="utf-8").read(),
+    long_description_content_type="text/markdown",
+    author="@xnl-h4ck3r",
+    url="https://github.com/xnl-h4ck3r/waymore",
+    install_requires=[
+        "requests",
+        "pyyaml",
+        "termcolor",
+        "psutil",
+        "urlparse3",
+        "tldextract",
+    ],
+    entry_points={
+        "console_scripts": [
+            "waymore = waymore.waymore:main",
+        ],
+    },
+)

waymore-8.2/waymore/__init__.py

@@ -0,0 +1 @@
+__version__ = "8.2"

{waymore-8.1 → waymore-8.2}/waymore/waymore.py

@@ -1306,32 +1306,15 @@ def getConfig():
         useDefaults = False
         try:
             # Get the path of the config file. If -c / --config argument is not passed, then it defaults to config.yml in the same directory as the run file
-            waymorePath = (
-                Path(os.path.join(os.getenv("APPDATA", ""), "waymore"))
-                if os.name == "nt"
-                else (
-                    Path(os.path.join(os.path.expanduser("~"), ".config", "waymore"))
-                    if os.name == "posix"
-                    else (
-                        Path(
-                            os.path.join(
-                                os.path.expanduser("~"),
-                                "Library",
-                                "Application Support",
-                                "waymore",
-                            )
-                        )
-                        if os.name == "darwin"
-                        else None
-                    )
-                )
-            )
-            waymorePath.absolute
+            if os.name == "nt":
+                waymorePath = Path(os.path.join(os.getenv("APPDATA", ""), "waymore"))
+            elif sys.platform == "darwin":
+                waymorePath = Path(os.path.expanduser("~/Library/Application Support/waymore"))
+            else:
+                waymorePath = Path(os.path.expanduser("~/.config/waymore"))
+
             if args.config is None:
-                if waymorePath == "":
-                    configPath = "config.yml"
-                else:
-                    configPath = Path(waymorePath / "config.yml")
+                configPath = waymorePath / "config.yml"
             else:
                 configPath = Path(args.config)
 
@@ -1339,7 +1322,8 @@ def getConfig():
             if not os.path.isfile(configPath):
                 try:
                     # Make sure the directory exists
-                    os.makedirs(os.path.dirname(configPath), exist_ok=True)
+                    if configPath.parent != Path("."):
+                        os.makedirs(configPath.parent, exist_ok=True)
                     # Create the default config content using the DEFAULT_* constants
                     defaultConfig = f"""FILTER_CODE: {DEFAULT_FILTER_CODE}
 FILTER_MIME: {DEFAULT_FILTER_MIME}

{waymore-8.1 → waymore-8.2/waymore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waymore
-Version: 8.1
+Version: 8.2
 Summary: Find way more from the Wayback Machine, Common Crawl, Alien Vault OTX, URLScan, VirusTotal & Intelligence X!
 Home-page: https://github.com/xnl-h4ck3r/waymore
 Author: xnl-h4ck3r
@@ -21,7 +21,7 @@ Dynamic: license-file
 
 <center><img src="https://github.com/xnl-h4ck3r/waymore/blob/main/waymore/images/title.png"></center>
 
-## About - v8.0
+## About - v8.2
 
 The idea behind **waymore** is to find even more links from the Wayback Machine (plus other sources) than other existing tools.
 

waymore-8.1/setup.py

@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-import os
-import re
-import shutil
-
-from setuptools import find_packages, setup
-
-# Read version from __init__.py without importing
-
-
-def get_version():
-    init_path = os.path.join(os.path.dirname(__file__), "waymore", "__init__.py")
-    with open(init_path, encoding="utf-8") as f:
-        content = f.read()
-        match = re.search(r'__version__\s*=\s*["\']([^"\']+)["\']', content)
-        if match:
-            return match.group(1)
-    raise RuntimeError("Unable to find version string.")
-
-
-target_directory = (
-    os.path.join(os.getenv("APPDATA", ""), "waymore")
-    if os.name == "nt"
-    else (
-        os.path.join(os.path.expanduser("~"), ".config", "waymore")
-        if os.name == "posix"
-        else (
-            os.path.join(os.path.expanduser("~"), "Library", "Application Support", "waymore")
-            if os.name == "darwin"
-            else None
-        )
-    )
-)
-
-# Copy the config.yml file to the target directory if it exists
-configNew = False
-if target_directory and os.path.isfile("config.yml"):
-    os.makedirs(target_directory, exist_ok=True)
-    # If file already exists, create a new one
-    if os.path.isfile(target_directory + "/config.yml"):
-        configNew = True
-        os.rename(target_directory + "/config.yml", target_directory + "/config.yml.OLD")
-        shutil.copy("config.yml", target_directory)
-        os.rename(target_directory + "/config.yml", target_directory + "/config.yml.NEW")
-        os.rename(target_directory + "/config.yml.OLD", target_directory + "/config.yml")
-    else:
-        shutil.copy("config.yml", target_directory)
-
-setup(
-    name="waymore",
-    packages=find_packages(),
-    version=get_version(),
-    description="Find way more from the Wayback Machine, Common Crawl, Alien Vault OTX, URLScan & VirusTotal!",
-    long_description=open("README.md", encoding="utf-8").read(),
-    long_description_content_type="text/markdown",
-    author="@xnl-h4ck3r",
-    url="https://github.com/xnl-h4ck3r/waymore",
-    install_requires=[
-        "requests",
-        "pyyaml",
-        "termcolor",
-        "psutil",
-        "urlparse3",
-        "tldextract",
-    ],
-    entry_points={
-        "console_scripts": [
-            "waymore = waymore.waymore:main",
-        ],
-    },
-)
-
-if configNew:
-    print(
-        "\n\033[33mIMPORTANT: The file "
-        + target_directory
-        + "/config.yml already exists.\nCreating config.yml.NEW but leaving existing config.\nIf you need the new file, then remove the current one and rename config.yml.NEW to config.yml\n\033[0m"
-    )
-else:
-    print("\n\033[92mThe file " + target_directory + "/config.yml has been created.\n\033[0m")

waymore-8.1/waymore/__init__.py

@@ -1 +0,0 @@
-__version__ = "8.1"