fix imports in dbsearch (no need to import the whole thing), rename it so we have something uniform

3 files changed, 6 insertions, 5 deletions

diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index c13a513..59c927c 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -6,7 +6,6 @@ from .cache import *
 from .check import *
 from .csvfiles import *
 from .database import *
-from .dbsearch import *
 from .filesystem import *
 from .installbinary import *
 from .installebuild import *
@@ -14,7 +13,8 @@ from .killportage import *
 from .metadata import *
 from .mirror import *
 from .rescue import *
-from .search import *
+from .searchbinary import *
+from .searchebuild import *
 from .setjobs import *
 from .setprofile import *
 from .solvedeps import *
diff --git a/src/backend/dbsearch.py b/src/backend/searchbinary.py
index 6e954b0..0305a14 100644
--- a/src/backend/dbsearch.py
+++ b/src/backend/searchbinary.py
@@ -1,8 +1,9 @@
 #!/usr/bin/python3
 
-import sisyphus
-import sqlite3
 import os
+import sisyphus.filesystem
+import sisyphus.update
+import sqlite3
 
 def searchDB(filter, cat = '', pn = '', desc = ''):
     NOVIRT = "AND cat NOT LIKE 'virtual'"
@@ -100,7 +101,7 @@ def searchDB(filter, cat = '', pn = '', desc = ''):
 def tosql(string):
     return '%%' if string == '' else string.replace('*', '%').replace('?', '_')
 
-def showSearch(filter, cat, pn, desc, single = False):
+def start(filter, cat, pn, desc, single = False):
     if os.getuid() == 0:
         sisyphus.update.start()
     else:
diff --git a/src/backend/search.py b/src/backend/searchebuild.py
index c9b5862..c9b5862 100644
--- a/src/backend/search.py
+++ b/src/backend/searchebuild.py