From a376cafe07b319d0e7f71a7cdc4583eececa9561 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Jun 2017 15:23:07 +0100 Subject: populate each category with at least 2 apps --- src/frontend/gui/accesories.py | 17 ++++++++++++++++- src/frontend/gui/development.py | 16 +++++++++++++++- src/frontend/gui/graphics.py | 16 +++++++++++++++- src/frontend/gui/internet.py | 3 ++- src/frontend/gui/multimedia.py | 16 +++++++++++++++- src/frontend/gui/system.py | 16 +++++++++++++++- 6 files changed, 78 insertions(+), 6 deletions(-) diff --git a/src/frontend/gui/accesories.py b/src/frontend/gui/accesories.py index 32d3b68..253178b 100755 --- a/src/frontend/gui/accesories.py +++ b/src/frontend/gui/accesories.py @@ -37,7 +37,22 @@ class Accesories(QtWidgets.QMainWindow): def load_packages(self): with sqlite3.connect('/var/lib/sisyphus/db/sisyphus.db') as db: cursor=db.cursor() - cursor.execute('''SELECT * from remote_packages''') + cursor.execute('''SELECT + a.category AS cat, + a.name AS pn, + a.version AS av, + i.version AS iv, + a.description AS descr + FROM remote_packages AS a + LEFT JOIN local_packages AS i + ON a.category = i.category + AND a.name = i.name + AND a.slot = i.slot + WHERE a.name IN + ('ark', + 'featherpad', + 'kcalc') + ''') rows = cursor.fetchall() for row in rows: diff --git a/src/frontend/gui/development.py b/src/frontend/gui/development.py index ede83a4..2c3a66b 100755 --- a/src/frontend/gui/development.py +++ b/src/frontend/gui/development.py @@ -37,7 +37,21 @@ class Development(QtWidgets.QMainWindow): def load_packages(self): with sqlite3.connect('/var/lib/sisyphus/db/sisyphus.db') as db: cursor=db.cursor() - cursor.execute('''SELECT * from remote_packages''') + cursor.execute('''SELECT + a.category AS cat, + a.name AS pn, + a.version AS av, + i.version AS iv, + a.description AS descr + FROM remote_packages AS a + LEFT JOIN local_packages AS i + ON a.category = i.category + AND a.name = i.name + AND a.slot = i.slot + WHERE a.name IN + ('notepadqq', + 'qt-creator') + ''') rows = cursor.fetchall() for row in rows: diff --git a/src/frontend/gui/graphics.py b/src/frontend/gui/graphics.py index a50a169..4312070 100755 --- a/src/frontend/gui/graphics.py +++ b/src/frontend/gui/graphics.py @@ -37,7 +37,21 @@ class Graphics(QtWidgets.QMainWindow): def load_packages(self): with sqlite3.connect('/var/lib/sisyphus/db/sisyphus.db') as db: cursor=db.cursor() - cursor.execute('''SELECT * from remote_packages''') + cursor.execute('''SELECT + a.category AS cat, + a.name AS pn, + a.version AS av, + i.version AS iv, + a.description AS descr + FROM remote_packages AS a + LEFT JOIN local_packages AS i + ON a.category = i.category + AND a.name = i.name + AND a.slot = i.slot + WHERE a.name IN + ('gimp', + 'gimp-lqr') + ''') rows = cursor.fetchall() for row in rows: diff --git a/src/frontend/gui/internet.py b/src/frontend/gui/internet.py index e8ad1d3..fc25c45 100755 --- a/src/frontend/gui/internet.py +++ b/src/frontend/gui/internet.py @@ -86,7 +86,8 @@ class Internet(QtWidgets.QMainWindow): 'trojita', 'aircrack-ng', 'wavemon', - 'messengerfordesktop') + 'messengerfordesktop', + 'opera-ffmpeg-codecs') ''') rows = cursor.fetchall() diff --git a/src/frontend/gui/multimedia.py b/src/frontend/gui/multimedia.py index e4214f2..20bb40f 100755 --- a/src/frontend/gui/multimedia.py +++ b/src/frontend/gui/multimedia.py @@ -37,7 +37,21 @@ class Multimedia(QtWidgets.QMainWindow): def load_packages(self): with sqlite3.connect('/var/lib/sisyphus/db/sisyphus.db') as db: cursor=db.cursor() - cursor.execute('''SELECT * from remote_packages''') + cursor.execute('''SELECT + a.category AS cat, + a.name AS pn, + a.version AS av, + i.version AS iv, + a.description AS descr + FROM remote_packages AS a + LEFT JOIN local_packages AS i + ON a.category = i.category + AND a.name = i.name + AND a.slot = i.slot + WHERE a.name IN + ('mpv', + 'vlc') + ''') rows = cursor.fetchall() for row in rows: diff --git a/src/frontend/gui/system.py b/src/frontend/gui/system.py index f8cc428..d3ccbe9 100755 --- a/src/frontend/gui/system.py +++ b/src/frontend/gui/system.py @@ -37,7 +37,21 @@ class System(QtWidgets.QMainWindow): def load_packages(self): with sqlite3.connect('/var/lib/sisyphus/db/sisyphus.db') as db: cursor=db.cursor() - cursor.execute('''SELECT * from remote_packages''') + cursor.execute('''SELECT + a.category AS cat, + a.name AS pn, + a.version AS av, + i.version AS iv, + a.description AS descr + FROM remote_packages AS a + LEFT JOIN local_packages AS i + ON a.category = i.category + AND a.name = i.name + AND a.slot = i.slot + WHERE a.name IN + ('aqemu', + 'virtualbox') + ''') rows = cursor.fetchall() for row in rows: -- cgit v1.2.3