reorg imports / remove multiprocessing change

Author: richstokes

app.py

@@ -1,6 +1,4 @@
 """Zero Configuration DLNA Server - A simple DLNA media server."""
-import multiprocessing
-multiprocessing.set_start_method("fork")
 import hashlib
 import os
 import socket
@@ -9,15 +7,26 @@
 from http.server import ThreadingHTTPServer
 import argparse
 
-from constants import (
-    SERVER_NAME,
-    SERVER_DESCRIPTION,
-    SERVER_VERSION,
-    SERVER_MANUFACTURER,
-    is_supported_media_file,
-)
-from dlna import DLNAHandler
-from ssdp import SSDPServer
+try: # Hacky but needed to support both package and module imports
+    from .constants import (
+        SERVER_NAME,
+        SERVER_DESCRIPTION,
+        SERVER_VERSION,
+        SERVER_MANUFACTURER,
+        is_supported_media_file,
+    )
+    from .dlna import DLNAHandler
+    from .ssdp import SSDPServer
+except ImportError:
+    from constants import (
+        SERVER_NAME,
+        SERVER_DESCRIPTION,
+        SERVER_VERSION,
+        SERVER_MANUFACTURER,
+        is_supported_media_file,
+    )
+    from dlna import DLNAHandler
+    from ssdp import SSDPServer
 
 
 class ZeroConfigDLNA:

constants.py

@@ -6,7 +6,10 @@
 
 import os
 import socket
-from custom_mimetypes import CustomMimeTypes
+try:
+    from .custom_mimetypes import CustomMimeTypes
+except ImportError:
+    from custom_mimetypes import CustomMimeTypes
 
 # Get hostname, truncate at first dot, then limit to 16 chars max
 hostname = socket.gethostname().split(".")[0][:16]

dlna.py

@@ -4,23 +4,33 @@
 This module provides the HTTP request handler for a DLNA media server,
 implementing the necessary DLNA and UPnP protocols for media streaming.
 """
-
+import html
+import traceback
 import os
 import struct
 import subprocess
 import uuid
 from http.server import BaseHTTPRequestHandler
 from urllib.parse import unquote, urlparse, quote
-import html
-import traceback
-from constants import (
-    SERVER_AGENT,
-    SERVER_DESCRIPTION,
-    SERVER_VERSION,
-    SERVER_MANUFACTURER,
-    is_supported_media_file,
-)
-from custom_mimetypes import CustomMimeTypes
+
+try:
+    from .constants import (
+        SERVER_AGENT,
+        SERVER_DESCRIPTION,
+        SERVER_VERSION,
+        SERVER_MANUFACTURER,
+        is_supported_media_file,
+    )
+    from .custom_mimetypes import CustomMimeTypes
+except ImportError:
+    from constants import (
+        SERVER_AGENT,
+        SERVER_DESCRIPTION,
+        SERVER_VERSION,
+        SERVER_MANUFACTURER,
+        is_supported_media_file,
+    )
+    from custom_mimetypes import CustomMimeTypes
 
 # Create a global instance of CustomMimeTypes
 custom_mimetypes = CustomMimeTypes()

ssdp.py

@@ -11,9 +11,14 @@
 import time
 import struct
 import select
-from constants import (
-    SERVER_AGENT,
-)
+try:
+    from .constants import (
+        SERVER_AGENT,
+    )
+except ImportError:
+    from constants import (
+        SERVER_AGENT,
+    )
 
 
 class SSDPServer: