From de5ae6408a1bec1185ebaf2e57fb292d90852529 Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Fri, 8 Apr 2022 19:10:20 +0200
Subject: [PATCH] Refactored imports to avoid DB startup for unrelated tasks

---
 maloja/proccontrol/control.py                | 3 ++-
 maloja/proccontrol/tasks/export.py           | 4 ++--
 maloja/proccontrol/tasks/generate.py         | 5 +++--
 maloja/proccontrol/tasks/import_scrobbles.py | 4 +++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/maloja/proccontrol/control.py b/maloja/proccontrol/control.py
index 15f7a19..fd2aeba 100644
--- a/maloja/proccontrol/control.py
+++ b/maloja/proccontrol/control.py
@@ -10,7 +10,7 @@ from .setup import setup
 from . import tasks
 from .. import __pkginfo__ as info
 from .. import globalconf
-from .. import server
+
 
 
 def print_header_info():
@@ -88,6 +88,7 @@ def onlysetup():
 def direct():
 	print_header_info()
 	setup()
+	from .. import server
 	server.run_server()
 
 def debug():
diff --git a/maloja/proccontrol/tasks/export.py b/maloja/proccontrol/tasks/export.py
index e6edcf5..a1e2a2b 100644
--- a/maloja/proccontrol/tasks/export.py
+++ b/maloja/proccontrol/tasks/export.py
@@ -4,10 +4,10 @@ import time
 
 from doreah.io import col
 
-from ...database.sqldb import get_scrobbles
-
 def export(targetfolder=None):
 
+	from ...database.sqldb import get_scrobbles
+
 	if targetfolder is None:
 		targetfolder = os.getcwd()
 
diff --git a/maloja/proccontrol/tasks/generate.py b/maloja/proccontrol/tasks/generate.py
index 83fc741..225b6ce 100644
--- a/maloja/proccontrol/tasks/generate.py
+++ b/maloja/proccontrol/tasks/generate.py
@@ -2,8 +2,6 @@ import random
 import datetime
 from doreah.io import ask
 
-from ...database.sqldb import add_scrobbles
-
 
 artists = [
 	"Chou Tzuyu","Jennie Kim","Kim Seolhyun","Nancy McDonie","Park Junghwa","Hirai Momo","Rosé Park","Laura Brehm","HyunA",
@@ -69,6 +67,9 @@ def generate_track():
 
 
 def generate(n=200):
+
+	from ...database.sqldb import add_scrobbles
+	
 	n = int(n)
 
 	if ask("Generate random scrobbles?",default=False):
diff --git a/maloja/proccontrol/tasks/import_scrobbles.py b/maloja/proccontrol/tasks/import_scrobbles.py
index 5e9f1cf..fec1f83 100644
--- a/maloja/proccontrol/tasks/import_scrobbles.py
+++ b/maloja/proccontrol/tasks/import_scrobbles.py
@@ -5,7 +5,7 @@ from doreah.io import col, ask, prompt
 
 from ...cleanup import *
 from ...globalconf import data_dir
-from ...database.sqldb import add_scrobbles
+
 
 c = CleanerAgent()
 
@@ -21,6 +21,8 @@ outputs = {
 
 def import_scrobbles(inputf):
 
+	from ...database.sqldb import add_scrobbles
+
 	result = {
 		"CONFIDENT_IMPORT": 0,
 		"UNCERTAIN_IMPORT": 0,