Restructured the python code.

app/DataStore.py

@@ -4,10 +4,10 @@ from datetime import datetime, timezone
 from email.utils import formatdate
 import json
 import sqlite3
-from src.Utils import calcDownloadPath
-from src.Config import Config
-from src.Download import Download
-from src.DTO.ItemDTO import ItemDTO
+from Utils import calcDownloadPath
+from Config import Config
+from Download import Download
+from ItemDTO import ItemDTO
 
 
 class DataStore:

app/Download.py

@@ -7,9 +7,9 @@ import os
 import re
 import shutil
 import yt_dlp
-from src.Utils import get_format, get_opts, jsonCookie, mergeConfig
-from src.DTO.ItemDTO import ItemDTO
-from src.Notifier import Notifier
+from Utils import get_format, get_opts, jsonCookie, mergeConfig
+from ItemDTO import ItemDTO
+from Notifier import Notifier
 
 log = logging.getLogger('download')
 

app/DownloadQueue.py

@@ -5,12 +5,12 @@ import os
 import time
 import yt_dlp
 from sqlite3 import Connection
-from src.Config import Config
-from src.Notifier import Notifier
-from src.Download import Download
-from src.DTO.ItemDTO import ItemDTO
-from src.DataStore import DataStore
-from src.Utils import ObjectSerializer, calcDownloadPath, ExtractInfo, mergeConfig
+from Config import Config
+from Notifier import Notifier
+from Download import Download
+from ItemDTO import ItemDTO
+from DataStore import DataStore
+from Utils import ObjectSerializer, calcDownloadPath, ExtractInfo, mergeConfig
 from datetime import datetime, timezone
 
 log = logging.getLogger('DownloadQueue')

app/Notifier.py

@@ -1,5 +1,5 @@
 from socketio import AsyncServer
-from src.Utils import ObjectSerializer
+from Utils import ObjectSerializer
 
 
 class Notifier:

app/main.py

@@ -5,15 +5,15 @@ from datetime import datetime
 import json
 import os
 import random
-from src.Config import Config
+from Config import Config
 from version import APP_VERSION
-from src.Notifier import Notifier
-from src.DownloadQueue import DownloadQueue
-from src.Utils import ObjectSerializer
+from Notifier import Notifier
+from DownloadQueue import DownloadQueue
+from Utils import ObjectSerializer
 from aiohttp import web
 from aiohttp.web import Request, Response
-from src.M3u8 import M3u8
-from src.Segments import Segments
+from player.M3u8 import M3u8
+from player.Segments import Segments
 import socketio
 import logging
 import caribou

app/player/M3u8.py

@@ -1,9 +1,9 @@
 import math
 import os
 from urllib.parse import quote
-from src.Utils import calcDownloadPath
-from src.ffprobe import FFProbe
-from src.Config import Config
+from Utils import calcDownloadPath
+from .ffprobe import FFProbe
+from Config import Config
 
 
 class M3u8:

app/player/Segments.py

@@ -3,8 +3,8 @@ import logging
 import os
 import subprocess
 import tempfile
-from src.Utils import calcDownloadPath
-from src.Config import Config
+from Utils import calcDownloadPath
+from Config import Config
 
 log = logging.getLogger('segments')
 

app/player/ffprobe.py

@@ -6,7 +6,6 @@ import json
 import operator
 import os
 import pipes
-import re
 import subprocess