Refactor arches

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/arches.py b/src/buildservice/arches.py
index e9c2fc76ccf6c0c35215521660b1e439b683ad8b..faab8982bd1229851cbf69ad7570bf9666910133 100644 (file)
--- a/src/buildservice/arches.py
+++ b/src/buildservice/arches.py
@@ -41,82 +41,13 @@ class Arches(base.Object):
 
                return False
 
-       def get_all(self, really=False):
-               query = "SELECT * FROM arches"
-
-               if not really:
-                       query += " WHERE binary = 'Y'"
-               else:
-                       query += " WHERE NOT name = 'src'"
-
-               query += " ORDER BY prio ASC"
-
-               arches = self.db.query(query)
-
-               return [Arch(self.pakfire, a.id, a) for a in arches]
-
-       def get_name_by_id(self, id):
-               arch = self.db.get("SELECT name FROM arches WHERE id = %s", id)
-
-               return arch.name
-
-       def get_id_by_name(self, name):
-               arch = self.db.get("SELECT id FROM arches WHERE name = %s", name)
-
-               if arch:
-                       return arch.id
-
-       def get_by_name(self, name):
-               id = self.get_id_by_name(name)
-
-               if id:
-                       return self.get_by_id(id)
-
-       def get_by_id(self, id):
-               return Arch(self.pakfire, id)
-
-       def exists(self, id):
-               arch = self.db.get("SELECT id FROM arches WHERE id = %s", id)
-
-               if arch:
-                       return True
-
-               return False
-
        def expand(self, arches):
-               args = []
-
                if arches == "all":
-                       query = "SELECT id FROM arches WHERE name != 'noarch'"
-               else:
-                       query = []
-
-                       for arch in arches.split():
-                               args.append(arch)
-                               query.append("name = %s")
-
-                       query = "SELECT id FROM arches WHERE (%s)" % " OR ".join(query)
-
-               return sorted([self.get_by_id(a.id) for a in self.db.query(query, *args)])
-
-
-class Arch(base.DataObject):
-       table = "arches"
-
-       def __cmp__(self, other):
-               return cmp(self.prio, other.prio)
-
-       @property
-       def name(self):
-               return self.data.name
-
-       @property
-       def prio(self):
-               return self.data.prio
+                       return list(self)
 
-       @property
-       def build_type(self):
-               if self.name == "src":
-                       return "source"
+               res = []
+               for arch in arches.split():
+                       if self.exists(arch):
+                               res.append(arch)
 
-               return "binary"
+               return res

diff --git a/src/web/handlers_base.py b/src/web/handlers_base.py
index e18548b8235abff01e658ba50f6cd198757b9cea..aeea43d9ca903c9b7ce09aa07a6b41b01738529e 100644 (file)
--- a/src/web/handlers_base.py
+++ b/src/web/handlers_base.py
@@ -119,10 +119,6 @@ class BaseHandler(tornado.web.RequestHandler):
        def pakfire(self):
                return self.backend
 
-       @property
-       def arches(self):
-               return self.pakfire.arches
-
        @property
        def mirrors(self):
                return self.pakfire.mirrors