From 87fa34f9c547e4b6649ab90a1f3838499cbc44a1 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 18 Dec 2019 04:25:52 +1100 Subject: minimaws: load more stuff, link more stuff --- scripts/minimaws/lib/dbaccess.py | 436 +++++++++++++++++++++++--------------- scripts/minimaws/lib/htmltmpl.py | 93 +++++++- scripts/minimaws/lib/lxparse.py | 17 +- scripts/minimaws/lib/wsgiserve.py | 101 ++++++--- scripts/minimaws/minimaws.py | 2 +- 5 files changed, 444 insertions(+), 205 deletions(-) (limited to 'scripts/minimaws') diff --git a/scripts/minimaws/lib/dbaccess.py b/scripts/minimaws/lib/dbaccess.py index 68bdc98901b..cc359bfa65c 100644 --- a/scripts/minimaws/lib/dbaccess.py +++ b/scripts/minimaws/lib/dbaccess.py @@ -11,11 +11,90 @@ if sys.version_info >= (3, 4): class SchemaQueries(object): + # software lists + CREATE_SOFTWAREINFOTYPE = \ + 'CREATE TABLE softwareinfotype (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' name TEXT NOT NULL,\n' \ + ' UNIQUE (name ASC))' + CREATE_SOFTWARESHAREDFEATTYPE = \ + 'CREATE TABLE softwaresharedfeattype (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' name TEXT NOT NULL,\n' \ + ' UNIQUE (name ASC))' + CREATE_SOFTWAREPARTFEATURETYPE = \ + 'CREATE TABLE softwarepartfeaturetype (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' name TEXT NOT NULL,\n' \ + ' UNIQUE (name ASC))' + CREATE_SOFTWARELIST = \ + 'CREATE TABLE softwarelist (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' shortname TEXT NOT NULL,\n' \ + ' description TEXT NOT NULL,\n' \ + ' UNIQUE (shortname ASC))' + CREATE_SOFTWARE = \ + 'CREATE TABLE software (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' softwarelist INTEGER NOT NULL,\n' \ + ' shortname TEXT NOT NULL,\n' \ + ' supported INTEGER NOT NULL,\n' \ + ' description TEXT NOT NULL,\n' \ + ' year TEXT NOT NULL,\n' \ + ' publisher TEXT NOT NULL,\n' \ + ' UNIQUE (softwarelist ASC, shortname ASC),\n' \ + ' FOREIGN KEY (softwarelist) REFERENCES softwarelist (id))' + CREATE_SOFTWARECLONEOF = \ + 'CREATE TABLE softwarecloneof (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' parent INTEGER NOT NULL,\n' \ + ' FOREIGN KEY (id) REFERENCES software (id),\n' \ + ' FOREIGN KEY (parent) REFERENCES software (id))' + CREATE_SOFTWAREINFO = \ + 'CREATE TABLE softwareinfo (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' software INTEGER NOT NULL,\n' \ + ' infotype INTEGER NOT NULL,\n' \ + ' value TEXT NOT NULL,\n' \ + ' FOREIGN KEY (software) REFERENCES software (id),\n' \ + ' FOREIGN KEY (infotype) REFERENCES softwareinfotype (id))' + CREATE_SOFTWARESHAREDFEAT = \ + 'CREATE TABLE softwaresharedfeat (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' software INTEGER NOT NULL,\n' \ + ' sharedfeattype INTEGER NOT NULL,\n' \ + ' value TEXT NOT NULL,\n' \ + ' UNIQUE (software ASC, sharedfeattype ASC),\n' \ + ' FOREIGN KEY (software) REFERENCES software (id),\n' \ + ' FOREIGN KEY (sharedfeattype) REFERENCES softwaresharedfeattype (id))' + CREATE_SOFTWAREPART = \ + 'CREATE TABLE softwarepart (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' software INTEGER NOT NULL,\n' \ + ' shortname TEXT NOT NULL,\n' \ + ' interface TEXT NOT NULL,\n' \ + ' UNIQUE (software ASC, shortname ASC))' + CREATE_SOFTWAREPARTFEATURE = \ + 'CREATE TABLE softwarepartfeature (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' part INTEGER NOT NULL,\n' \ + ' featuretype INTEGER NOT NULL,\n' \ + ' value TEXT NOT NULL,\n' \ + ' UNIQUE (part ASC, featuretype ASC),\n' \ + ' FOREIGN KEY (part) REFERENCES softwarepart (id),\n' \ + ' FOREIGN KEY (featuretype) REFERENCES softwarepartfeaturetype (id))' + + # machines CREATE_FEATURETYPE = \ 'CREATE TABLE featuretype (\n' \ ' id INTEGER PRIMARY KEY,\n' \ ' name TEXT NOT NULL,\n' \ ' UNIQUE (name ASC))' + CREATE_MACHINESOFTWARELISTSTATUSTYPE = \ + 'CREATE TABLE machinesoftwareliststatustype (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' value TEXT NOT NULL,\n' \ + ' UNIQUE (value ASC))' CREATE_SOURCEFILE = \ 'CREATE TABLE sourcefile (\n' \ ' id INTEGER PRIMARY KEY,\n' \ @@ -141,71 +220,19 @@ class SchemaQueries(object): ' size INTEGER NOT NULL,\n' \ ' FOREIGN KEY (machine) REFERENCES machine (id),\n' \ ' FOREIGN KEY (machine, size) REFERENCES ramoption (machine, size))' - CREATE_SOFTWAREINFOTYPE = \ - 'CREATE TABLE softwareinfotype (\n' \ - ' id INTEGER PRIMARY KEY,\n' \ - ' name TEXT NOT NULL,\n' \ - ' UNIQUE (name ASC))' - CREATE_SOFTWARESHAREDFEATTYPE = \ - 'CREATE TABLE softwaresharedfeattype (\n' \ - ' id INTEGER PRIMARY KEY,\n' \ - ' name TEXT NOT NULL,\n' \ - ' UNIQUE (name ASC))' - CREATE_SOFTWAREPARTFEATURETYPE = \ - 'CREATE TABLE softwarepartfeaturetype (\n' \ - ' id INTEGER PRIMARY KEY,\n' \ - ' name TEXT NOT NULL,\n' \ - ' UNIQUE (name ASC))' - CREATE_SOFTWARELIST = \ - 'CREATE TABLE softwarelist (\n' \ - ' id INTEGER PRIMARY KEY,\n' \ - ' shortname TEXT NOT NULL,\n' \ - ' description TEXT NOT NULL,\n' \ - ' UNIQUE (shortname ASC))' - CREATE_SOFTWARE = \ - 'CREATE TABLE software (\n' \ + CREATE_MACHINESOFTWARELIST = \ + 'CREATE TABLE machinesoftwarelist (\n' \ ' id INTEGER PRIMARY KEY,\n' \ + ' machine INTEGER NOT NULL,\n' \ ' softwarelist INTEGER NOT NULL,\n' \ - ' shortname TEXT NOT NULL,\n' \ - ' supported INTEGER NOT NULL,\n' \ - ' description TEXT NOT NULL,\n' \ - ' year TEXT NOT NULL,\n' \ - ' publisher TEXT NOT NULL,\n' \ - ' UNIQUE (softwarelist ASC, shortname ASC),\n' \ - ' FOREIGN KEY (softwarelist) REFERENCES softwarelist (id))' - CREATE_SOFTWAREINFO = \ - 'CREATE TABLE softwareinfo (\n' \ - ' id INTEGER PRIMARY KEY,\n' \ - ' software INTEGER NOT NULL,\n' \ - ' infotype INTEGER NOT NULL,\n' \ - ' value TEXT NOT NULL,\n' \ - ' FOREIGN KEY (software) REFERENCES software (id),\n' \ - ' FOREIGN KEY (infotype) REFERENCES softwareinfotype (id))' - CREATE_SOFTWARESHAREDFEAT = \ - 'CREATE TABLE softwaresharedfeat (\n' \ - ' id INTEGER PRIMARY KEY,\n' \ - ' software INTEGER NOT NULL,\n' \ - ' sharedfeattype INTEGER NOT NULL,\n' \ - ' value TEXT NOT NULL,\n' \ - ' UNIQUE (software ASC, sharedfeattype ASC),\n' \ - ' FOREIGN KEY (software) REFERENCES software (id),\n' \ - ' FOREIGN KEY (sharedfeattype) REFERENCES softwaresharedfeattype (id))' - CREATE_SOFTWAREPART = \ - 'CREATE TABLE softwarepart (\n' \ - ' id INTEGER PRIMARY KEY,\n' \ - ' software INTEGER NOT NULL,\n' \ - ' shortname TEXT NOT NULL,\n' \ - ' interface TEXT NOT NULL,\n' \ - ' UNIQUE (software ASC, shortname ASC))' - CREATE_SOFTWAREPARTFEATURE = \ - 'CREATE TABLE softwarepartfeature (\n' \ - ' id INTEGER PRIMARY KEY,\n' \ - ' part INTEGER NOT NULL,\n' \ - ' featuretype INTEGER NOT NULL,\n' \ - ' value TEXT NOT NULL,\n' \ - ' UNIQUE (part ASC, featuretype ASC),\n' \ - ' FOREIGN KEY (part) REFERENCES softwarepart (id),\n' \ - ' FOREIGN KEY (featuretype) REFERENCES softwarepartfeaturetype (id))' + ' tag TEXT NOT NULL,\n' \ + ' status INTEGER NOT NULL,\n' \ + ' UNIQUE (machine ASC, tag ASC),\n' \ + ' FOREIGN KEY (machine) REFERENCES machine (id),\n' \ + ' FOREIGN KEY (softwarelist) REFERENCES softwarelist (id),' \ + ' FOREIGN KEY (status) REFERENCES machinesoftwareliststatustype (id))' + + # media CREATE_ROM = \ 'CREATE TABLE rom (\n' \ ' id INTEGER PRIMARY KEY,\n' \ @@ -254,28 +281,18 @@ class SchemaQueries(object): ' FOREIGN KEY (disk) REFERENCES disk (id),\n' \ ' UNIQUE (part, disk, name))' + # create temporary tables used during loading + CREATE_TEMPORARY_SOFTWARECLONEOF = 'CREATE TEMPORARY TABLE temp_softwarecloneof (id INTEGER PRIMARY KEY, parent TEXT NOT NULL)' CREATE_TEMPORARY_DEVICEREFERENCE = 'CREATE TEMPORARY TABLE temp_devicereference (id INTEGER PRIMARY KEY, machine INTEGER NOT NULL, device TEXT NOT NULL, UNIQUE (machine, device))' CREATE_TEMPORARY_SLOTOPTION = 'CREATE TEMPORARY TABLE temp_slotoption (id INTEGER PRIMARY KEY, slot INTEGER NOT NULL, device TEXT NOT NULL, name TEXT NOT NULL)' CREATE_TEMPORARY_SLOTDEFAULT = 'CREATE TEMPORARY TABLE temp_slotdefault (id INTEGER PRIMARY KEY, slotoption INTEGER NOT NULL)' + # drop temporary tables used during loading + DROP_TEMPORARY_SOFTWARECLONEOF = 'DROP TABLE IF EXISTS temp_softwarecloneof' DROP_TEMPORARY_DEVICEREFERENCE = 'DROP TABLE IF EXISTS temp_devicereference' DROP_TEMPORARY_SLOTOPTION = 'DROP TABLE IF EXISTS temp_slotoption' DROP_TEMPORARY_SLOTDEFAULT = 'DROP TABLE IF EXISTS temp_slotdefault' - INDEX_MACHINE_ISDEVICE_SHORTNAME = 'CREATE INDEX machine_isdevice_shortname ON machine (isdevice ASC, shortname ASC)' - INDEX_MACHINE_ISDEVICE_DESCRIPTION = 'CREATE INDEX machine_isdevice_description ON machine (isdevice ASC, description ASC)' - INDEX_MACHINE_RUNNABLE_SHORTNAME = 'CREATE INDEX machine_runnable_shortname ON machine (runnable ASC, shortname ASC)' - INDEX_MACHINE_RUNNABLE_DESCRIPTION = 'CREATE INDEX machine_runnable_description ON machine (runnable ASC, description ASC)' - - INDEX_SYSTEM_YEAR = 'CREATE INDEX system_year ON system (year ASC)' - INDEX_SYSTEM_MANUFACTURER = 'CREATE INDEX system_manufacturer ON system (manufacturer ASC)' - - INDEX_ROMOF_PARENT = 'CREATE INDEX romof_parent ON romof (parent ASC)' - - INDEX_CLONEOF_PARENT = 'CREATE INDEX cloneof_parent ON cloneof (parent ASC)' - - INDEX_DIPSWITCH_MACHINE_ISCONFIG = 'CREATE INDEX dipswitch_machine_isconfig ON dipswitch (machine ASC, isconfig ASC)' - INDEX_SOFTWARE_SOFTWARELIST_SUPPORTED = 'CREATE INDEX software_softwarelist_supported ON software (softwarelist ASC, supported ASC)' INDEX_SOFTWARE_SOFTWARELIST_YEAR = 'CREATE INDEX software_softwarelist_year ON software (softwarelist ASC, year ASC)' INDEX_SOFTWARE_SOFTWARELIST_PUBLISHER = 'CREATE INDEX software_softwarelist_publisher ON software (softwarelist ASC, publisher ASC)' @@ -283,6 +300,8 @@ class SchemaQueries(object): INDEX_SOFTWARE_YEAR_SOFTWARELIST = 'CREATE INDEX software_year_softwarelist ON software (year ASC, softwarelist ASC)' INDEX_SOFTWARE_PUBLISHER_SOFTWARELIST = 'CREATE INDEX software_publisher_softwarelist ON software (publisher ASC, softwarelist ASC)' + INDEX_SOFTWARECLONEOF_PARENT = 'CREATE INDEX softwarecloneof_parent ON softwarecloneof (parent ASC)' + INDEX_SOFTWAREINFO_SOFTWARE_INFOTYPE = 'CREATE INDEX softwareinfo_software_infotype ON softwareinfo (software ASC, infotype ASC)' INDEX_SOFTWAREINFO_INFOTYPE_VALUE_SOFTWARE = 'CREATE INDEX softwareinfo_infotype_value_software ON softwareinfo (infotype ASC, value ASC, software ASC)' @@ -292,6 +311,22 @@ class SchemaQueries(object): INDEX_SOFTWAREPARTFEATURE_FEATURETYPE_VALUE_PART = 'CREATE INDEX softwarepartfeature_featuretype_value_part ON softwarepartfeature (featuretype ASC, value ASC, part ASC)' + INDEX_MACHINE_ISDEVICE_SHORTNAME = 'CREATE INDEX machine_isdevice_shortname ON machine (isdevice ASC, shortname ASC)' + INDEX_MACHINE_ISDEVICE_DESCRIPTION = 'CREATE INDEX machine_isdevice_description ON machine (isdevice ASC, description ASC)' + INDEX_MACHINE_RUNNABLE_SHORTNAME = 'CREATE INDEX machine_runnable_shortname ON machine (runnable ASC, shortname ASC)' + INDEX_MACHINE_RUNNABLE_DESCRIPTION = 'CREATE INDEX machine_runnable_description ON machine (runnable ASC, description ASC)' + + INDEX_SYSTEM_YEAR = 'CREATE INDEX system_year ON system (year ASC)' + INDEX_SYSTEM_MANUFACTURER = 'CREATE INDEX system_manufacturer ON system (manufacturer ASC)' + + INDEX_ROMOF_PARENT = 'CREATE INDEX romof_parent ON romof (parent ASC)' + + INDEX_CLONEOF_PARENT = 'CREATE INDEX cloneof_parent ON cloneof (parent ASC)' + + INDEX_DIPSWITCH_MACHINE_ISCONFIG = 'CREATE INDEX dipswitch_machine_isconfig ON dipswitch (machine ASC, isconfig ASC)' + + INDEX_MACHINESOFTWARELIST_SOFTWARELIST_MACHINE = 'CREATE INDEX machinesoftwarelist_softwarelist_machine ON machinesoftwarelist (softwarelist ASC, machine ASC)' + INDEX_ROMDUMP_ROM = 'CREATE INDEX romdump_rom ON romdump (rom ASC)' INDEX_ROMDUMP_MACHINE_BAD = 'CREATE INDEX romdump_machine_bad ON romdump (machine ASC, bad ASC)' @@ -304,20 +339,6 @@ class SchemaQueries(object): INDEX_SOFTWAREDISKDUMP_DISK = 'CREATE INDEX softwarediskdump_disk ON softwarediskdump (disk ASC)' INDEX_SOFTWAREDISKDUMP_PART_BAD = 'CREATE INDEX softwarediskdump_part_bad ON softwarediskdump (part ASC, bad ASC)' - DROP_MACHINE_ISDEVICE_SHORTNAME = 'DROP INDEX IF EXISTS machine_isdevice_shortname' - DROP_MACHINE_ISDEVICE_DESCRIPTION = 'DROP INDEX IF EXISTS machine_isdevice_description' - DROP_MACHINE_RUNNABLE_SHORTNAME = 'DROP INDEX IF EXISTS machine_runnable_shortname' - DROP_MACHINE_RUNNABLE_DESCRIPTION = 'DROP INDEX IF EXISTS machine_runnable_description' - - DROP_SYSTEM_YEAR = 'DROP INDEX IF EXISTS system_year' - DROP_SYSTEM_MANUFACTURER = 'DROP INDEX IF EXISTS system_manufacturer' - - DROP_ROMOF_PARENT = 'DROP INDEX IF EXISTS romof_parent' - - DROP_CLONEOF_PARENT = 'DROP INDEX IF EXISTS cloneof_parent' - - DROP_DIPSWITCH_MACHINE_ISCONFIG = 'DROP INDEX IF EXISTS dipswitch_machine_isconfig' - DROP_SOFTWARE_SOFTWARELIST_SUPPORTED = 'DROP INDEX IF EXISTS software_softwarelist_supported' DROP_SOFTWARE_SOFTWARELIST_YEAR = 'DROP INDEX IF EXISTS software_softwarelist_year' DROP_SOFTWARE_SOFTWARELIST_PUBLISHER = 'DROP INDEX IF EXISTS software_softwarelist_publisher' @@ -325,6 +346,8 @@ class SchemaQueries(object): DROP_SOFTWARE_YEAR_SOFTWARELIST = 'DROP INDEX IF EXISTS software_year_softwarelist' DROP_SOFTWARE_PUBLISHER_SOFTWARELIST = 'DROP INDEX IF EXISTS software_publisher_softwarelist' + DROP_SOFTWARECLONEOF_PARENT = 'DROP INDEX IF EXISTS softwarecloneof_parent' + DROP_SOFTWAREINFO_SOFTWARE_INFOTYPE = 'DROP INDEX IF EXISTS softwareinfo_software_infotype' DROP_SOFTWAREINFO_INFOTYPE_VALUE_SOFTWARE = 'DROP INDEX IF EXISTS softwareinfo_infotype_value_software' @@ -334,6 +357,22 @@ class SchemaQueries(object): DROP_SOFTWAREPARTFEATURE_FEATURETYPE_VALUE_PART = 'DROP INDEX IF EXISTS softwarepartfeature_featuretype_value_part' + DROP_MACHINE_ISDEVICE_SHORTNAME = 'DROP INDEX IF EXISTS machine_isdevice_shortname' + DROP_MACHINE_ISDEVICE_DESCRIPTION = 'DROP INDEX IF EXISTS machine_isdevice_description' + DROP_MACHINE_RUNNABLE_SHORTNAME = 'DROP INDEX IF EXISTS machine_runnable_shortname' + DROP_MACHINE_RUNNABLE_DESCRIPTION = 'DROP INDEX IF EXISTS machine_runnable_description' + + DROP_SYSTEM_YEAR = 'DROP INDEX IF EXISTS system_year' + DROP_SYSTEM_MANUFACTURER = 'DROP INDEX IF EXISTS system_manufacturer' + + DROP_ROMOF_PARENT = 'DROP INDEX IF EXISTS romof_parent' + + DROP_CLONEOF_PARENT = 'DROP INDEX IF EXISTS cloneof_parent' + + DROP_DIPSWITCH_MACHINE_ISCONFIG = 'DROP INDEX IF EXISTS dipswitch_machine_isconfig' + + DROP_MACHINESOFTWARELIST_SOFTWARELIST_MACHINE = 'DROP INDEX IF EXISTS machinesoftwarelist_softwarelist_machine' + DROP_ROMDUMP_ROM = 'DROP INDEX IF EXISTS romdump_rom' DROP_ROMDUMP_MACHINE_BAD = 'DROP INDEX IF EXISTS romdump_machine_bad' @@ -347,7 +386,18 @@ class SchemaQueries(object): DROP_SOFTWAREDISKDUMP_PART_BAD = 'DROP INDEX IF EXISTS softwarediskdump_part_bad' CREATE_TABLES = ( + CREATE_SOFTWAREINFOTYPE, + CREATE_SOFTWARESHAREDFEATTYPE, + CREATE_SOFTWAREPARTFEATURETYPE, + CREATE_SOFTWARELIST, + CREATE_SOFTWARE, + CREATE_SOFTWARECLONEOF, + CREATE_SOFTWAREINFO, + CREATE_SOFTWARESHAREDFEAT, + CREATE_SOFTWAREPART, + CREATE_SOFTWAREPARTFEATURE, CREATE_FEATURETYPE, + CREATE_MACHINESOFTWARELISTSTATUSTYPE, CREATE_SOURCEFILE, CREATE_MACHINE, CREATE_SYSTEM, @@ -365,15 +415,7 @@ class SchemaQueries(object): CREATE_SLOTDEFAULT, CREATE_RAMOPTION, CREATE_RAMDEFAULT, - CREATE_SOFTWAREINFOTYPE, - CREATE_SOFTWARESHAREDFEATTYPE, - CREATE_SOFTWAREPARTFEATURETYPE, - CREATE_SOFTWARELIST, - CREATE_SOFTWARE, - CREATE_SOFTWAREINFO, - CREATE_SOFTWARESHAREDFEAT, - CREATE_SOFTWAREPART, - CREATE_SOFTWAREPARTFEATURE, + CREATE_MACHINESOFTWARELIST, CREATE_ROM, CREATE_ROMDUMP, CREATE_SOFTWAREROMDUMP, @@ -382,31 +424,34 @@ class SchemaQueries(object): CREATE_SOFTWAREDISKDUMP) CREATE_TEMPORARY_TABLES = ( + CREATE_TEMPORARY_SOFTWARECLONEOF, CREATE_TEMPORARY_DEVICEREFERENCE, CREATE_TEMPORARY_SLOTOPTION, CREATE_TEMPORARY_SLOTDEFAULT) CREATE_INDEXES = ( - INDEX_MACHINE_ISDEVICE_SHORTNAME, - INDEX_MACHINE_ISDEVICE_DESCRIPTION, - INDEX_MACHINE_RUNNABLE_SHORTNAME, - INDEX_MACHINE_RUNNABLE_DESCRIPTION, - INDEX_SYSTEM_YEAR, - INDEX_SYSTEM_MANUFACTURER, - INDEX_ROMOF_PARENT, - INDEX_CLONEOF_PARENT, - INDEX_DIPSWITCH_MACHINE_ISCONFIG, INDEX_SOFTWARE_SOFTWARELIST_SUPPORTED, INDEX_SOFTWARE_SOFTWARELIST_YEAR, INDEX_SOFTWARE_SOFTWARELIST_PUBLISHER, INDEX_SOFTWARE_SHORTNAME_SOFTWARELIST, INDEX_SOFTWARE_YEAR_SOFTWARELIST, INDEX_SOFTWARE_PUBLISHER_SOFTWARELIST, + INDEX_SOFTWARECLONEOF_PARENT, INDEX_SOFTWAREINFO_SOFTWARE_INFOTYPE, INDEX_SOFTWAREINFO_INFOTYPE_VALUE_SOFTWARE, INDEX_SOFTWARESHAREDFEAT_SHAREDFEATTYPE_VALUE_SOFTWARE, INDEX_SOFTWAREPART_INTERFACE_SOFTWARE, INDEX_SOFTWAREPARTFEATURE_FEATURETYPE_VALUE_PART, + INDEX_MACHINE_ISDEVICE_SHORTNAME, + INDEX_MACHINE_ISDEVICE_DESCRIPTION, + INDEX_MACHINE_RUNNABLE_SHORTNAME, + INDEX_MACHINE_RUNNABLE_DESCRIPTION, + INDEX_SYSTEM_YEAR, + INDEX_SYSTEM_MANUFACTURER, + INDEX_ROMOF_PARENT, + INDEX_CLONEOF_PARENT, + INDEX_DIPSWITCH_MACHINE_ISCONFIG, + INDEX_MACHINESOFTWARELIST_SOFTWARELIST_MACHINE, INDEX_ROMDUMP_ROM, INDEX_ROMDUMP_MACHINE_BAD, INDEX_SOFTWAREROMDUMP_ROM, @@ -417,26 +462,28 @@ class SchemaQueries(object): INDEX_SOFTWAREDISKDUMP_PART_BAD) DROP_INDEXES = ( - DROP_MACHINE_ISDEVICE_SHORTNAME, - DROP_MACHINE_ISDEVICE_DESCRIPTION, - DROP_MACHINE_RUNNABLE_SHORTNAME, - DROP_MACHINE_RUNNABLE_DESCRIPTION, - DROP_SYSTEM_YEAR, - DROP_SYSTEM_MANUFACTURER, - DROP_ROMOF_PARENT, - DROP_CLONEOF_PARENT, - DROP_DIPSWITCH_MACHINE_ISCONFIG, DROP_SOFTWARE_SOFTWARELIST_SUPPORTED, DROP_SOFTWARE_SOFTWARELIST_YEAR, DROP_SOFTWARE_SOFTWARELIST_PUBLISHER, DROP_SOFTWARE_SHORTNAME_SOFTWARELIST, DROP_SOFTWARE_YEAR_SOFTWARELIST, DROP_SOFTWARE_PUBLISHER_SOFTWARELIST, + DROP_SOFTWARECLONEOF_PARENT, DROP_SOFTWAREINFO_SOFTWARE_INFOTYPE, DROP_SOFTWAREINFO_INFOTYPE_VALUE_SOFTWARE, DROP_SOFTWARESHAREDFEAT_SHAREDFEATTYPE_VALUE_SOFTWARE, DROP_SOFTWAREPART_INTERFACE_SOFTWARE, DROP_SOFTWAREPARTFEATURE_FEATURETYPE_VALUE_PART, + DROP_MACHINE_ISDEVICE_SHORTNAME, + DROP_MACHINE_ISDEVICE_DESCRIPTION, + DROP_MACHINE_RUNNABLE_SHORTNAME, + DROP_MACHINE_RUNNABLE_DESCRIPTION, + DROP_SYSTEM_YEAR, + DROP_SYSTEM_MANUFACTURER, + DROP_ROMOF_PARENT, + DROP_CLONEOF_PARENT, + DROP_DIPSWITCH_MACHINE_ISCONFIG, + DROP_MACHINESOFTWARELIST_SOFTWARELIST_MACHINE, DROP_ROMDUMP_ROM, DROP_ROMDUMP_MACHINE_BAD, DROP_SOFTWAREROMDUMP_ROM, @@ -448,7 +495,20 @@ class SchemaQueries(object): class UpdateQueries(object): + # software lists + ADD_SOFTWAREINFOTYPE = 'INSERT OR IGNORE INTO softwareinfotype (name) VALUES (?)' + ADD_SOFTWARESHAREDFEATTYPE = 'INSERT OR IGNORE INTO softwaresharedfeattype (name) VALUES (?)' + ADD_SOFTWAREPARTFEATURETYPE = 'INSERT OR IGNORE INTO softwarepartfeaturetype (name) VALUES(?)' + ADD_SOFTWARELIST = 'INSERT INTO softwarelist (shortname, description) VALUES (?, ?)' + ADD_SOFTWARE = 'INSERT INTO software (softwarelist, shortname, supported, description, year, publisher) VALUES (?, ?, ?, ?, ?, ?)' + ADD_SOFTWAREINFO = 'INSERT INTO softwareinfo (software, infotype, value) SELECT ?, id, ? FROM softwareinfotype WHERE name = ?' + ADD_SOFTWARESHAREDFEAT = 'INSERT INTO softwaresharedfeat (software, sharedfeattype, value) SELECT ?, id, ? FROM softwaresharedfeattype WHERE name = ?' + ADD_SOFTWAREPART = 'INSERT INTO softwarepart (software, shortname, interface) VALUES (?, ?, ?)' + ADD_SOFTWAREPARTFEATURE = 'INSERT INTO softwarepartfeature (part, featuretype, value) SELECT ?, id, ? FROM softwarepartfeaturetype WHERE name = ?' + + # machines ADD_FEATURETYPE = 'INSERT OR IGNORE INTO featuretype (name) VALUES (?)' + ADD_MACHINESOFTWARELISTSTATUSTYPE = 'INSERT OR IGNORE INTO machinesoftwareliststatustype (value) VALUES (?)' ADD_SOURCEFILE = 'INSERT OR IGNORE INTO sourcefile (filename) VALUES (?)' ADD_MACHINE = 'INSERT INTO machine (shortname, description, sourcefile, isdevice, runnable) SELECT ?, ?, id, ?, ? FROM sourcefile WHERE filename = ?' ADD_SYSTEM = 'INSERT INTO system (id, year, manufacturer) VALUES (?, ?, ?)' @@ -463,15 +523,9 @@ class UpdateQueries(object): ADD_SLOT = 'INSERT INTO slot (machine, name) VALUES (?, ?)' ADD_RAMOPTION = 'INSERT INTO ramoption (machine, size, name) VALUES (?, ?, ?)' ADD_RAMDEFAULT = 'INSERT INTO ramdefault (machine, size) VALUES (?, ?)' - ADD_SOFTWAREINFOTYPE = 'INSERT OR IGNORE INTO softwareinfotype (name) VALUES (?)' - ADD_SOFTWARESHAREDFEATTYPE = 'INSERT OR IGNORE INTO softwaresharedfeattype (name) VALUES (?)' - ADD_SOFTWAREPARTFEATURETYPE = 'INSERT OR IGNORE INTO softwarepartfeaturetype (name) VALUES(?)' - ADD_SOFTWARELIST = 'INSERT INTO softwarelist (shortname, description) VALUES (?, ?)' - ADD_SOFTWARE = 'INSERT INTO software (softwarelist, shortname, supported, description, year, publisher) VALUES (?, ?, ?, ?, ?, ?)' - ADD_SOFTWAREINFO = 'INSERT INTO softwareinfo (software, infotype, value) SELECT ?, id, ? FROM softwareinfotype WHERE name = ?' - ADD_SOFTWARESHAREDFEAT = 'INSERT INTO softwaresharedfeat (software, sharedfeattype, value) SELECT ?, id, ? FROM softwaresharedfeattype WHERE name = ?' - ADD_SOFTWAREPART = 'INSERT INTO softwarepart (software, shortname, interface) VALUES (?, ?, ?)' - ADD_SOFTWAREPARTFEATURE = 'INSERT INTO softwarepartfeature (part, featuretype, value) SELECT ?, id, ? FROM softwarepartfeaturetype WHERE name = ?' + ADD_MACHINESOFTWARELIST = 'INSERT INTO machinesoftwarelist (machine, softwarelist, tag, status) SELECT ?, softwarelist.id, ?, machinesoftwareliststatustype.id FROM softwarelist JOIN machinesoftwareliststatustype WHERE softwarelist.shortname = ? AND machinesoftwareliststatustype.value = ?' + + # media ADD_ROM = 'INSERT OR IGNORE INTO rom (crc, sha1) VALUES (?, ?)' ADD_ROMDUMP = 'INSERT OR IGNORE INTO romdump (machine, rom, name, bad) SELECT ?, id, ?, ? FROM rom WHERE crc = ? AND sha1 = ?' ADD_SOFTWAREROMDUMP = 'INSERT OR IGNORE INTO softwareromdump (part, rom, name, bad) SELECT ?, id, ?, ? FROM rom WHERE crc = ? AND sha1 = ?' @@ -479,13 +533,29 @@ class UpdateQueries(object): ADD_DISKDUMP = 'INSERT OR IGNORE INTO diskdump (machine, disk, name, bad) SELECT ?, id, ?, ? FROM disk WHERE sha1 = ?' ADD_SOFTWAREDISKDUMP = 'INSERT OR IGNORE INTO softwarediskdump (part, disk, name, bad) SELECT ?, id, ?, ? FROM disk WHERE sha1 = ?' + # temporary records used during loading + ADD_TEMPORARY_SOFTWARECLONEOF = 'INSERT INTO temp_softwarecloneof (id, parent) VALUES (?, ?)' ADD_TEMPORARY_DEVICEREFERENCE = 'INSERT OR IGNORE INTO temp_devicereference (machine, device) VALUES (?, ?)' ADD_TEMPORARY_SLOTOPTION = 'INSERT INTO temp_slotoption (slot, device, name) VALUES (?, ?, ?)' ADD_TEMPORARY_SLOTDEFAULT = 'INSERT INTO temp_slotdefault (id, slotoption) VALUES (?, ?)' - FINALISE_DEVICEREFERENCES = 'INSERT INTO devicereference (id, machine, device) SELECT temp_devicereference.id, temp_devicereference.machine, machine.id FROM temp_devicereference LEFT JOIN machine ON temp_devicereference.device = machine.shortname' - FINALISE_SLOTOPTIONS = 'INSERT INTO slotoption (id, slot, device, name) SELECT temp_slotoption.id, temp_slotoption.slot, machine.id, temp_slotoption.name FROM temp_slotoption LEFT JOIN machine ON temp_slotoption.device = machine.shortname' - FINALISE_SLOTDEFAULTS = 'INSERT INTO slotdefault (id, slotoption) SELECT id, slotoption FROM temp_slotdefault' + # convert temporary tables to final form + FINALISE_SOFTWARECLONEOFS = \ + 'INSERT INTO softwarecloneof (id, parent) ' \ + 'SELECT temp_softwarecloneof.id AS id, parent.id AS parent ' \ + 'FROM temp_softwarecloneof LEFT JOIN software AS clone ON temp_softwarecloneof.id = clone.id LEFT JOIN software AS parent ON clone.softwarelist = parent.softwarelist AND temp_softwarecloneof.parent = parent.shortname' + FINALISE_DEVICEREFERENCES = \ + 'INSERT INTO devicereference (id, machine, device) ' \ + 'SELECT temp_devicereference.id, temp_devicereference.machine, machine.id ' \ + 'FROM temp_devicereference LEFT JOIN machine ON temp_devicereference.device = machine.shortname' + FINALISE_SLOTOPTIONS = \ + 'INSERT INTO slotoption (id, slot, device, name) ' \ + 'SELECT temp_slotoption.id, temp_slotoption.slot, machine.id, temp_slotoption.name ' \ + 'FROM temp_slotoption LEFT JOIN machine ON temp_slotoption.device = machine.shortname' + FINALISE_SLOTDEFAULTS = \ + 'INSERT INTO slotdefault (id, slotoption) ' \ + 'SELECT id, slotoption ' \ + 'FROM temp_slotdefault' class QueryCursor(object): @@ -661,6 +731,13 @@ class QueryCursor(object): else: return self.dbcurs.execute('SELECT COUNT(*) FROM sourcefile').fetchone()[0] + def get_clones(self, shortname): + return self.dbcurs.execute( + 'SELECT machine.shortname AS shortname, machine.description AS description, system.year AS year, system.manufacturer AS manufacturer ' \ + 'FROM cloneof JOIN machine ON cloneof.id = machine.id LEFT JOIN system ON machine.id = system.id ' \ + 'WHERE cloneof.parent = ?', + (shortname, )) + def count_slots(self, machine): return self.dbcurs.execute( 'SELECT COUNT(*) FROM slot WHERE machine = ?', (machine, )).fetchone()[0] @@ -716,19 +793,25 @@ class QueryCursor(object): def get_softwarelist_software(self, id, pattern): if pattern is not None: return self.dbcurs.execute( - 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, COUNT(DISTINCT softwarepart.id) AS parts, COUNT(softwareromdump.rom) + COUNT(softwarediskdump.disk) AS baddumps ' \ - 'FROM software JOIN softwarepart ON software.id = softwarepart.software LEFT JOIN softwareromdump ON softwarepart.id = softwareromdump.part AND softwareromdump.bad = 1 LEFT JOIN softwarediskdump ON softwarepart.id = softwarediskdump.part AND softwarediskdump.bad = 1 ' \ + 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, COUNT(DISTINCT softwarepart.id) AS parts, COUNT(softwareromdump.rom) + COUNT(softwarediskdump.disk) AS baddumps, parent.shortname AS parent, parent.description AS parentdescription, softwarelist.shortname AS parentsoftwarelist, softwarelist.description AS parentsoftwarelistdescription ' \ + 'FROM software JOIN softwarepart ON software.id = softwarepart.software LEFT JOIN softwareromdump ON softwarepart.id = softwareromdump.part AND softwareromdump.bad = 1 LEFT JOIN softwarediskdump ON softwarepart.id = softwarediskdump.part AND softwarediskdump.bad = 1 LEFT JOIN softwarecloneof ON software.id = softwarecloneof.id LEFT JOIN software AS parent ON softwarecloneof.parent = parent.id LEFT JOIN softwarelist ON parent.softwarelist = softwarelist.id ' \ 'WHERE software.softwarelist = ? AND software.shortname GLOB ? ' \ 'GROUP BY software.id', (id, pattern)) else: return self.dbcurs.execute( - 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, COUNT(DISTINCT softwarepart.id) AS parts, COUNT(softwareromdump.rom) + COUNT(softwarediskdump.disk) AS baddumps ' \ - 'FROM software JOIN softwarepart ON software.id = softwarepart.software LEFT JOIN softwareromdump ON softwarepart.id = softwareromdump.part AND softwareromdump.bad = 1 LEFT JOIN softwarediskdump ON softwarepart.id = softwarediskdump.part AND softwarediskdump.bad = 1 ' \ + 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, COUNT(DISTINCT softwarepart.id) AS parts, COUNT(softwareromdump.rom) + COUNT(softwarediskdump.disk) AS baddumps, parent.shortname AS parent, parent.description AS parentdescription, softwarelist.shortname AS parentsoftwarelist, softwarelist.description AS parentsoftwarelistdescription ' \ + 'FROM software JOIN softwarepart ON software.id = softwarepart.software LEFT JOIN softwareromdump ON softwarepart.id = softwareromdump.part AND softwareromdump.bad = 1 LEFT JOIN softwarediskdump ON softwarepart.id = softwarediskdump.part AND softwarediskdump.bad = 1 LEFT JOIN softwarecloneof ON software.id = softwarecloneof.id LEFT JOIN software AS parent ON softwarecloneof.parent = parent.id LEFT JOIN softwarelist ON parent.softwarelist = softwarelist.id ' \ 'WHERE software.softwarelist = ? ' \ 'GROUP BY software.id', (id, )) + def get_softwarelist_machines(self, id): + return self.dbcurs.execute( + 'SELECT machine.shortname AS shortname, machine.description AS description, system.year AS year, system.manufacturer AS manufacturer, machinesoftwareliststatustype.value AS status ' \ + 'FROM (SELECT DISTINCT machine, status FROM machinesoftwarelist WHERE softwarelist = ?) AS softwarelists LEFT JOIN machine ON softwarelists.machine = machine.id LEFT JOIN system ON machine.id = system.id LEFT JOIN machinesoftwareliststatustype ON softwarelists.status = machinesoftwareliststatustype.id', + (id, )) + def get_softwarelists(self, pattern): if pattern is not None: return self.dbcurs.execute( @@ -745,11 +828,18 @@ class QueryCursor(object): def get_software_details(self, softwarelist, software): return self.dbcurs.execute( - 'SELECT software.id AS id, software.shortname AS shortname, software.supported AS supported, software.description AS description, software.year AS year, software.publisher AS publisher, softwarelist.shortname AS softwarelist, softwarelist.description AS softwarelistdescription ' \ - 'FROM software LEFT JOIN softwarelist ON software.softwarelist = softwarelist.id ' \ + 'SELECT software.id AS id, software.shortname AS shortname, software.supported AS supported, software.description AS description, software.year AS year, software.publisher AS publisher, softwarelist.shortname AS softwarelist, softwarelist.description AS softwarelistdescription, parent.shortname AS parent, parent.description AS parentdescription, parentsoftwarelist.shortname AS parentsoftwarelist, parentsoftwarelist.description AS parentsoftwarelistdescription ' \ + 'FROM software LEFT JOIN softwarelist ON software.softwarelist = softwarelist.id LEFT JOIN softwarecloneof ON software.id = softwarecloneof.id LEFT JOIN software AS parent ON softwarecloneof.parent = parent.id LEFT JOIN softwarelist AS parentsoftwarelist ON parent.softwarelist = parentsoftwarelist.id ' \ 'WHERE software.softwarelist = (SELECT id FROM softwarelist WHERE shortname = ?) AND software.shortname = ?', (softwarelist, software)) + def get_software_clones(self, software): + return self.dbcurs.execute( + 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, softwarelist.shortname AS softwarelist, softwarelist.description AS softwarelistdescription ' \ + 'FROM softwarecloneof LEFT JOIN software ON softwarecloneof.id = software.id LEFT JOIN softwarelist ON software.softwarelist = softwarelist.id ' \ + 'WHERE softwarecloneof.parent = ?', + (software, )) + def get_software_info(self, software): return self.dbcurs.execute( 'SELECT softwareinfotype.name AS name, softwareinfo.value AS value ' \ @@ -810,6 +900,43 @@ class UpdateCursor(object): def close(self): self.dbcurs.close() + def add_softwarelist(self, shortname, description): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWARELIST, (shortname, description)) + return self.dbcurs.lastrowid + + def add_softwareinfotype(self, name): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREINFOTYPE, (name, )) + + def add_softwaresharedfeattype(self, name): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWARESHAREDFEATTYPE, (name, )) + + def add_softwarepartfeaturetype(self, name): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREPARTFEATURETYPE, (name, )) + + def add_software(self, softwarelist, shortname, supported, description, year, publisher): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWARE, (softwarelist, shortname, supported, description, year, publisher)) + return self.dbcurs.lastrowid + + def add_softwarecloneof(self, software, parent): + self.dbcurs.execute(UpdateQueries.ADD_TEMPORARY_SOFTWARECLONEOF, (software, parent)) + return self.dbcurs.lastrowid + + def add_softwareinfo(self, software, infotype, value): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREINFO, (software, value, infotype)) + return self.dbcurs.lastrowid + + def add_softwaresharedfeat(self, software, sharedfeattype, value): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWARESHAREDFEAT, (software, value, sharedfeattype)) + return self.dbcurs.lastrowid + + def add_softwarepart(self, software, shortname, interface): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREPART, (software, shortname, interface)) + return self.dbcurs.lastrowid + + def add_softwarepartfeature(self, part, featuretype, value): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREPARTFEATURE, (part, value, featuretype)) + return self.dbcurs.lastrowid + def add_featuretype(self, name): self.dbcurs.execute(UpdateQueries.ADD_FEATURETYPE, (name, )) @@ -879,37 +1006,9 @@ class UpdateCursor(object): self.dbcurs.execute(UpdateQueries.ADD_RAMDEFAULT, (machine, size)) return self.dbcurs.lastrowid - def add_softwarelist(self, shortname, description): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWARELIST, (shortname, description)) - return self.dbcurs.lastrowid - - def add_softwareinfotype(self, name): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREINFOTYPE, (name, )) - - def add_softwaresharedfeattype(self, name): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWARESHAREDFEATTYPE, (name, )) - - def add_softwarepartfeaturetype(self, name): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREPARTFEATURETYPE, (name, )) - - def add_software(self, softwarelist, shortname, supported, description, year, publisher): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWARE, (softwarelist, shortname, supported, description, year, publisher)) - return self.dbcurs.lastrowid - - def add_softwareinfo(self, software, infotype, value): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREINFO, (software, value, infotype)) - return self.dbcurs.lastrowid - - def add_softwaresharedfeat(self, software, sharedfeattype, value): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWARESHAREDFEAT, (software, value, sharedfeattype)) - return self.dbcurs.lastrowid - - def add_softwarepart(self, software, shortname, interface): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREPART, (software, shortname, interface)) - return self.dbcurs.lastrowid - - def add_softwarepartfeature(self, part, featuretype, value): - self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREPARTFEATURE, (part, value, featuretype)) + def add_machinesoftwarelist(self, machine, softwarelist, tag, status): + self.dbcurs.execute(UpdateQueries.ADD_MACHINESOFTWARELISTSTATUSTYPE, (status, )) + self.dbcurs.execute(UpdateQueries.ADD_MACHINESOFTWARELIST, (machine, tag, softwarelist, status)) return self.dbcurs.lastrowid def add_rom(self, crc, sha1): @@ -992,6 +1091,9 @@ class UpdateConnection(object): self.dbconn.commit() def finalise_load(self): + self.dbconn.execute(UpdateQueries.FINALISE_SOFTWARECLONEOFS) + self.dbconn.commit() + self.dbconn.execute(SchemaQueries.DROP_TEMPORARY_SOFTWARECLONEOF) self.dbconn.execute(UpdateQueries.FINALISE_DEVICEREFERENCES) self.dbconn.commit() self.dbconn.execute(SchemaQueries.DROP_TEMPORARY_DEVICEREFERENCE) diff --git a/scripts/minimaws/lib/htmltmpl.py b/scripts/minimaws/lib/htmltmpl.py index d1f5fa29852..185771af6ee 100644 --- a/scripts/minimaws/lib/htmltmpl.py +++ b/scripts/minimaws/lib/htmltmpl.py @@ -24,6 +24,7 @@ SORTABLE_TABLE_EPILOGUE = string.Template( '\n' '\n') + MACHINE_PROLOGUE = string.Template( '\n' \ '\n' \ @@ -48,6 +49,27 @@ MACHINE_PROLOGUE = string.Template( ' Runnable:${runnable}\n' \ ' Source file:${sourcefile}\n') +MACHINE_CLONES_PROLOGUE = string.Template( + '

Clones

\n' \ + '\n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n') + +MACHINE_CLONES_ROW = string.Template( + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n') + MACHINE_OPTIONS_HEADING = string.Template( '

Options

\n' \ '

\n' \ @@ -183,11 +205,33 @@ SOFTWARE_PROLOGUE = string.Template( '

\n' \ ' \n' \ ' \n' \ - ' \n' \ - ' \n'); + ' \n'); + +SOFTWARE_CLONES_PROLOGUE = string.Template( + '

Clones

\n' \ + '
Short nameDescriptionYearManufacturer
${shortname}${description}${year}${manufacturer}
Software list:${softwarelistdescription} (${softwarelist})
Short name:${shortname}
Year:${year}
Publisher:${publisher}
Suported:${supported}
Publisher:${publisher}
\n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n') + +SOFTWARE_CLONES_ROW = string.Template( + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n') SOFTWARE_PART_PROLOGUE = string.Template( - '

${heading}

\n' \ + '

${heading}

\n' \ '
Short nameDescriptionYearPublisherSupported
${shortname}${description}${year}${publisher}${supported}
\n' \ ' \n' \ ' \n') @@ -233,7 +277,47 @@ SOFTWARELIST_PROLOGUE = string.Template( ' \n' \ '
Short name:${shortname}
Interface:${interface}
\n') -SOFTWARELIST_ROW = string.Template( +SOFTWARELIST_MACHINE_TABLE_HEADER = string.Template( + '

Machines

\n' \ + '\n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n') + +SOFTWARELIST_MACHINE_TABLE_ROW = string.Template( + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n') + +SOFTWARELIST_SOFTWARE_TABLE_HEADER = string.Template( + '

Software

\n' \ + '
Short nameDescriptionYearManufacturerStatus
${shortname}${description}${year}${manufacturer}${status}
\n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n' \ + ' \n') + +SOFTWARELIST_SOFTWARE_ROW = string.Template( ' \n' \ ' \n' \ ' \n' \ @@ -242,6 +326,7 @@ SOFTWARELIST_ROW = string.Template( ' \n' \ ' \n' \ ' \n' \ + ' \n' \ ' \n') diff --git a/scripts/minimaws/lib/lxparse.py b/scripts/minimaws/lib/lxparse.py index 62ff18e8d5a..46737ef438a 100644 --- a/scripts/minimaws/lib/lxparse.py +++ b/scripts/minimaws/lib/lxparse.py @@ -211,6 +211,8 @@ class MachineHandler(ElementHandler): status = 0 if 'status' not in attrs else 2 if attrs['status'] == 'unemulated' else 1 overall = status if 'overall' not in attrs else 2 if attrs['overall'] == 'unemulated' else 1 self.dbcurs.add_feature(self.id, attrs['type'], status, overall) + elif name == 'softwarelist': + self.dbcurs.add_machinesoftwarelist(self.id, attrs['name'], attrs['tag'], attrs['status']) elif name == 'rom': crc = attrs.get('crc') sha1 = attrs.get('sha1') @@ -385,6 +387,8 @@ class SoftwareHandler(ElementHandler): elif name == 'publisher': self.publisher = handler.text self.id = self.dbcurs.add_software(self.softwarelist, self.shortname, self.supported, self.description, self.year, self.publisher) + if self.cloneof is not None: + self.dbcurs.add_softwarecloneof(self.id, self.cloneof) class SoftwareListHandler(ElementHandler): @@ -439,6 +443,12 @@ def load_info(options): dbconn.prepare_for_load() parser = xml.sax.make_parser() + parser.setContentHandler(SoftwareListHandler(dbconn)) + for path in options.softwarepath: + files = [os.path.join(path, f) for f in os.listdir(path) if f.endswith('.xml')] + for filename in files: + parser.parse(filename) + parser.setContentHandler(ListXmlHandler(dbconn)) if options.executable is not None: task = subprocess.Popen([options.executable, '-listxml'], stdout=subprocess.PIPE) @@ -446,11 +456,4 @@ def load_info(options): else: parser.parse(options.file) - if options.softwarepath: - parser.setContentHandler(SoftwareListHandler(dbconn)) - for path in options.softwarepath: - files = [os.path.join(path, f) for f in os.listdir(path) if f.endswith('.xml')] - for filename in files: - parser.parse(filename) - dbconn.finalise_load() diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py index 2a6a2e35325..8046785b5f1 100644 --- a/scripts/minimaws/lib/wsgiserve.py +++ b/scripts/minimaws/lib/wsgiserve.py @@ -181,11 +181,11 @@ class MachineHandler(QueryPageHandler): parent = self.dbcurs.listfull(machine_info['cloneof']).fetchone() if parent: yield ( - ' \n' % + ' \n' % (self.machine_href(machine_info['cloneof']), cgi.escape(parent[1]), cgi.escape(machine_info['cloneof']))).encode('utf-8') else: yield ( - ' \n' % + ' \n' % (self.machine_href(machine_info['cloneof']), cgi.escape(machine_info['cloneof']))).encode('utf-8') if (machine_info['romof'] is not None) and (machine_info['romof'] != machine_info['cloneof']): parent = self.dbcurs.listfull(machine_info['romof']).fetchone() @@ -195,7 +195,7 @@ class MachineHandler(QueryPageHandler): (self.machine_href(machine_info['romof']), cgi.escape(parent[1]), cgi.escape(machine_info['romof']))).encode('utf-8') else: yield ( - ' \n' % + ' \n' % (self.machine_href(machine_info['romof']), cgi.escape(machine_info['romof']))).encode('utf-8') unemulated = [] imperfect = [] @@ -215,6 +215,20 @@ class MachineHandler(QueryPageHandler): tuple(imperfect)).encode('utf-8'); yield '
Short nameDescriptionYearPublisherSupportedPartsBad dumpsParent
${shortname}${description}${supported}${parts}${baddumps}${parent}
Parent Machine:%s (%s)
Parent machine:%s (%s)
Parent Machine:%s
Parent machine:%s
Parent Machine:%s
Parent machine:%s
\n'.encode('utf-8') + first = True + for clone, clonedescription, cloneyear, clonemanufacturer in self.dbcurs.get_clones(self.shortname): + if first: + yield htmltmpl.MACHINE_CLONES_PROLOGUE.substitute().encode('utf-8') + first = False + yield htmltmpl.MACHINE_CLONES_ROW.substitute( + href=self.machine_href(clone), + shortname=cgi.escape(clone), + description=cgi.escape(clonedescription), + year=cgi.escape(cloneyear or ''), + manufacturer=cgi.escape(clonemanufacturer or '')).encode('utf-8') + if not first: + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-clones').encode('utf-8') + # allow system BIOS selection haveoptions = False for name, desc, isdef in self.dbcurs.get_biossets(id): @@ -372,7 +386,7 @@ class SourceFileHandler(QueryPageHandler): yield htmltmpl.SOURCEFILE_LIST_ROW.substitute( sourcefile=self.linked_title(filename, True), machines=cgi.escape('%d' % (machines, ))).encode('utf-8') - yield ' \n\n\n\n\n'.encode('utf-8') + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-sourcefiles').encode('utf-8') def sourcefile_page(self, id): yield htmltmpl.SOURCEFILE_PROLOGUE.substitute( @@ -401,7 +415,7 @@ class SourceFileHandler(QueryPageHandler): if first: yield '

No machines found.

\n'.encode('utf-8') else: - yield ' \n\n\n'.encode('utf-8') + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-machines').encode('utf-8') yield '\n\n'.encode('utf-8') @@ -490,7 +504,7 @@ class SoftwareListHandler(QueryPageHandler): supported=cgi.escape('%.1f%%' % (supported * 100.0 / (total or 1), )), partiallysupported=cgi.escape('%.1f%%' % (partiallysupported * 100.0 / (total or 1), )), unsupported=cgi.escape('%.1f%%' % (unsupported * 100.0 / (total or 1), ))).encode('utf-8') - yield ' \n\n\n\n\n'.encode('utf-8') + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-softwarelists').encode('utf-8') def softwarelist_page(self, softwarelist_info, pattern): if not pattern: @@ -512,29 +526,25 @@ class SoftwareListHandler(QueryPageHandler): unsupported=cgi.escape('%d' % (softwarelist_info['unsupported'], )), unsupportedpc=cgi.escape('%.1f' % (softwarelist_info['unsupported'] * 100.0 / (softwarelist_info['total'] or 1), ))).encode('utf-8') + first = True + for machine_info in self.dbcurs.get_softwarelist_machines(softwarelist_info['id']): + if first: + yield htmltmpl.SOFTWARELIST_MACHINE_TABLE_HEADER.substitute().encode('utf-8') + first = False + yield self.machine_row(machine_info) + if not first: + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-machines').encode('utf-8') + first = True for software_info in self.dbcurs.get_softwarelist_software(softwarelist_info['id'], self.software or None): if first: - yield \ - '\n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n' \ - ' \n'.encode('utf-8') + yield htmltmpl.SOFTWARELIST_SOFTWARE_TABLE_HEADER.substitute().encode('utf-8') first = False yield self.software_row(software_info) if first: yield '

No software found.

\n'.encode('utf-8') else: - yield ' \n
Short nameDescriptionYearPublisherSupportedPartsBad dumps
\n\n'.encode('utf-8') + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-software').encode('utf-8') yield '\n\n'.encode('utf-8') @@ -548,14 +558,29 @@ class SoftwareListHandler(QueryPageHandler): softwarelist=cgi.escape(self.shortname), shortname=cgi.escape(software_info['shortname']), year=cgi.escape(software_info['year']), - publisher=cgi.escape(software_info['publisher']), - supported=cgi.escape('Yes' if software_info['supported'] == 0 else 'Partial' if software_info['supported'] == 1 else 'No')).encode('utf-8') + publisher=cgi.escape(software_info['publisher'])).encode('utf-8') + if software_info['parent'] is not None: + yield (' Parent:%s\n' % (self.software_href(software_info['parentsoftwarelist'], software_info['parent']), cgi.escape(software_info['parentdescription']))).encode('utf-8') + yield (' Supported:%s\n' % (self.format_supported(software_info['supported']), )).encode('utf-8') for name, value in self.dbcurs.get_software_info(software_info['id']): yield (' %s:%s\n' % (cgi.escape(name), cgi.escape(value))).encode('utf-8') yield '\n\n'.encode('utf-8') + first = True + for clone_info in self.dbcurs.get_software_clones(software_info['id']): + if first: + yield htmltmpl.SOFTWARE_CLONES_PROLOGUE.substitute().encode('utf-8') + first = False + yield self.clone_row(clone_info) + if not first: + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-clones').encode('utf-8') + parts = self.dbcurs.get_software_parts(software_info['id']).fetchall() + first = True for id, partname, interface, part_id in parts: + if first: + yield '

Parts

\n'.encode('utf-8') + first = False yield htmltmpl.SOFTWARE_PART_PROLOGUE.substitute( heading=cgi.escape(('%s (%s)' % (part_id, partname)) if part_id is not None else partname), shortname=cgi.escape(partname), @@ -567,15 +592,39 @@ class SoftwareListHandler(QueryPageHandler): yield '\n\n'.encode('utf-8') def software_row(self, software_info): - return htmltmpl.SOFTWARELIST_ROW.substitute( + parent = software_info['parent'] + return htmltmpl.SOFTWARELIST_SOFTWARE_ROW.substitute( softwarehref=self.software_href(self.shortname, software_info['shortname']), shortname=cgi.escape(software_info['shortname']), description=cgi.escape(software_info['description']), year=cgi.escape(software_info['year']), publisher=cgi.escape(software_info['publisher']), - supported=cgi.escape('Yes' if software_info['supported'] == 0 else 'Partial' if software_info['supported'] == 1 else 'No'), + supported=self.format_supported(software_info['supported']), parts=cgi.escape('%d' % (software_info['parts'], )), - baddumps=cgi.escape('%d' % (software_info['baddumps'], ))).encode('utf-8') + baddumps=cgi.escape('%d' % (software_info['baddumps'], )), + parent='%s' % (self.software_href(software_info['parentsoftwarelist'], parent), cgi.escape(parent)) if parent is not None else '').encode('utf-8') + + def clone_row(self, clone_info): + return htmltmpl.SOFTWARE_CLONES_ROW.substitute( + href=self.software_href(clone_info['softwarelist'], clone_info['shortname']), + shortname=cgi.escape(clone_info['shortname']), + description=cgi.escape(clone_info['description']), + year=cgi.escape(clone_info['year']), + publisher=cgi.escape(clone_info['publisher']), + supported=self.format_supported(clone_info['supported'])).encode('utf-8') + + def machine_row(self, machine_info): + return htmltmpl.SOFTWARELIST_MACHINE_TABLE_ROW.substitute( + machinehref=self.machine_href(machine_info['shortname']), + shortname=cgi.escape(machine_info['shortname']), + description=cgi.escape(machine_info['description']), + year=cgi.escape(machine_info['year'] or ''), + manufacturer=cgi.escape(machine_info['manufacturer'] or ''), + status=cgi.escape(machine_info['status'])).encode('utf-8') + + @staticmethod + def format_supported(supported): + return 'Yes' if supported == 0 else 'Partial' if supported == 1 else 'No' class RomIdentHandler(QueryPageHandler): diff --git a/scripts/minimaws/minimaws.py b/scripts/minimaws/minimaws.py index 58ca456159c..25f74eb8c68 100755 --- a/scripts/minimaws/minimaws.py +++ b/scripts/minimaws/minimaws.py @@ -111,7 +111,7 @@ if __name__ == '__main__': group = subparser.add_mutually_exclusive_group(required=True) group.add_argument('--executable', metavar='', help='emulator executable') group.add_argument('--file', metavar='', help='XML machine information file') - subparser.add_argument('--softwarepath', action='append', metavar='', help='Software list directory path') + subparser.add_argument('--softwarepath', required=True, action='append', metavar='', help='Software list directory path') options = parser.parse_args() -- cgit v1.2.3-70-g09d2