From 49f9d629f3e8cadeb654d2da971e0cb97c4d092b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Apr 2017 00:08:20 +0100 Subject: rearrange the code a bit...it will be more easy to populate the tables --- office.py | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-) (limited to 'office.py') diff --git a/office.py b/office.py index 068b01e..819d264 100755 --- a/office.py +++ b/office.py @@ -37,21 +37,40 @@ class Office(QtWidgets.QMainWindow): def load_packages(self): with sqlite3.connect('/var/lib/epkg/db/epkg.db') as db: cursor=db.cursor() - 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 - ('fet', 'libreoffice', 'wps-office', 'tesseract', 'cantarell', 'corefonts', 'dejavu', 'liberation-fonts', 'libertine', 'noto', 'open-sans', 'roboto', 'ttf-bitstream-vera', 'qpdfview', 'cups', 'cups-filters', 'cups-pdf', 'simple-scan', 'cnijfilter', 'cnijfilter-drivers', 'hplip') - ''') + 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 + ('fet', + 'libreoffice', + 'wps-office', + 'tesseract', + 'cantarell', + 'corefonts', + 'dejavu', + 'liberation-fonts', + 'libertine', + 'noto', + 'open-sans', + 'roboto', + 'ttf-bitstream-vera', + 'qpdfview', + 'cups', + 'cups-filters', + 'cups-pdf', + 'simple-scan', + 'cnijfilter', + 'cnijfilter-drivers', + 'hplip') + ''') rows = cursor.fetchall() for row in rows: -- cgit v1.2.3