diff options
author | 2019-12-25 21:01:22 +1100 | |
---|---|---|
committer | 2019-12-25 21:01:22 +1100 | |
commit | 924b0c5819b517345d3f8403ff5c2445601ab0d2 (patch) | |
tree | 40406321376945de364a5548357ac99d6dfab654 /docs/release/scripts/minimaws/lib | |
parent | 40d35ae2dc2fda83e7b4737ef8c5106555b180bc (diff) |
0.217 Release filestag217
Diffstat (limited to 'docs/release/scripts/minimaws/lib')
-rw-r--r-- | docs/release/scripts/minimaws/lib/assets/common.js | 2 | ||||
-rw-r--r-- | docs/release/scripts/minimaws/lib/assets/digest.js | 234 | ||||
-rw-r--r-- | docs/release/scripts/minimaws/lib/assets/machine.js | 103 | ||||
-rw-r--r-- | docs/release/scripts/minimaws/lib/assets/romident.js | 443 | ||||
-rw-r--r-- | docs/release/scripts/minimaws/lib/auxverbs.py | 143 | ||||
-rw-r--r-- | docs/release/scripts/minimaws/lib/dbaccess.py | 447 | ||||
-rw-r--r-- | docs/release/scripts/minimaws/lib/htmltmpl.py | 257 | ||||
-rw-r--r-- | docs/release/scripts/minimaws/lib/lxparse.py | 177 | ||||
-rw-r--r-- | docs/release/scripts/minimaws/lib/wsgiserve.py | 439 |
9 files changed, 1973 insertions, 272 deletions
diff --git a/docs/release/scripts/minimaws/lib/assets/common.js b/docs/release/scripts/minimaws/lib/assets/common.js index 79200217ddb..a9d1991e499 100644 --- a/docs/release/scripts/minimaws/lib/assets/common.js +++ b/docs/release/scripts/minimaws/lib/assets/common.js @@ -8,7 +8,7 @@ function sort_table(tbl, col, dir, numeric) function (x, y) { if (numeric) - return dir * (parseInt(x.cells[col].textContent) - parseInt(y.cells[col].textContent)); + return dir * (parseFloat(x.cells[col].textContent) - parseFloat(y.cells[col].textContent)); else return dir * x.cells[col].textContent.localeCompare(y.cells[col].textContent); }) diff --git a/docs/release/scripts/minimaws/lib/assets/digest.js b/docs/release/scripts/minimaws/lib/assets/digest.js new file mode 100644 index 00000000000..6739d1440d9 --- /dev/null +++ b/docs/release/scripts/minimaws/lib/assets/digest.js @@ -0,0 +1,234 @@ +// license:BSD-3-Clause +// copyright-holders:Vas Crabb + +function Crc32Digester() +{ + this.crc = 0xffffffff; +} + +Crc32Digester.prototype = (function () + { + var table = new Uint32Array(256); + (function () + { + for (var i = 0; i < 256; i++) + { + var crc = i; + for (var b = 0; b < 8; b++) + crc = (crc >>> 1) ^ ((crc & 1) ? 0xedb88320 : 0x00000000); + table[i] = crc; + } + })(); + + return { + digest: function (data, view) + { + for (var i = 0; i < view.length; i++) + this.crc = (this.crc >>> 8) ^ table[(this.crc & 0x000000ff) ^ view[i]]; + }, + + finalise: function () + { + return this.crc ^ 0xffffffff; + } + }; + })(); + + +function Sha1Digester() +{ + this.st = new Uint32Array(5); + this.st[0] = 0xc3d2e1f0; + this.st[1] = 0x10325476; + this.st[2] = 0x98badcfe; + this.st[3] = 0xefcdab89; + this.st[4] = 0x67452301; + + this.cnt = new Uint32Array(2); + this.cnt[0] = 0; + this.cnt[1] = 0; + + this.buf = new DataView(new ArrayBuffer(64)); +} + +Sha1Digester.prototype = (function () + { + function rol(x, n) + { + return ((x << n) | (x >>> (32 - n))) & 0xffffffff; + } + + function b(data, i) + { + var r = data.getUint32(((i + 13) & 15) << 2, false); + r ^= data.getUint32(((i + 8) & 15) << 2, false); + r ^= data.getUint32(((i + 2) & 15) << 2, false); + r ^= data.getUint32((i & 15) << 2, false); + r = rol(r, 1); + data.setUint32((i & 15) << 2, r, false); + return r; + } + + function r0(data, d, i) + { + d[i % 5] = 0xffffffff & (d[i % 5] + ((d[(i + 3) % 5] & (d[(i + 2) % 5] ^ d[(i + 1) % 5])) ^ d[(i + 1) % 5]) + data.getUint32(i << 2, false) + 0x5a827999 + rol(d[(i + 4) % 5], 5)); + d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); + } + + function r1(data, d, i) + { + d[i % 5] = 0xffffffff & (d[i % 5] + ((d[(i + 3) % 5] & (d[(i + 2) % 5] ^ d[(i + 1) % 5])) ^ d[(i + 1) % 5])+ b(data, i) + 0x5a827999 + rol(d[(i + 4) % 5], 5)); + d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); + } + + function r2(data, d, i) + { + d[i % 5] = 0xffffffff & (d[i % 5] + (d[(i + 3) % 5] ^ d[(i + 2) % 5] ^ d[(i + 1) % 5]) + b(data, i) + 0x6ed9eba1 + rol(d[(i + 4) % 5], 5)); + d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); + } + + function r3(data, d, i) + { + d[i % 5] = 0xffffffff & (d[i % 5] + (((d[(i + 3) % 5] | d[(i + 2) % 5]) & d[(i + 1) % 5]) | (d[(i + 3) % 5] & d[(i + 2) % 5])) + b(data, i) + 0x8f1bbcdc + rol(d[(i + 4) % 5], 5)); + d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); + } + + function r4(data, d, i) + { + d[i % 5] = 0xffffffff & (d[i % 5] + (d[(i + 3) % 5] ^ d[(i + 2) % 5] ^ d[(i + 1) % 5]) + b(data, i) + 0xca62c1d6 + rol(d[(i + 4) % 5], 5)); + d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); + } + + function process(st, data) + { + var d = new Uint32Array(st); + var i = 0; + while (i < 16) + r0(data, d, i++); + while (i < 20) + r1(data, d, i++); + while (i < 40) + r2(data, d, i++); + while (i < 60) + r3(data, d, i++); + while (i < 80) + r4(data, d, i++); + for (i = 0; i < st.length; i++) + st[i] = (st[i] + d[i]) & 0xffffffff; + } + + return { + digest: function (data, view) + { + var residual = this.cnt[0]; + this.cnt[0] = (this.cnt[0] + (view.length << 3)) & 0xffffffff; + if (residual > this.cnt[0]) + this.cnt[1]++; + this.cnt[1] += (view.length >>> 29); + residual = (residual >>> 3) & 63; + var offset = 0; + if ((residual + view.length) >= 64) + { + if (residual > 0) + { + for (offset = 0; (offset + residual) < 64; offset++) + this.buf.setUint8(offset + residual, view[offset]); + process(this.st, this.buf); + residual = 0; + } + for ( ; (view.length - offset) >= 64; offset += 64) + process(this.st, new DataView(data, offset, 64)); + } + for ( ; offset < view.length; residual++, offset++) + this.buf.setUint8(residual, view[offset]); + }, + + finalise : function () + { + var lenbuf = new ArrayBuffer(8); + var lenview = new DataView(lenbuf); + lenview.setUint32(0, this.cnt[1], false); + lenview.setUint32(4, this.cnt[0], false); + var padbuf = new ArrayBuffer(64 - (63 & ((this.cnt[0] >>> 3) + 8))); + var padview = new Uint8Array(padbuf); + padview[0] = 0x80; + for (var i = 1; i < padview.length; i++) + padview[i] = 0x00; + this.digest(padbuf, padview); + this.digest(lenbuf, new Uint8Array(lenbuf)); + var result = new Array(20); + for (var i = 0; i < 20; i++) + result[i] = (this.st[4 - (i >>> 2)] >> ((3 - (i & 3)) << 3)) & 0x000000ff; + return result.map(x => x.toString(16).padStart(2, '0')).join(''); + } + }; + })(); + + +function StuckBitsDigester(max = 4) +{ + this.offset = 0; + this.state = [ ]; + for (var i = 0; i <= max; i++) + { + var bytes = 1 << i; + this.state.push({ filled: 0, bits: new Uint8Array(bytes), mask: new Uint8Array(bytes) }); + } +} + +StuckBitsDigester.prototype = (function () + { + return { + digest: function (data, view) + { + for (var i = 0; i < view.length; i++) + { + var data = view[i]; + for (var j = 0; j < this.state.length; j++) + { + var detail = this.state[j]; + var bytes = 1 << j; + var o = this.offset % bytes; + var f = o == (bytes - 1); + if (!detail.filled) + { + detail.bits[o] = data; + detail.mask[o] = 0xff; + if (f) + detail.filled = 1; + } + else + { + detail.mask[o] &= ~(data ^ detail.bits[o]); + detail.bits[o] &= detail.mask[o]; + } + if (o == (bytes - 1)) + detail.filled += 1; + } + this.offset = (this.offset + 1) % (1 << (this.state.length - 1)); + } + }, + + finalise: function () + { + var result = [ ]; + var lastresult = null; + for (var i = 0; (i < this.state.length) && (this.state[i].filled >= 4); i++) + { + var detail = this.state[i]; + var bytes = 1 << i; + for (var j = 0; j < bytes; j++) + { + var mask = detail.mask[j]; + if (mask && ((lastresult === null) || (mask != lastresult.mask[j % (1 << (lastresult.mask.length - 1))]))) + { + lastresult = { bits: detail.bits, mask: detail.mask }; + result.push(lastresult); + break; + } + } + } + return result; + } + }; + })(); diff --git a/docs/release/scripts/minimaws/lib/assets/machine.js b/docs/release/scripts/minimaws/lib/assets/machine.js index d40dca12be0..b7f600f04d6 100644 --- a/docs/release/scripts/minimaws/lib/assets/machine.js +++ b/docs/release/scripts/minimaws/lib/assets/machine.js @@ -4,6 +4,7 @@ var slot_info = Object.create(null); var bios_sets = Object.create(null); var machine_flags = Object.create(null); +var softwarelist_info = Object.create(null); function make_slot_popup_id(name) { return ('select-slot-choice-' + name).replace(/:/g, '-'); } @@ -197,6 +198,47 @@ var fetch_machine_flags = (function () })(); +var fetch_softwarelist_info = (function () + { + var pending = Object.create(null); + return function (device) + { + if (!Object.prototype.hasOwnProperty.call(softwarelist_info, device) && !Object.prototype.hasOwnProperty.call(pending, device)) + { + pending[device] = true; + var req = new XMLHttpRequest(); + req.open('GET', appurl + 'rpc/softwarelists/' + encodeURIComponent(device), true); + req.responseType = 'json'; + req.onload = + function () + { + delete pending[device]; + if (req.status == 200) + { + softwarelist_info[device] = req.response; + var slotslist = document.getElementById('list-slot-options'); + if (slotslist) + { + for (var item = slotslist.firstChild; item; item = item.nextSibling) + { + if ((item.nodeName == 'DT') && (item.getAttribute('data-slotcard') == device)) + { + var slotname = item.getAttribute('data-slotname'); + add_softwarelist_rows( + device, + slotname, + document.getElementById('select-slot-choice-' + slotname.replace(/:/g, '-')).value); + } + } + } + } + }; + req.send(); + } + }; + })(); + + function add_flag_rows(table, device) { var sorted_features = Object.keys(machine_flags[device].features).sort(); @@ -228,6 +270,51 @@ function add_flag_rows(table, device) } +function add_softwarelist_rows(device, slot, card) +{ + var sorted_softwarelists = Object.keys(softwarelist_info[device]).sort(); + var cardtag = slot + ':' + card; + if (sorted_softwarelists.length) + { + var table = document.getElementById('tbl-softwarelists').tBodies[0]; + sorted_softwarelists.forEach( + function (tag) + { + var cell, link; + var info = softwarelist_info[device][tag]; + var href = appurl + 'softwarelist/' + encodeURIComponent(info.shortname); + var row = table.appendChild(document.createElement('tr')); + row.setAttribute('id', 'row-softwarelists-' + (cardtag + tag).replace(/:/g, '-')) + row.appendChild(document.createElement('td')).textContent = cardtag; + link = row.appendChild(document.createElement('td')).appendChild(document.createElement('a')); + link.setAttribute('href', href); + link.textContent = info.shortname; + link = row.appendChild(document.createElement('td')).appendChild(document.createElement('a')); + link.setAttribute('href', href); + link.textContent = info.description; + row.appendChild(document.createElement('td')).textContent = info.status; + total = info.total; + cell = row.appendChild(document.createElement('td')); + cell.textContent = total.toString(10); + cell.style.textAlign = 'right'; + if (!total) + total = 1; + cell = row.appendChild(document.createElement('td')); + cell.textContent = (info.supported * 100.0 / total).toFixed(1) + '%'; + cell.style.textAlign = 'right'; + cell = row.appendChild(document.createElement('td')); + cell.textContent = (info.partiallysupported * 100.0 / total).toFixed(1) + '%'; + cell.style.textAlign = 'right'; + cell = row.appendChild(document.createElement('td')); + cell.textContent = (info.unsupported * 100.0 / total).toFixed(1) + '%'; + cell.style.textAlign = 'right'; + }); + document.getElementById('heading-softwarelists').style.removeProperty('display'); + document.getElementById('tbl-softwarelists').style.removeProperty('display'); + } +} + + function add_bios_row(slot, table, device) { var sorted_sets = Object.keys(bios_sets[device]).sort(); @@ -394,6 +481,16 @@ function make_slot_change_handler(name, slot, defaults, dfltbtn) slotslist.removeChild(next); } + // clear out any software lists from previous selection + var softwarelist_rowid_prefix = 'row-softwarelists-' + prefix.replace(/:/g, '-'); + for (var candidate = document.getElementById('tbl-softwarelists').tBodies[0].rows[0]; candidate; ) + { + var next = candidate.nextSibling; + if ((candidate.nodeName == 'TR') && candidate.getAttribute('id').startsWith(softwarelist_rowid_prefix)) + candidate.parentNode.removeChild(candidate); + candidate = next; + } + if (selection === null) { // no selection, remove the slot card details table @@ -427,6 +524,12 @@ function make_slot_change_handler(name, slot, defaults, dfltbtn) else add_bios_row(slotname, tbl, selection.device); + // if we have software list info, populate now, otherweise fetch asynchronously + if (!Object.prototype.hasOwnProperty.call(softwarelist_info, selection.device)) + fetch_softwarelist_info(selection.device); + else + add_softwarelist_rows(selection.device, slotname, choice); + // drop the details table into the list if (def.firstChild) def.replaceChild(tbl, def.firstChild); diff --git a/docs/release/scripts/minimaws/lib/assets/romident.js b/docs/release/scripts/minimaws/lib/assets/romident.js index cbe1af89fdf..9ca2c84f54d 100644 --- a/docs/release/scripts/minimaws/lib/assets/romident.js +++ b/docs/release/scripts/minimaws/lib/assets/romident.js @@ -5,15 +5,8 @@ var matched_names = new Array(); var unmatched_names = new Array(); var dump_info = Object.create(null); var machine_info = Object.create(null); -var crc_table = new Uint32Array(256); - -for (var i = 0; i < 256; i++) -{ - var crc = i; - for (var b = 0; b < 8; b++) - crc = (crc >>> 1) ^ ((crc & 1) ? 0xedb88320 : 0x00000000); - crc_table[i] = crc; -} +var softwarelist_info = Object.create(null); +var software_info = Object.create(null); function get_chd_sha1(header) @@ -97,6 +90,34 @@ function add_matches(table, names, matches) } +function add_software_matches(table, names, part, matches) +{ + for (var i = 0; i < names.length; i++) + { + var row = table.appendChild(document.createElement('tr')); + var name = row.appendChild(document.createElement('th')); + name.textContent = names[i]; + if (matches !== null) + { + name.setAttribute('rowspan', matches.length); + row.appendChild(document.createElement('td')).textContent = part; + row.appendChild(document.createElement('td')).textContent = matches[0].name; + var bad = row.appendChild(document.createElement('td')); + if (matches[0].bad) + bad.textContent = 'BAD'; + for (var j = 1; j < matches.length; j++) + { + row = table.appendChild(document.createElement('tr')); + row.appendChild(document.createElement('td')).textContent = matches[j].name; + bad = row.appendChild(document.createElement('td')); + if (matches[j].bad) + bad.textContent = 'BAD'; + } + } + } +} + + function add_unmatched(names, crc, sha1) { var table; @@ -106,13 +127,12 @@ function add_unmatched(names, crc, sha1) } else { - var div = document.getElementById('div-machines'); - var heading = document.body.insertBefore(document.createElement('h2'), div); + var div = document.getElementById('div-unmatched'); + var heading = div.appendChild(document.createElement('h2')); heading.textContent = 'Unmatched'; - table = document.body.insertBefore(document.createElement('table'), div); + table = div.appendChild(document.createElement('table')); table.setAttribute('id', 'table-unmatched'); } - var row = table.appendChild(document.createElement('tr')); var content; if (crc === null) { @@ -126,6 +146,7 @@ function add_unmatched(names, crc, sha1) } for (var i = 0; i < names.length; i++) { + var row = table.appendChild(document.createElement('tr')); row.appendChild(document.createElement('th')).textContent = names[i]; row.appendChild(document.createElement('td')).textContent = content; unmatched_names.push(names[i]); @@ -133,6 +154,63 @@ function add_unmatched(names, crc, sha1) } +function add_issues(name) +{ + var div = document.getElementById('div-issues'); + var list; + if (!div.hasChildNodes()) + { + div.appendChild(document.createElement('h2')).textContent = 'Potential Issues'; + list = div.appendChild(document.createElement('dl')); + } + else + { + list = div.lastChild; + } + list.appendChild(document.createElement('dt')).textContent = name; + var table = list.appendChild(document.createElement('dd')).appendChild(document.createElement('table')); + table.setAttribute('class', 'sysinfo'); + return table; +} + + +function add_stuck_bits(table, stuck) +{ + function format_stuck_bits(bits, mask) + { + var result = ''; + for (var i = 0; i < bits.length; i++) + { + if (i > 0) + result += ' '; + for (var j = 0; j < 8; j++) + { + if (!((mask[i] >> (7 - j)) & 0x01)) + result += '-'; + else if ((bits[i] >> (7 - j)) & 0x01) + result += '1'; + else + result += '0'; + } + } + var cell = document.createElement('td'); + cell.appendChild(document.createElement('tt')).textContent = result; + return cell; + } + + var row = table.appendChild(document.createElement('tr')); + var header = row.appendChild(document.createElement('th')); + header.textContent = 'Fixed data bits:'; + header.setAttribute('rowspan', stuck.length); + row.appendChild(format_stuck_bits(stuck[0].bits, stuck[0].mask)); + for (var i = 1; i < stuck.length; i++) + { + row = table.appendChild(document.createElement('tr')); + row.appendChild(format_stuck_bits(stuck[i].bits, stuck[i].mask)); + } +} + + function get_machine_table(shortname, description) { if (Object.hasOwnProperty.call(machine_info, shortname)) @@ -142,7 +220,9 @@ function get_machine_table(shortname, description) else { var div = document.getElementById('div-machines'); - var heading = div.appendChild(document.createElement('h2')); + if (!div.hasChildNodes()) + div.appendChild(document.createElement('h2')).textContent = 'Machines'; + var heading = div.appendChild(document.createElement('h3')); var link = heading.appendChild(document.createElement('a')); link.textContent = description; link.setAttribute('href', appurl + 'machine/' + encodeURIComponent(shortname)); @@ -154,6 +234,50 @@ function get_machine_table(shortname, description) } +function get_softwarelist_div(shortname, description) +{ + if (Object.hasOwnProperty.call(softwarelist_info, shortname)) + { + return softwarelist_info[shortname]; + } + else + { + software_info[shortname] = Object.create(null) + var div = document.getElementById('div-software'); + if (!div.hasChildNodes()) + div.appendChild(document.createElement('h2')).textContent = 'Software'; + div = div.appendChild(document.createElement('div')); + var heading = div.appendChild(document.createElement('h3')); + var link = heading.appendChild(document.createElement('a')); + link.textContent = description; + link.setAttribute('href', appurl + 'softwarelist/' + encodeURIComponent(shortname)); + softwarelist_info[shortname] = div; + return div; + } +} + + +function get_software_table(softwarelist, shortname, description) +{ + if (Object.hasOwnProperty.call(software_info, softwarelist) && Object.hasOwnProperty.call(software_info[softwarelist], shortname)) + { + return software_info[softwarelist][shortname]; + } + else + { + var div = softwarelist_info[softwarelist]; + var heading = div.appendChild(document.createElement('h4')); + var link = heading.appendChild(document.createElement('a')); + link.textContent = description; + link.setAttribute('href', appurl + 'softwarelist/' + encodeURIComponent(softwarelist) + '/' + encodeURIComponent(shortname)); + var table = div.appendChild(document.createElement('table')); + software_info[softwarelist][shortname] = table; + add_software_matches(table, matched_names, null, null); + return table; + } +} + + function request_dumps(name, group, crc, sha1, url, progress) { var req = new XMLHttpRequest(); @@ -164,34 +288,123 @@ function request_dumps(name, group, crc, sha1, url, progress) if (req.status == 200) { var machines = Object.create(null); - var matched = Object.keys(req.response); + var software = Object.create(null); + var matched = Object.keys(req.response.machines); + var softwarelists = Object.keys(req.response.software); + if (matched.length > 0) { Object.keys(machine_info).forEach( function (shortname) { - var table = machine_info[shortname]; - if (Object.hasOwnProperty.call(req.response, shortname)) + var machine_table = machine_info[shortname]; + if (Object.hasOwnProperty.call(req.response.machines, shortname)) { - machines[shortname] = req.response[shortname].matches; - add_matches(table, group.names, req.response[shortname].matches); + machines[shortname] = req.response.machines[shortname].matches; + add_matches(machine_table, group.names, req.response.machines[shortname].matches); } else { - add_matches(table, group.names, null); + add_matches(machine_table, group.names, null); } }); + if (softwarelists.length <= 0) + { + Object.keys(software_info).forEach( + function (listname) + { + Object.keys(software_info[listname]).forEach( + function (softwarename) + { + var software_table = software_info[listname][softwarename]; + add_software_matches(software_table, group.names, null, null); + }); + }); + } matched.forEach( function (shortname) { if (!Object.hasOwnProperty.call(machine_info, shortname)) { - var info = req.response[shortname]; - var table = get_machine_table(shortname, info.description); - machines[shortname] = req.response[shortname].matches; - add_matches(table, group.names, info.matches); + var machine_details = req.response.machines[shortname]; + var machine_table = get_machine_table(shortname, machine_details.description); + machines[shortname] = req.response.machines[shortname].matches; + add_matches(machine_table, group.names, machine_details.matches); } }); + } + + if (softwarelists.length > 0) + { + if (matched.length <= 0) + { + Object.keys(machine_info).forEach( + function (shortname) + { + var machine_table = machine_info[shortname]; + add_matches(machine_table, group.names, null); + }); + } + Object.keys(software_info).forEach( + function (listname) + { + var haslist = Object.hasOwnProperty.call(req.response.software, listname); + Object.keys(software_info[listname]).forEach( + function (softwarename) + { + var software_table = software_info[listname][softwarename]; + if (haslist && Object.hasOwnProperty.call(req.response.software[listname].software, softwarename)) + { + if (!Object.hasOwnProperty.call(software, listname)) + software[listname] = Object.create(null); + if (!Object.hasOwnProperty.call(software[listname], softwarename)) + software[listname][softwarename] = Object.create(null); + var software_details = req.response.software[listname].software[softwarename]; + Object.keys(software_details.parts).forEach( + function (partname) + { + var matches = software_details.parts[partname].matches; + software[listname][softwarename][partname] = matches; + add_software_matches(software_table, group.names, partname, matches); + }); + } + else + { + add_software_matches(software_table, group.names, null, null); + } + }); + }); + softwarelists.forEach( + function (listname) + { + var haslist = Object.hasOwnProperty.call(software_info, listname); + var softwarelist_details = req.response.software[listname]; + var softwarelist_div = get_softwarelist_div(listname, softwarelist_details.description); + Object.keys(softwarelist_details.software).forEach( + function (softwarename) + { + if (!haslist || !Object.hasOwnProperty.call(software_info[listname], softwarename)) + { + if (!Object.hasOwnProperty.call(software, listname)) + software[listname] = Object.create(null); + if (!Object.hasOwnProperty.call(software[listname], softwarename)) + software[listname][softwarename] = Object.create(null); + var software_details = softwarelist_details.software[softwarename]; + var software_table = get_software_table(listname, softwarename, software_details.description); + Object.keys(software_details.parts).forEach( + function (partname) + { + var matches = software_details.parts[partname].matches; + software[listname][softwarename][partname] = matches; + add_software_matches(software_table, group.names, partname, matches); + }); + } + }); + }); + } + + if ((matched.length > 0) | (softwarelists.length > 0)) + { for (var i = 0; i < group.names.length; i++) matched_names.push(group.names[i]); } @@ -199,7 +412,9 @@ function request_dumps(name, group, crc, sha1, url, progress) { add_unmatched(group.names, crc, sha1); } + group.machines = machines; + group.software = software; progress.parentNode.removeChild(progress); } else @@ -242,18 +457,43 @@ function add_name(group, name, crc, sha1) if (group.hasOwnProperty('machines')) { var machines = group.machines; + var software = group.software; var names = [ name ]; - if (Object.keys(machines).length > 0) + if ((Object.keys(machines).length > 0) || (Object.keys(software).length > 0)) { Object.keys(machine_info).forEach( function (shortname) { - var table = machine_info[shortname]; + var machine_table = machine_info[shortname]; if (Object.hasOwnProperty.call(machines, shortname)) - add_matches(table, names, machines[shortname]); + add_matches(machine_table, names, machines[shortname]); else - add_matches(table, names, null); + add_matches(machine_table, names, null); + }); + + Object.keys(software_info).forEach( + function (listname) + { + var haslist = Object.hasOwnProperty.call(software, listname); + Object.keys(software_info[listname]).forEach( + function (softwarename) + { + var software_table = software_info[listname][softwarename]; + if (haslist && Object.hasOwnProperty.call(software[listname], softwarename)) + { + Object.keys(software[listname][softwarename]).forEach( + function (partname) + { + add_software_matches(software_table, names, partname, software[listname][softwarename][partname]); + }); + } + else + { + add_software_matches(software_table, names, null, null); + } + }); }); + matched_names.push(name); } else @@ -268,114 +508,9 @@ function add_name(group, name, crc, sha1) function identify_file(file, trychd, progress) { var digested = 0; - var crc = 0xffffffff; - var sha1st = new Uint32Array(5); - var sha1cnt = new Uint32Array(2); - var sha1buf = new DataView(new ArrayBuffer(64)); - - function rol(x, n) - { - return ((x << n) | (x >>> (32 - n))) & 0xffffffff; - } - - function sha1_process(data) - { - var d = new Uint32Array(sha1st); - - function b(i) - { - var r = data.getUint32(((i + 13) & 15) << 2, false); - r ^= data.getUint32(((i + 8) & 15) << 2, false); - r ^= data.getUint32(((i + 2) & 15) << 2, false); - r ^= data.getUint32((i & 15) << 2, false); - r = rol(r, 1); - data.setUint32((i & 15) << 2, r, false); - return r; - } - function r0(i) - { - d[i % 5] = 0xffffffff & (d[i % 5] + ((d[(i + 3) % 5] & (d[(i + 2) % 5] ^ d[(i + 1) % 5])) ^ d[(i + 1) % 5]) + data.getUint32(i << 2, false) + 0x5a827999 + rol(d[(i + 4) % 5], 5)); - d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); - } - function r1(i) - { - d[i % 5] = 0xffffffff & (d[i % 5] + ((d[(i + 3) % 5] & (d[(i + 2) % 5] ^ d[(i + 1) % 5])) ^ d[(i + 1) % 5])+ b(i) + 0x5a827999 + rol(d[(i + 4) % 5], 5)); - d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); - } - function r2(i) - { - d[i % 5] = 0xffffffff & (d[i % 5] + (d[(i + 3) % 5] ^ d[(i + 2) % 5] ^ d[(i + 1) % 5]) + b(i) + 0x6ed9eba1 + rol(d[(i + 4) % 5], 5)); - d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); - } - function r3(i) - { - d[i % 5] = 0xffffffff & (d[i % 5] + (((d[(i + 3) % 5] | d[(i + 2) % 5]) & d[(i + 1) % 5]) | (d[(i + 3) % 5] & d[(i + 2) % 5])) + b(i) + 0x8f1bbcdc + rol(d[(i + 4) % 5], 5)); - d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); - } - function r4(i) - { - d[i % 5] = 0xffffffff & (d[i % 5] + (d[(i + 3) % 5] ^ d[(i + 2) % 5] ^ d[(i + 1) % 5]) + b(i) + 0xca62c1d6 + rol(d[(i + 4) % 5], 5)); - d[(i + 3) % 5] = rol(d[(i + 3) % 5], 30); - } - - var i = 0; - while (i < 16) - r0(i++); - while (i < 20) - r1(i++); - while (i < 40) - r2(i++); - while (i < 60) - r3(i++); - while (i < 80) - r4(i++); - for (i = 0; i < sha1st.length; i++) - sha1st[i] = (sha1st[i] + d[i]) & 0xffffffff; - } - - function sha1_digest(data, view) - { - var residual = sha1cnt[0]; - sha1cnt[0] = (sha1cnt[0] + (view.length << 3)) & 0xffffffff; - if (residual > sha1cnt[0]) - sha1cnt[1]++; - sha1cnt[1] += (view.length >>> 29); - residual = (residual >>> 3) & 63; - var offset = 0; - if ((residual + view.length) >= 64) - { - if (residual > 0) - { - for (offset = 0; (offset + residual) < 64; offset++) - sha1buf.setUint8(offset + residual, view[offset]); - sha1_process(sha1buf); - residual = 0; - } - for ( ; (view.length - offset) >= 64; offset += 64) - sha1_process(new DataView(data, offset, 64)); - } - for ( ; offset < view.length; residual++, offset++) - sha1buf.setUint8(residual, view[offset]); - } - - function sha1_finalise() - { - var lenbuf = new ArrayBuffer(8); - var lenview = new DataView(lenbuf); - lenview.setUint32(0, sha1cnt[1], false); - lenview.setUint32(4, sha1cnt[0], false); - var padbuf = new ArrayBuffer(64 - (63 & ((sha1cnt[0] >>> 3) + 8))); - var padview = new Uint8Array(padbuf); - padview[0] = 0x80; - for (var i = 1; i < padview.length; i++) - padview[i] = 0x00; - sha1_digest(padbuf, padview); - sha1_digest(lenbuf, new Uint8Array(lenbuf)); - var result = new Array(20); - for (var i = 0; i < 20; i++) - result[i] = (sha1st[4 - (i >>> 2)] >> ((3 - (i & 3)) << 3)) & 0x000000ff; - return result.map(x => x.toString(16).padStart(2, '0')).join(''); - } + var crcproc = new Crc32Digester(); + var sha1proc = new Sha1Digester(); + var stuckbitsproc = new StuckBitsDigester(); function process_chunk(e) { @@ -404,9 +539,9 @@ function identify_file(file, trychd, progress) } } var view = new Uint8Array(data); - for (var i = 0; i < view.length; i++) - crc = (crc >>> 8) ^ crc_table[(crc & 0x000000ff) ^ view[i]]; - sha1_digest(data, view); + crcproc.digest(data, view); + sha1proc.digest(data, view); + stuckbitsproc.digest(data, view); digested += data.byteLength; if (digested < file.size) { @@ -414,20 +549,35 @@ function identify_file(file, trychd, progress) } else { - crc ^= 0xffffffff; - var sha1 = sha1_finalise(); + var crc = crcproc.finalise(); + var sha1 = sha1proc.finalise(); + var stuckbits = stuckbitsproc.finalise(); + var sha1grp = get_sha1_group(sha1); + var crcgrp; if (!Object.hasOwnProperty.call(sha1grp.crc, crc)) { - var crcgrp = new Object(); + crcgrp = new Object(); crcgrp.names = [ file.name ]; sha1grp.crc[crc] = crcgrp; + if (stuckbits.length) + { + crcgrp.issues = add_issues(file.name); + add_stuck_bits(crcgrp.issues, stuckbits); + } + else + { + crcgrp.issues = null; + } var crcstr = ((crc < 0) ? (0xffffffff + crc + 1) : crc).toString(16).padStart(8, '0'); request_dumps(file.name, crcgrp, crc, sha1, appurl + 'rpc/romdumps?crc=' + crcstr + '&sha1=' + sha1, progress); } else { - add_name(sha1grp.crc[crc], file.name, crc, sha1); + crcgrp = sha1grp.crc[crc]; + if (crcgrp.issues !== null) + crcgrp.issues.parentNode.parentNode.insertBefore(document.createElement('dl'), crcgrp.issues.parentNode).textContent = file.name; + add_name(crcgrp, file.name, crc, sha1); progress.parentNode.removeChild(progress); } } @@ -447,13 +597,6 @@ function identify_file(file, trychd, progress) reader.readAsArrayBuffer(chunk); }; - sha1st[0] = 0xc3d2e1f0; - sha1st[1] = 0x10325476; - sha1st[2] = 0x98badcfe; - sha1st[3] = 0xefcdab89; - sha1st[4] = 0x67452301; - sha1cnt[0] = 0; - sha1cnt[1] = 0; progress.textContent = 'Identifying \u201C' + file.name + '\u201D\u2026'; read_block(); } diff --git a/docs/release/scripts/minimaws/lib/auxverbs.py b/docs/release/scripts/minimaws/lib/auxverbs.py index b67a2fafb99..bff43bc9601 100644 --- a/docs/release/scripts/minimaws/lib/auxverbs.py +++ b/docs/release/scripts/minimaws/lib/auxverbs.py @@ -18,53 +18,13 @@ class _Identifier(object): def __init__(self, dbcurs, **kwargs): super(_Identifier, self).__init__(**kwargs) self.dbcurs = dbcurs + self.shortnamewidth = 0 self.pathwidth = 0 self.labelwidth = 0 - self.matches = { } + self.machines = { } + self.software = { } self.unmatched = [ ] - def processRomFile(self, path, f): - crc, sha1 = self.digestRom(f) - matched = False - for shortname, description, label, bad in self.dbcurs.get_rom_dumps(crc, sha1): - matched = True - self.labelwidth = max(len(label), self.labelwidth) - romset = self.matches.get(shortname) - if romset is None: - romset = (description, []) - self.matches[shortname] = romset - romset[1].append((path, label, bad)) - if not matched: - self.unmatched.append((path, crc, sha1)) - self.pathwidth = max(len(path), self.pathwidth) - - def processChd(self, path, sha1): - matched = False - for shortname, description, label, bad in self.dbcurs.get_disk_dumps(sha1): - matched = True - self.labelwidth = max(len(label), self.labelwidth) - romset = self.matches.get(shortname) - if romset is None: - romset = (description, []) - self.matches[shortname] = romset - romset[1].append((path, label, bad)) - if not matched: - self.unmatched.append((path, None, sha1)) - self.pathwidth = max(len(path), self.pathwidth) - - def processFile(self, path): - if os.path.splitext(path)[1].lower() != '.chd': - with open(path, mode='rb', buffering=0) as f: - self.processRomFile(path, f) - else: - with open(path, mode='rb') as f: - sha1 = self.probeChd(f) - if sha1 is None: - f.seek(0) - self.processRomFile(path, f) - else: - self.processChd(path, sha1) - def processPath(self, path, depth=0): try: if not os.path.isdir(path): @@ -78,20 +38,30 @@ class _Identifier(object): sys.stderr.write('Error identifying \'%s\': %s\n' % (path, e)) def printResults(self): + nw = self.shortnamewidth - (self.shortnamewidth % 4) + 4 pw = self.pathwidth - (self.pathwidth % 4) + 4 lw = self.labelwidth - (self.labelwidth % 4) + 4 first = True - for shortname, romset in sorted(self.matches.items()): + for shortname, romset in sorted(self.machines.items()): if first: first = False else: sys.stdout.write('\n') - sys.stdout.write('%-20s%s\n' % (shortname, romset[0])) - for path, label, bad in romset[1]: - if bad: - sys.stdout.write(' %-*s= %-*s(BAD)\n' % (pw, path, lw, label)) + sys.stdout.write('%-*s%s\n' % (nw, shortname, romset[0])) + self.printMatches(romset[1], pw, lw) + for softwarelist, listinfo in sorted(self.software.items()): + for shortname, softwareinfo in sorted(listinfo[1].items()): + if first: + first = False else: - sys.stdout.write(' %-*s= %s\n' % (pw, path, label)) + sys.stdout.write('\n') + sys.stdout.write('%-*s%s\n' % (nw, '%s:%s' % (softwarelist, shortname), softwareinfo[0])) + for part, partinfo in sorted(softwareinfo[1].items()): + if partinfo[0] is not None: + sys.stdout.write('%-*s%s\n' % (nw, ' ' + part, partinfo[0])) + else: + sys.stdout.write(' %s\n' % (part, )) + self.printMatches(partinfo[1], pw, lw) if self.unmatched: if first: first = False @@ -104,6 +74,73 @@ class _Identifier(object): else: sys.stdout.write(' %-*sSHA1(%s)\n' % (pw, path, sha1)) + def getMachineMatches(self, shortname, description): + result = self.machines.get(shortname) + if result is None: + result = (description, [ ]) + self.machines[shortname] = result + return result[1] + + def getSoftwareMatches(self, softwarelist, softwarelistdescription, shortname, description, part, part_id): + listinfo = self.software.get(softwarelist) + if listinfo is None: + listinfo = (softwarelistdescription, { }) + self.software[softwarelist] = listinfo + softwareinfo = listinfo[1].get(shortname) + if softwareinfo is None: + softwareinfo = (description, { }) + listinfo[1][shortname] = softwareinfo + partinfo = softwareinfo[1].get(part) + if partinfo is None: + partinfo = (part_id, [ ]) + softwareinfo[1][part] = partinfo + return partinfo[1] + + def processRomFile(self, path, f): + crc, sha1 = self.digestRom(f) + matched = False + for shortname, description, label, bad in self.dbcurs.get_rom_dumps(crc, sha1): + matched = True + self.shortnamewidth = max(len(shortname), self.shortnamewidth) + self.labelwidth = max(len(label), self.labelwidth) + self.getMachineMatches(shortname, description).append((path, label, bad)) + for softwarelist, softwarelistdescription, shortname, description, part, part_id, label, bad in self.dbcurs.get_software_rom_dumps(crc, sha1): + matched = True + self.shortnamewidth = max(len(softwarelist) + 1 + len(shortname), 2 + len(part), self.shortnamewidth) + self.labelwidth = max(len(label), self.labelwidth) + self.getSoftwareMatches(softwarelist, softwarelistdescription, shortname, description, part, part_id).append((path, label, bad)) + if not matched: + self.unmatched.append((path, crc, sha1)) + + def processChd(self, path, sha1): + matched = False + for shortname, description, label, bad in self.dbcurs.get_disk_dumps(sha1): + matched = True + self.shortnamewidth = max(len(shortname), self.shortnamewidth) + self.labelwidth = max(len(label), self.labelwidth) + self.getMachineMatches(shortname, description).append((path, label, bad)) + for softwarelist, softwarelistdescription, shortname, description, part, part_id, label, bad in self.dbcurs.get_software_disk_dumps(sha1): + matched = True + self.shortnamewidth = max(len(softwarelist) + 1 + len(shortname), 2 + len(part), self.shortnamewidth) + self.labelwidth = max(len(label), self.labelwidth) + self.getSoftwareMatches(softwarelist, softwarelistdescription, shortname, description, part, part_id).append((path, label, bad)) + if not matched: + self.unmatched.append((path, None, sha1)) + + def processFile(self, path): + if os.path.splitext(path)[1].lower() != '.chd': + with open(path, mode='rb', buffering=0) as f: + self.processRomFile(path, f) + else: + with open(path, mode='rb') as f: + sha1 = self.probeChd(f) + if sha1 is None: + f.seek(0) + self.processRomFile(path, f) + else: + self.processChd(path, sha1) + self.pathwidth = max(len(path), self.pathwidth) + @staticmethod def iterateBlocks(f, s=65536): while True: @@ -150,6 +187,14 @@ class _Identifier(object): return None return codecs.getencoder('hex_codec')(buf)[0].decode('ascii') + @staticmethod + def printMatches(matches, pathwidth, labelwidth): + for path, label, bad in matches: + if bad: + sys.stdout.write(' %-*s= %-*s(BAD)\n' % (pathwidth, path, labelwidth, label)) + else: + sys.stdout.write(' %-*s= %s\n' % (pathwidth, path, label)) + def do_listfull(options): dbconn = dbaccess.QueryConnection(options.database) diff --git a/docs/release/scripts/minimaws/lib/dbaccess.py b/docs/release/scripts/minimaws/lib/dbaccess.py index 24dbb163171..7ca5ebf243d 100644 --- a/docs/release/scripts/minimaws/lib/dbaccess.py +++ b/docs/release/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,6 +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_MACHINESOFTWARELIST = \ + 'CREATE TABLE machinesoftwarelist (\n' \ + ' id INTEGER PRIMARY KEY,\n' \ + ' machine INTEGER NOT NULL,\n' \ + ' softwarelist INTEGER NOT NULL,\n' \ + ' 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' \ @@ -156,6 +248,15 @@ class SchemaQueries(object): ' FOREIGN KEY (machine) REFERENCES machine (id),\n' \ ' FOREIGN KEY (rom) REFERENCES rom (id),\n' \ ' UNIQUE (machine, rom, name))' + CREATE_SOFTWAREROMDUMP = \ + 'CREATE TABLE softwareromdump (\n' \ + ' part INTEGER NOT NULL,\n' \ + ' rom INTEGER NOT NULL,\n' \ + ' name TEXT NOT NULL,\n' \ + ' bad INTEGER NOT NULL,\n' \ + ' FOREIGN KEY (part) REFERENCES softwarepart (id),\n' \ + ' FOREIGN KEY (rom) REFERENCES rom (id),\n' \ + ' UNIQUE (part, rom, name))' CREATE_DISK = \ 'CREATE TABLE disk (\n' \ ' id INTEGER PRIMARY KEY,\n' \ @@ -170,15 +271,46 @@ class SchemaQueries(object): ' FOREIGN KEY (machine) REFERENCES machine (id),\n' \ ' FOREIGN KEY (disk) REFERENCES disk (id),\n' \ ' UNIQUE (machine, disk, name))' + CREATE_SOFTWAREDISKDUMP = \ + 'CREATE TABLE softwarediskdump (\n' \ + ' part INTEGER NOT NULL,\n' \ + ' disk INTEGER NOT NULL,\n' \ + ' name TEXT NOT NULL,\n' \ + ' bad INTEGER NOT NULL,\n' \ + ' FOREIGN KEY (part) REFERENCES softwarepart (id),\n' \ + ' 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_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)' + INDEX_SOFTWARE_SHORTNAME_SOFTWARELIST = 'CREATE INDEX software_shortname_softwarelist ON software (shortname ASC, softwarelist ASC)' + 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)' + + INDEX_SOFTWARESHAREDFEAT_SHAREDFEATTYPE_VALUE_SOFTWARE = 'CREATE INDEX softwaresharedfeat_sharedfeattype_value_software ON softwaresharedfeat (sharedfeattype ASC, value ASC, software ASC)' + + INDEX_SOFTWAREPART_INTERFACE_SOFTWARE = 'CREATE INDEX softwarepart_interface_software ON softwarepart (interface ASC, software ASC)' + + 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)' @@ -193,9 +325,37 @@ class SchemaQueries(object): 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)' + + INDEX_SOFTWAREROMDUMP_ROM = 'CREATE INDEX softwareromdump_rom ON softwareromdump (rom ASC)' + INDEX_SOFTWAREROMDUMP_PART_BAD = 'CREATE INDEX softwareromdump_part_bad ON softwareromdump (part ASC, bad ASC)' INDEX_DISKDUMP_DISK = 'CREATE INDEX diskdump_disk ON diskdump (disk ASC)' + INDEX_DISKDUMP_MACHINE_BAD = 'CREATE INDEX diskdump_machine_bad ON diskdump (machine ASC, bad ASC)' + + 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_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' + DROP_SOFTWARE_SHORTNAME_SOFTWARELIST = 'DROP INDEX IF EXISTS software_shortname_softwarelist' + 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' + + DROP_SOFTWARESHAREDFEAT_SHAREDFEATTYPE_VALUE_SOFTWARE = 'DROP INDEX IF EXISTS softwaresharedfeat_sharedfeattype_value_software' + + DROP_SOFTWAREPART_INTERFACE_SOFTWARE = 'DROP INDEX IF EXISTS softwarepart_interface_software' + + 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' @@ -211,12 +371,33 @@ class SchemaQueries(object): 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' + + DROP_SOFTWAREROMDUMP_ROM = 'DROP INDEX IF EXISTS softwareromdump_rom' + DROP_SOFTWAREROMDUMP_PART_BAD = 'DROP INDEX IF EXISTS softwareromdump_part_bad' DROP_DISKDUMP_DISK = 'DROP INDEX IF EXISTS diskdump_disk' + DROP_DISKDUMP_MACHINE_BAD = 'DROP INDEX IF EXISTS diskdump_machine_bad' + + DROP_SOFTWAREDISKDUMP_DISK = 'DROP INDEX IF EXISTS softwarediskdump_disk' + 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, @@ -234,17 +415,33 @@ class SchemaQueries(object): CREATE_SLOTDEFAULT, CREATE_RAMOPTION, CREATE_RAMDEFAULT, + CREATE_MACHINESOFTWARELIST, CREATE_ROM, CREATE_ROMDUMP, + CREATE_SOFTWAREROMDUMP, CREATE_DISK, - CREATE_DISKDUMP) + CREATE_DISKDUMP, + CREATE_SOFTWAREDISKDUMP) CREATE_TEMPORARY_TABLES = ( + CREATE_TEMPORARY_SOFTWARECLONEOF, CREATE_TEMPORARY_DEVICEREFERENCE, CREATE_TEMPORARY_SLOTOPTION, CREATE_TEMPORARY_SLOTDEFAULT) CREATE_INDEXES = ( + 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, @@ -254,10 +451,29 @@ class SchemaQueries(object): INDEX_ROMOF_PARENT, INDEX_CLONEOF_PARENT, INDEX_DIPSWITCH_MACHINE_ISCONFIG, + INDEX_MACHINESOFTWARELIST_SOFTWARELIST_MACHINE, INDEX_ROMDUMP_ROM, - INDEX_DISKDUMP_DISK) + INDEX_ROMDUMP_MACHINE_BAD, + INDEX_SOFTWAREROMDUMP_ROM, + INDEX_SOFTWAREROMDUMP_PART_BAD, + INDEX_DISKDUMP_DISK, + INDEX_DISKDUMP_MACHINE_BAD, + INDEX_SOFTWAREDISKDUMP_DISK, + INDEX_SOFTWAREDISKDUMP_PART_BAD) DROP_INDEXES = ( + 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, @@ -267,12 +483,32 @@ class SchemaQueries(object): DROP_ROMOF_PARENT, DROP_CLONEOF_PARENT, DROP_DIPSWITCH_MACHINE_ISCONFIG, + DROP_MACHINESOFTWARELIST_SOFTWARELIST_MACHINE, DROP_ROMDUMP_ROM, - DROP_DISKDUMP_DISK) + DROP_ROMDUMP_MACHINE_BAD, + DROP_SOFTWAREROMDUMP_ROM, + DROP_SOFTWAREROMDUMP_PART_BAD, + DROP_DISKDUMP_DISK, + DROP_DISKDUMP_MACHINE_BAD, + DROP_SOFTWAREDISKDUMP_DISK, + DROP_SOFTWAREDISKDUMP_PART_BAD) 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 (?, ?, ?)' @@ -287,18 +523,39 @@ 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_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 = ?' ADD_DISK = 'INSERT OR IGNORE INTO disk (sha1) VALUES (?)' 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): @@ -408,7 +665,7 @@ class QueryCursor(object): def get_machine_id(self, machine): return (self.dbcurs.execute('SELECT id FROM machine WHERE shortname = ?', (machine, )).fetchone() or (None, ))[0] - def get_machine_info(self, machine): + def get_machine_details(self, machine): return self.dbcurs.execute( 'SELECT machine.id AS id, machine.description AS description, machine.isdevice AS isdevice, machine.runnable AS runnable, sourcefile.filename AS sourcefile, system.year AS year, system.manufacturer AS manufacturer, cloneof.parent AS cloneof, romof.parent AS romof ' \ 'FROM machine JOIN sourcefile ON machine.sourcefile = sourcefile.id LEFT JOIN system ON machine.id = system.id LEFT JOIN cloneof ON system.id = cloneof.id LEFT JOIN romof ON system.id = romof.id ' \ @@ -474,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] @@ -507,6 +771,106 @@ class QueryCursor(object): 'ORDER BY ramoption.size', (machine, )) + def get_machine_softwarelists(self, machine): + return self.dbcurs.execute( + 'SELECT machinesoftwarelist.tag AS tag, machinesoftwareliststatustype.value AS status, softwarelist.shortname AS shortname, softwarelist.description AS description, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ + 'FROM machinesoftwarelist LEFT JOIN machinesoftwareliststatustype ON machinesoftwarelist.status = machinesoftwareliststatustype.id LEFT JOIN softwarelist ON machinesoftwarelist.softwarelist = softwarelist.id LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ + 'WHERE machinesoftwarelist.machine = ? ' \ + 'GROUP BY machinesoftwarelist.id', + (machine, )) + + def get_softwarelist_id(self, shortname): + return (self.dbcurs.execute('SELECT id FROM softwarelist WHERE shortname = ?', (shortname, )).fetchone() or (None, ))[0] + + def get_softwarelist_details(self, shortname, pattern): + if pattern is not None: + return self.dbcurs.execute( + 'SELECT softwarelist.id AS id, softwarelist.shortname AS shortname, softwarelist.description AS description, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ + 'FROM softwarelist LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ + 'WHERE softwarelist.shortname = ? AND software.shortname GLOB ? ' \ + 'GROUP BY softwarelist.id', + (shortname, pattern)) + else: + return self.dbcurs.execute( + 'SELECT softwarelist.id AS id, softwarelist.shortname AS shortname, softwarelist.description AS description, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ + 'FROM softwarelist LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ + 'WHERE softwarelist.shortname = ? ' \ + 'GROUP BY softwarelist.id', + (shortname, )) + + 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, 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, 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( + 'SELECT softwarelist.shortname AS shortname, softwarelist.description AS description, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ + 'FROM softwarelist LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ + 'WHERE softwarelist.shortname GLOB ? ' \ + 'GROUP BY softwarelist.id', + (pattern, )) + else: + return self.dbcurs.execute( + 'SELECT softwarelist.shortname AS shortname, softwarelist.description AS description, COUNT(software.id) AS total, COUNT(CASE software.supported WHEN 0 THEN 1 ELSE NULL END) AS supported, COUNT(CASE software.supported WHEN 1 THEN 1 ELSE NULL END) AS partiallysupported, COUNT(CASE software.supported WHEN 2 THEN 1 ELSE NULL END) AS unsupported ' \ + 'FROM softwarelist LEFT JOIN software ON softwarelist.id = software.softwarelist ' \ + 'GROUP BY softwarelist.id') + + 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, 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 ' \ + 'FROM softwareinfo JOIN softwareinfotype ON softwareinfo.infotype = softwareinfotype.id ' \ + 'WHERE softwareinfo.software = ? ' \ + 'ORDER BY softwareinfotype.name ASC, softwareinfo.value ASC', + (software, )) + + def get_software_parts(self, software): + return self.dbcurs.execute( + 'SELECT softwarepart.id AS id, softwarepart.shortname AS shortname, softwarepart.interface AS interface, softwarepartfeature.value AS part_id ' \ + 'FROM softwarepart LEFT JOIN softwarepartfeature ON softwarepart.id = softwarepartfeature.part AND softwarepartfeature.featuretype = (SELECT id FROM softwarepartfeaturetype WHERE name = \'part_id\') ' \ + 'WHERE softwarepart.software = ?', + (software, )) + + def get_softwarepart_features(self, part): + return self.dbcurs.execute( + 'SELECT softwarepartfeaturetype.name AS name, softwarepartfeature.value AS value ' \ + 'FROM softwarepartfeature LEFT JOIN softwarepartfeaturetype ON softwarepartfeature.featuretype = softwarepartfeaturetype.id ' \ + 'WHERE softwarepartfeature.part = ? ' + 'ORDER BY softwarepartfeaturetype.name ASC', + (part, )) + def get_rom_dumps(self, crc, sha1): return self.dbcurs.execute( 'SELECT machine.shortname AS shortname, machine.description AS description, romdump.name AS label, romdump.bad AS bad ' \ @@ -514,6 +878,13 @@ class QueryCursor(object): 'WHERE romdump.rom = (SELECT id FROM rom WHERE crc = ? AND sha1 = ?)', (crc, sha1)) + def get_software_rom_dumps(self, crc, sha1): + return self.dbcurs.execute( + 'SELECT softwarelist.shortname AS softwarelist, softwarelist.description AS softwarelistdescription, software.shortname AS shortname, software.description AS description, softwarepart.shortname AS part, softwarepartfeature.value AS part_id, softwareromdump.name AS label, softwareromdump.bad AS bad ' \ + 'FROM softwareromdump LEFT JOIN softwarepart ON softwareromdump.part = softwarepart.id LEFT JOIN softwarepartfeature ON softwarepart.id = softwarepartfeature.part AND softwarepartfeature.featuretype = (SELECT id FROM softwarepartfeaturetype WHERE name = \'part_id\') LEFT JOIN software ON softwarepart.software = software.id LEFT JOIN softwarelist ON software.softwarelist = softwarelist.id ' \ + 'WHERE softwareromdump.rom = (SELECT id FROM rom WHERE crc = ? AND sha1 = ?)', + (crc, sha1)) + def get_disk_dumps(self, sha1): return self.dbcurs.execute( 'SELECT machine.shortname AS shortname, machine.description AS description, diskdump.name AS label, diskdump.bad AS bad ' \ @@ -521,6 +892,13 @@ class QueryCursor(object): 'WHERE diskdump.disk = (SELECT id FROM disk WHERE sha1 = ?)', (sha1, )) + def get_software_disk_dumps(self, sha1): + return self.dbcurs.execute( + 'SELECT softwarelist.shortname AS softwarelist, softwarelist.description AS softwarelistdescription, software.shortname AS shortname, software.description AS description, softwarepart.shortname AS part, softwarepartfeature.value AS part_id, softwarediskdump.name AS label, softwarediskdump.bad AS bad ' \ + 'FROM softwarediskdump LEFT JOIN softwarepart ON softwarediskdump.part = softwarepart.id LEFT JOIN softwarepartfeature ON softwarepart.id = softwarepartfeature.part AND softwarepartfeature.featuretype = (SELECT id FROM softwarepartfeaturetype WHERE name = \'part_id\') LEFT JOIN software ON softwarepart.software = software.id LEFT JOIN softwarelist ON software.softwarelist = softwarelist.id ' \ + 'WHERE softwarediskdump.disk = (SELECT id FROM disk WHERE sha1 = ?)', + (sha1, )) + class UpdateCursor(object): def __init__(self, dbconn, **kwargs): @@ -530,6 +908,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, )) @@ -599,6 +1014,11 @@ class UpdateCursor(object): self.dbcurs.execute(UpdateQueries.ADD_RAMDEFAULT, (machine, size)) return self.dbcurs.lastrowid + 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): self.dbcurs.execute(UpdateQueries.ADD_ROM, (crc, sha1)) return self.dbcurs.lastrowid @@ -607,6 +1027,10 @@ class UpdateCursor(object): self.dbcurs.execute(UpdateQueries.ADD_ROMDUMP, (machine, name, 1 if bad else 0, crc, sha1)) return self.dbcurs.lastrowid + def add_softwareromdump(self, part, name, crc, sha1, bad): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREROMDUMP, (part, name, 1 if bad else 0, crc, sha1)) + return self.dbcurs.lastrowid + def add_disk(self, sha1): self.dbcurs.execute(UpdateQueries.ADD_DISK, (sha1, )) return self.dbcurs.lastrowid @@ -615,6 +1039,10 @@ class UpdateCursor(object): self.dbcurs.execute(UpdateQueries.ADD_DISKDUMP, (machine, name, 1 if bad else 0, sha1)) return self.dbcurs.lastrowid + def add_softwarediskdump(self, part, name, sha1, bad): + self.dbcurs.execute(UpdateQueries.ADD_SOFTWAREDISKDUMP, (part, name, 1 if bad else 0, sha1)) + return self.dbcurs.lastrowid + class QueryConnection(object): def __init__(self, database, **kwargs): @@ -655,6 +1083,8 @@ class UpdateConnection(object): def prepare_for_load(self): # here be dragons - this is a poor man's DROP ALL TABLES etc. self.dbconn.execute('PRAGMA foreign_keys = OFF') + for query in self.dbconn.execute('SELECT \'DROP VIEW \' || name FROM sqlite_master WHERE type = \'view\'').fetchall(): + self.dbconn.execute(query[0]) for query in self.dbconn.execute('SELECT \'DROP INDEX \' || name FROM sqlite_master WHERE type = \'index\' AND NOT name GLOB \'sqlite_autoindex_*\'').fetchall(): self.dbconn.execute(query[0]) for query in self.dbconn.execute('SELECT \'DROP TABLE \' || name FROM sqlite_master WHERE type = \'table\'').fetchall(): @@ -671,6 +1101,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/docs/release/scripts/minimaws/lib/htmltmpl.py b/docs/release/scripts/minimaws/lib/htmltmpl.py index 55034b0d079..7c9246865b1 100644 --- a/docs/release/scripts/minimaws/lib/htmltmpl.py +++ b/docs/release/scripts/minimaws/lib/htmltmpl.py @@ -24,6 +24,7 @@ SORTABLE_TABLE_EPILOGUE = string.Template( '</table>\n' '<script>make_table_sortable(document.getElementById("${id}"));</script>\n') + MACHINE_PROLOGUE = string.Template( '<!DOCTYPE html>\n' \ '<html>\n' \ @@ -48,6 +49,68 @@ MACHINE_PROLOGUE = string.Template( ' <tr><th>Runnable:</th><td>${runnable}</td></tr>\n' \ ' <tr><th>Source file:</th><td><a href="${sourcehref}">${sourcefile}</a></td></tr>\n') +MACHINE_CLONES_PROLOGUE = string.Template( + '<h2>Clones</h2>\n' \ + '<table id="tbl-clones">\n' \ + ' <thead>\n' \ + ' <tr>\n' \ + ' <th>Short name</th>\n' \ + ' <th>Description</th>\n' \ + ' <th>Year</th>\n' \ + ' <th>Manufacturer</th>\n' \ + ' </tr>\n' \ + ' </thead>\n' \ + ' <tbody>\n') + +MACHINE_CLONES_ROW = string.Template( + ' <tr>\n' \ + ' <td><a href="${href}">${shortname}</a></td>\n' \ + ' <td><a href="${href}">${description}</a></td>\n' \ + ' <td>${year}</td>\n' \ + ' <td>${manufacturer}</td>\n' \ + ' </tr>\n') + +MACHINE_SOFTWARELISTS_TABLE_PROLOGUE = string.Template( + '<h2 id="heading-softwarelists">Software Lists</h2>\n' \ + '<table id="tbl-softwarelists">\n' \ + ' <thead>\n' \ + ' <tr>\n' \ + ' <th>Card</th>\n' \ + ' <th>Short name</th>\n' \ + ' <th>Description</th>\n' \ + ' <th>Status</th>\n' \ + ' <th class="numeric">Total</th>\n' \ + ' <th class="numeric">Supported</th>\n' \ + ' <th class="numeric">Partially supported</th>\n' \ + ' <th class="numeric">Unsupported</th>\n' \ + ' </tr>\n' \ + ' </thead>\n' \ + ' <tbody>\n') + +MACHINE_SOFTWARELISTS_TABLE_ROW = string.Template( + ' <tr id="row-softwarelists-${rowid}">\n' \ + ' <td></td>\n' \ + ' <td><a href="${href}">${shortname}</a></td>\n' \ + ' <td><a href="${href}">${description}</a></td>\n' \ + ' <td>${status}</td>\n' \ + ' <td style="text-align: right">${total}</td>\n' \ + ' <td style="text-align: right">${supported}</td>\n' \ + ' <td style="text-align: right">${partiallysupported}</td>\n' \ + ' <td style="text-align: right">${unsupported}</td>\n' \ + ' </tr>\n') + +MACHINE_SOFTWARELISTS_TABLE_EPILOGUE = string.Template( + ' </tbody>\n' \ + '</table>\n' \ + '<script>\n' \ + ' make_table_sortable(document.getElementById("tbl-softwarelists"));\n' \ + ' if (!document.getElementById("tbl-softwarelists").tBodies[0].rows.length)\n' \ + ' {\n' \ + ' document.getElementById("heading-softwarelists").style.display = "none";\n' \ + ' document.getElementById("tbl-softwarelists").style.display = "none";\n' \ + ' }\n' \ + '</script>\n') + MACHINE_OPTIONS_HEADING = string.Template( '<h2>Options</h2>\n' \ '<p>\n' \ @@ -70,10 +133,14 @@ MACHINE_RAM_PROLOGUE = string.Template( MACHINE_RAM_OPTION = string.Template( ' <option value="${name}" data-isdefault="${isdefault}">${name} (${size})</option>\n') -MACHINE_SLOTS_PLACEHOLDER = string.Template( +MACHINE_SLOTS_PLACEHOLDER_PROLOGUE = string.Template( '<h3>Slots</h3>\n' \ '<p id="para-slots-placeholder">Loading slot information…<p>\n' \ - '<script>fetch_slots("${machine}");</script>\n') + '<script>\n') + +MACHINE_SLOTS_PLACEHOLDER_EPILOGUE = string.Template( + ' populate_slots(${machine});\n' + '</script>\n') MACHINE_ROW = string.Template( ' <tr>\n' \ @@ -164,6 +231,188 @@ SOURCEFILE_LIST_ROW = string.Template( ' <td style="text-align: right">${machines}</td>\n' \ ' </tr>\n') + +SOFTWARE_PROLOGUE = string.Template( + '<!DOCTYPE html>\n' \ + '<html>\n' \ + '<head>\n' \ + ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">\n' \ + ' <meta http-equiv="Content-Style-Type" content="text/css">\n' \ + ' <meta http-equiv="Content-Script-Type" content="text/javascript">\n' \ + ' <link rel="stylesheet" type="text/css" href="${assets}/style.css">\n' \ + ' <script type="text/javascript">var assetsurl="${assets}"</script>\n' \ + ' <script type="text/javascript" src="${assets}/common.js"></script>\n' \ + ' <title>${title}</title>\n' \ + '</head>\n' \ + '<body>\n' \ + '<h1>${heading}</h1>\n' \ + '<table class="sysinfo">\n' \ + ' <tr><th>Software list:</th><td><a href="${softwarelisthref}">${softwarelistdescription} (${softwarelist})</a></td></tr>\n' \ + ' <tr><th>Short name:</th><td>${shortname}</td></tr>\n' \ + ' <tr><th>Year:</th><td>${year}</td></tr>\n' \ + ' <tr><th>Publisher:</th><td>${publisher}</td></tr>\n'); + +SOFTWARE_CLONES_PROLOGUE = string.Template( + '<h2>Clones</h2>\n' \ + '<table id="tbl-clones">\n' \ + ' <thead>\n' \ + ' <tr>\n' \ + ' <th>Short name</th>\n' \ + ' <th>Description</th>\n' \ + ' <th>Year</th>\n' \ + ' <th>Publisher</th>\n' \ + ' <th>Supported</th>\n' \ + ' </tr>\n' \ + ' </thead>\n' \ + ' <tbody>\n') + +SOFTWARE_CLONES_ROW = string.Template( + ' <tr>\n' \ + ' <td><a href="${href}">${shortname}</a></td>\n' \ + ' <td><a href="${href}">${description}</a></td>\n' \ + ' <td>${year}</td>\n' \ + ' <td>${publisher}</td>\n' \ + ' <td>${supported}</td>\n' \ + ' </tr>\n') + +SOFTWARE_PART_PROLOGUE = string.Template( + '<h3>${heading}</h3>\n' \ + '<table class="sysinfo">\n' \ + ' <tr><th>Short name:</th><td>${shortname}</td></tr>\n' \ + ' <tr><th>Interface:</th><td>${interface}</td></tr>\n') + + +SOFTWARELIST_PROLOGUE = string.Template( + '<!DOCTYPE html>\n' \ + '<html>\n' \ + '<head>\n' \ + ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">\n' \ + ' <meta http-equiv="Content-Style-Type" content="text/css">\n' \ + ' <meta http-equiv="Content-Script-Type" content="text/javascript">\n' \ + ' <link rel="stylesheet" type="text/css" href="${assets}/style.css">\n' \ + ' <script type="text/javascript">var assetsurl="${assets}"</script>\n' \ + ' <script type="text/javascript" src="${assets}/common.js"></script>\n' \ + ' <title>${title}</title>\n' \ + '</head>\n' \ + '<body>\n' \ + '<h1>${heading}</h1>\n' \ + '<table class="sysinfo">\n' \ + ' <tr>\n' \ + ' <th>Short name:</th>\n' \ + ' <td>${shortname}</td>\n' \ + ' </tr>\n' \ + ' <tr>\n' \ + ' <th>Total:</th>\n' \ + ' <td style="text-align: right">${total}</td>\n' \ + ' </tr>\n' \ + ' <tr>\n' \ + ' <th>Supported:</th>\n' \ + ' <td style="text-align: right">${supported}</td>\n' \ + ' <td style="text-align: right">(${supportedpc}%)</td>\n' \ + ' </tr>\n' \ + ' <tr>\n' \ + ' <th>Partially supported:</th>\n' \ + ' <td style="text-align: right">${partiallysupported}</td>\n' \ + ' <td style="text-align: right">(${partiallysupportedpc}%)</td>\n' \ + ' </tr>\n' \ + ' <tr>\n' \ + ' <th>Unsupported:</th>\n' \ + ' <td style="text-align: right">${unsupported}</td>\n' \ + ' <td style="text-align: right">(${unsupportedpc}%)</td>\n' \ + ' </tr>\n' \ + '</table>\n') + +SOFTWARELIST_MACHINE_TABLE_HEADER = string.Template( + '<h2>Machines</h2>\n' \ + '<table id="tbl-machines">\n' \ + ' <thead>\n' \ + ' <tr>\n' \ + ' <th>Short name</th>\n' \ + ' <th>Description</th>\n' \ + ' <th>Year</th>\n' \ + ' <th>Manufacturer</th>\n' \ + ' <th>Status</th>\n' \ + ' </tr>\n' \ + ' </thead>\n' \ + ' <tbody>\n') + +SOFTWARELIST_MACHINE_TABLE_ROW = string.Template( + ' <tr>\n' \ + ' <td><a href="${machinehref}">${shortname}</a></td>\n' \ + ' <td><a href="${machinehref}">${description}</a></td>\n' \ + ' <td>${year}</td>\n' \ + ' <td>${manufacturer}</td>\n' \ + ' <td>${status}</td>\n' \ + ' </tr>\n') + +SOFTWARELIST_SOFTWARE_TABLE_HEADER = string.Template( + '<h2>Software</h2>\n' \ + '<table id="tbl-software">\n' \ + ' <thead>\n' \ + ' <tr>\n' \ + ' <th>Short name</th>\n' \ + ' <th>Description</th>\n' \ + ' <th>Year</th>\n' \ + ' <th>Publisher</th>\n' \ + ' <th>Supported</th>\n' \ + ' <th class="numeric">Parts</th>\n' \ + ' <th class="numeric">Bad dumps</th>\n' \ + ' <th>Parent</th>\n' \ + ' </tr>\n' \ + ' </thead>\n' \ + ' <tbody>\n') + +SOFTWARELIST_SOFTWARE_ROW = string.Template( + ' <tr>\n' \ + ' <td><a href="${softwarehref}">${shortname}</a></td>\n' \ + ' <td><a href="${softwarehref}">${description}</a></td>\n' \ + ' <td>${year}</td>\n' \ + ' <td>${publisher}</td>\n' \ + ' <td>${supported}</td>\n' \ + ' <td style="text-align: right">${parts}</td>\n' \ + ' <td style="text-align: right">${baddumps}</td>\n' \ + ' <td>${parent}</td>\n' \ + ' </tr>\n') + + +SOFTWARELIST_LIST_PROLOGUE = string.Template( + '<!DOCTYPE html>\n' \ + '<html>\n' \ + '<head>\n' \ + ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">\n' \ + ' <meta http-equiv="Content-Style-Type" content="text/css">\n' \ + ' <meta http-equiv="Content-Script-Type" content="text/javascript">\n' \ + ' <link rel="stylesheet" type="text/css" href="${assets}/style.css">\n' \ + ' <script type="text/javascript">var assetsurl="${assets}"</script>\n' \ + ' <script type="text/javascript" src="${assets}/common.js"></script>\n' \ + ' <title>${title}</title>\n' \ + '</head>\n' \ + '<body>\n' \ + '<h1>${heading}</h1>\n' \ + '<table id="tbl-softwarelists">\n' \ + ' <thead>\n' \ + ' <tr>\n' \ + ' <th>Short name</th>\n' \ + ' <th>Description</th>\n' \ + ' <th class="numeric">Total</th>\n' \ + ' <th class="numeric">Supported</th>\n' \ + ' <th class="numeric">Partially supported</th>\n' \ + ' <th class="numeric">Unsupported</th>\n' \ + ' </tr>\n' \ + ' </thead>\n' \ + ' <tbody>\n') + +SOFTWARELIST_LIST_ROW = string.Template( + ' <tr>\n' \ + ' <td><a href="${href}">${shortname}</a></td>\n' \ + ' <td><a href="${href}">${description}</a></td>\n' \ + ' <td style="text-align: right">${total}</td>\n' \ + ' <td style="text-align: right">${supported}</td>\n' \ + ' <td style="text-align: right">${partiallysupported}</td>\n' \ + ' <td style="text-align: right">${unsupported}</td>\n' \ + ' </tr>\n') + + ROMIDENT_PAGE = string.Template( '<!DOCTYPE html>\n' \ '<html>\n' \ @@ -177,6 +426,7 @@ ROMIDENT_PAGE = string.Template( ' var assetsurl="${assets}"\n' \ ' </script>\n' \ ' <script type="text/javascript" src="${assets}/common.js"></script>\n' \ + ' <script type="text/javascript" src="${assets}/digest.js"></script>\n' \ ' <script type="text/javascript" src="${assets}/romident.js"></script>\n' \ ' <title>Identify ROM/Disk Dumps</title>\n' \ '</head>\n' \ @@ -189,6 +439,9 @@ ROMIDENT_PAGE = string.Template( '</div>\n' \ '<input id="input-dumps" type="file" multiple onchange="add_dump_files(this.files)" style="display: none">\n' \ '<div id="div-progress"></div>\n' \ + '<div id="div-issues"></div>\n' \ + '<div id="div-unmatched"></div>\n' \ '<div id="div-machines"></div>\n' \ + '<div id="div-software"></div>\n' \ '</body>\n' \ '</html>\n') diff --git a/docs/release/scripts/minimaws/lib/lxparse.py b/docs/release/scripts/minimaws/lib/lxparse.py index 96669ea99eb..46737ef438a 100644 --- a/docs/release/scripts/minimaws/lib/lxparse.py +++ b/docs/release/scripts/minimaws/lib/lxparse.py @@ -5,6 +5,8 @@ from . import dbaccess +import os +import os.path import subprocess import xml.sax import xml.sax.saxutils @@ -191,6 +193,9 @@ class MachineHandler(ElementHandler): self.romof = attrs.get('romof') self.dbcurs.add_sourcefile(self.sourcefile) + def endMainElement(self, name): + self.dbcurs.close() + def startChildElement(self, name, attrs): if name in self.CHILD_HANDLERS: self.setChildHandler(name, attrs, self.CHILD_HANDLERS[name](self)) @@ -206,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') @@ -238,9 +245,6 @@ class MachineHandler(ElementHandler): self.manufacturer = handler.text self.dbcurs.add_system(self.id, self.year, self.manufacturer) - def endMainElement(self, name): - self.dbcurs.close() - class ListXmlHandler(ElementHandler): def __init__(self, dbconn, **kwargs): @@ -259,12 +263,10 @@ class ListXmlHandler(ElementHandler): msg=('Expected "mame" element but found "%s"' % (name, )), exception=None, locator=self.locator) - self.dbconn.prepare_for_load() self.machines = 0 def endMainElement(self, name): - # TODO: build index by first letter or whatever - self.dbconn.finalise_load() + self.dbconn.commit() def startChildElement(self, name, attrs): if name != 'machine': @@ -286,11 +288,172 @@ class ListXmlHandler(ElementHandler): pass +class DataAreaHandler(ElementHandler): + def __init__(self, parent, **kwargs): + super(DataAreaHandler, self).__init__(parent=parent, **kwargs) + self.dbcurs = parent.dbcurs + self.part = parent.id + + def startChildElement(self, name, attrs): + if name == 'rom': + crc = attrs.get('crc') + sha1 = attrs.get('sha1') + if ('name' in attrs) and (crc is not None) and (sha1 is not None): + crc = int(crc, 16) + sha1 = sha1.lower() + self.dbcurs.add_rom(crc, sha1) + status = attrs.get('status', 'good') + self.dbcurs.add_softwareromdump(self.part, attrs['name'], crc, sha1, status != 'good') + self.setChildHandler(name, attrs, self.IGNORE) + + +class DiskAreaHandler(ElementHandler): + def __init__(self, parent, **kwargs): + super(DiskAreaHandler, self).__init__(parent=parent, **kwargs) + self.dbcurs = parent.dbcurs + self.part = parent.id + + def startChildElement(self, name, attrs): + if name == 'disk': + sha1 = attrs.get('sha1') + if sha1 is not None: + sha1 = sha1.lower() + self.dbcurs.add_disk(sha1) + status = attrs.get('status', 'good') + self.dbcurs.add_softwarediskdump(self.part, attrs['name'], sha1, status != 'good') + self.setChildHandler(name, attrs, self.IGNORE) + + +class SoftwarePartHandler(ElementHandler): + CHILD_HANDLERS = { + 'dataarea': DataAreaHandler, + 'diskarea': DiskAreaHandler } + + def __init__(self, parent, **kwargs): + super(SoftwarePartHandler, self).__init__(parent=parent, **kwargs) + self.dbcurs = parent.dbcurs + self.software = parent.id + + def startMainElement(self, name, attrs): + self.id = self.dbcurs.add_softwarepart(self.software, attrs['name'], attrs['interface']) + + def startChildElement(self, name, attrs): + if name in self.CHILD_HANDLERS: + self.setChildHandler(name, attrs, self.CHILD_HANDLERS[name](self)) + else: + if name == 'feature': + self.dbcurs.add_softwarepartfeaturetype(attrs['name']) + self.dbcurs.add_softwarepartfeature(self.id, attrs['name'], attrs['value']) + self.setChildHandler(name, attrs, self.IGNORE) + + +class SoftwareHandler(ElementHandler): + CHILD_HANDLERS = { + 'description': TextAccumulator, + 'year': TextAccumulator, + 'publisher': TextAccumulator, + 'part': SoftwarePartHandler } + + def __init__(self, parent, **kwargs): + super(SoftwareHandler, self).__init__(parent=parent, **kwargs) + self.dbcurs = self.dbconn.cursor() + self.softwarelist = parent.id + + def startMainElement(self, name, attrs): + self.shortname = attrs['name'] + self.cloneof = attrs.get('cloneof') + self.supported = 0 if (attrs.get('supported', 'yes') == 'yes') else 1 if (attrs.get('supported', 'yes') == 'partial') else 2 + + def endMainElement(self, name): + self.dbcurs.close() + + def startChildElement(self, name, attrs): + if name in self.CHILD_HANDLERS: + self.setChildHandler(name, attrs, self.CHILD_HANDLERS[name](self)) + else: + if name == 'info': + self.dbcurs.add_softwareinfotype(attrs['name']) + self.dbcurs.add_softwareinfo(self.id, attrs['name'], attrs['value']) + elif name == 'sharedfeat': + self.dbcurs.add_softwaresharedfeattype(attrs['name']) + self.dbcurs.add_softwaresharedfeat(self.id, attrs['name'], attrs['value']) + self.setChildHandler(name, attrs, self.IGNORE) + + def endChildHandler(self, name, handler): + if name == 'description': + self.description = handler.text + elif name == 'year': + self.year = handler.text + 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): + def __init__(self, dbconn, **kwargs): + super(SoftwareListHandler, self).__init__(parent=None, **kwargs) + self.dbconn = dbconn + + def startDocument(self): + pass + + def endDocument(self): + pass + + def startMainElement(self, name, attrs): + if name != 'softwarelist': + raise xml.sax.SAXParseException( + msg=('Expected "softwarelist" element but found "%s"' % (name, )), + exception=None, + locator=self.locator) + self.shortname = attrs['name'] + self.description = attrs['description'] + self.entries = 0 + dbcurs = self.dbconn.cursor() + self.id = dbcurs.add_softwarelist(self.shortname, self.description) + dbcurs.close() + + def endMainElement(self, name): + self.dbconn.commit() + + def startChildElement(self, name, attrs): + if name != 'software': + raise xml.sax.SAXParseException( + msg=('Expected "software" element but found "%s"' % (name, )), + exception=None, + locator=self.locator) + self.setChildHandler(name, attrs, SoftwareHandler(self)) + + def endChildHandler(self, name, handler): + if name == 'software': + if self.entries >= 1023: + self.dbconn.commit() + self.entries = 0 + else: + self.entries += 1 + + def processingInstruction(self, target, data): + pass + + def load_info(options): + dbconn = dbaccess.UpdateConnection(options.database) + dbconn.prepare_for_load() parser = xml.sax.make_parser() - parser.setContentHandler(ListXmlHandler(dbaccess.UpdateConnection(options.database))) + + 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) parser.parse(task.stdout) else: parser.parse(options.file) + + dbconn.finalise_load() diff --git a/docs/release/scripts/minimaws/lib/wsgiserve.py b/docs/release/scripts/minimaws/lib/wsgiserve.py index da9cbed0f36..e77bb3f637f 100644 --- a/docs/release/scripts/minimaws/lib/wsgiserve.py +++ b/docs/release/scripts/minimaws/lib/wsgiserve.py @@ -47,7 +47,7 @@ class HandlerBase(object): self.start_response = start_response def error_page(self, code): - yield htmltmpl.ERROR_PAGE.substitute(code=cgi.escape('%d' % code), message=cgi.escape(self.STATUS_MESSAGE[code])).encode('utf-8') + yield htmltmpl.ERROR_PAGE.substitute(code=cgi.escape('%d' % (code, )), message=cgi.escape(self.STATUS_MESSAGE[code])).encode('utf-8') class ErrorPageHandler(HandlerBase): @@ -103,6 +103,86 @@ class QueryPageHandler(HandlerBase): def sourcefile_href(self, sourcefile): return cgi.escape(urlparse.urljoin(self.application_uri, 'sourcefile/%s' % (urlquote(sourcefile), )), True) + def softwarelist_href(self, softwarelist): + return cgi.escape(urlparse.urljoin(self.application_uri, 'softwarelist/%s' % (urlquote(softwarelist), )), True) + + def software_href(self, softwarelist, software): + return cgi.escape(urlparse.urljoin(self.application_uri, 'softwarelist/%s/%s' % (urlquote(softwarelist), urlquote(software))), True) + + def bios_data(self, machine): + result = { } + for name, description, isdefault in self.dbcurs.get_biossets(machine): + result[name] = { 'description': description, 'isdefault': True if isdefault else False } + return result + + def flags_data(self, machine): + result = { 'features': { } } + for feature, status, overall in self.dbcurs.get_feature_flags(machine): + detail = { } + if status == 1: + detail['status'] = 'imperfect' + elif status > 1: + detail['status'] = 'unemulated' + if overall == 1: + detail['overall'] = 'imperfect' + elif overall > 1: + detail['overall'] = 'unemulated' + result['features'][feature] = detail + return result + + def slot_data(self, machine): + result = { 'defaults': { }, 'slots': { } } + + # get slot options + prev = None + for slot, option, shortname, description in self.dbcurs.get_slot_options(machine): + if slot != prev: + if slot in result['slots']: + options = result['slots'][slot] + else: + options = { } + result['slots'][slot] = options + prev = slot + options[option] = { 'device': shortname, 'description': description } + + # if there are any slots, get defaults + if result['slots']: + for slot, default in self.dbcurs.get_slot_defaults(machine): + result['defaults'][slot] = default + + # remove slots that come from default cards in other slots + for slot in tuple(result['slots'].keys()): + slot += ':' + for candidate in tuple(result['slots'].keys()): + if candidate.startswith(slot): + del result['slots'][candidate] + + return result + + def softwarelist_data(self, machine): + result = { } + + # get software lists referenced by machine + for softwarelist in self.dbcurs.get_machine_softwarelists(machine): + result[softwarelist['tag']] = { + 'status': softwarelist['status'], + 'shortname': softwarelist['shortname'], + 'description': softwarelist['description'], + 'total': softwarelist['total'], + 'supported': softwarelist['supported'], + 'partiallysupported': softwarelist['partiallysupported'], + 'unsupported': softwarelist['unsupported'] } + + # remove software lists that come from default cards in slots + if result: + for slot, default in self.dbcurs.get_slot_defaults(machine): + slot += ':' + for candidate in tuple(result.keys()): + if candidate.startswith(slot): + del result[candidate] + + return result + class MachineRpcHandlerBase(QueryPageHandler): def __init__(self, app, application_uri, environ, start_response, **kwargs): @@ -143,7 +223,7 @@ class MachineHandler(QueryPageHandler): self.start_response('404 %s' % (self.STATUS_MESSAGE[404], ), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) return self.error_page(404) else: - machine_info = self.dbcurs.get_machine_info(self.shortname).fetchone() + machine_info = self.dbcurs.get_machine_details(self.shortname).fetchone() if not machine_info: self.start_response('404 %s' % (self.STATUS_MESSAGE[404], ), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) return self.error_page(404) @@ -175,11 +255,11 @@ class MachineHandler(QueryPageHandler): parent = self.dbcurs.listfull(machine_info['cloneof']).fetchone() if parent: yield ( - ' <tr><th>Parent Machine:</th><td><a href="%s">%s (%s)</a></td></tr>\n' % + ' <tr><th>Parent machine:</th><td><a href="%s">%s (%s)</a></td></tr>\n' % (self.machine_href(machine_info['cloneof']), cgi.escape(parent[1]), cgi.escape(machine_info['cloneof']))).encode('utf-8') else: yield ( - ' <tr><th>Parent Machine:</th><td><a href="%s">%s</a></td></tr>\n' % + ' <tr><th>Parent machine:</th><td><a href="%s">%s</a></td></tr>\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() @@ -189,7 +269,7 @@ class MachineHandler(QueryPageHandler): (self.machine_href(machine_info['romof']), cgi.escape(parent[1]), cgi.escape(machine_info['romof']))).encode('utf-8') else: yield ( - ' <tr><th>Parent Machine:</th><td><a href="%s">%s</a></td></tr>\n' % + ' <tr><th>Parent machine:</th><td><a href="%s">%s</a></td></tr>\n' % (self.machine_href(machine_info['romof']), cgi.escape(machine_info['romof']))).encode('utf-8') unemulated = [] imperfect = [] @@ -209,6 +289,37 @@ class MachineHandler(QueryPageHandler): tuple(imperfect)).encode('utf-8'); yield '</table>\n'.encode('utf-8') + # make a table of clones + 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') + + # make a table of software lists + yield htmltmpl.MACHINE_SOFTWARELISTS_TABLE_PROLOGUE.substitute().encode('utf-8') + for softwarelist in self.dbcurs.get_machine_softwarelists(id): + total = softwarelist['total'] + yield htmltmpl.MACHINE_SOFTWARELISTS_TABLE_ROW.substitute( + rowid=cgi.escape(softwarelist['tag'].replace(':', '-'), True), + href=self.softwarelist_href(softwarelist['shortname']), + shortname=cgi.escape(softwarelist['shortname']), + description=cgi.escape(softwarelist['description']), + status=cgi.escape(softwarelist['status']), + total=cgi.escape('%d' % (total, )), + supported=cgi.escape('%.1f%%' % (softwarelist['supported'] * 100.0 / (total or 1), )), + partiallysupported=cgi.escape('%.1f%%' % (softwarelist['partiallysupported'] * 100.0 / (total or 1), )), + unsupported=cgi.escape('%.1f%%' % (softwarelist['unsupported'] * 100.0 / (total or 1), ))).encode('utf-8') + yield htmltmpl.MACHINE_SOFTWARELISTS_TABLE_EPILOGUE.substitute().encode('utf-8') + # allow system BIOS selection haveoptions = False for name, desc, isdef in self.dbcurs.get_biossets(id): @@ -244,8 +355,29 @@ class MachineHandler(QueryPageHandler): if not haveoptions: haveoptions = True yield htmltmpl.MACHINE_OPTIONS_HEADING.substitute().encode('utf-8') - yield htmltmpl.MACHINE_SLOTS_PLACEHOLDER.substitute( - machine=self.js_escape(self.shortname)).encode('utf=8') + yield htmltmpl.MACHINE_SLOTS_PLACEHOLDER_PROLOGUE.substitute().encode('utf=8') + pending = set((self.shortname, )) + added = set((self.shortname, )) + haveextra = set() + while pending: + requested = pending.pop() + slots = self.slot_data(self.dbcurs.get_machine_id(requested)) + yield (' slot_info[%s] = %s;\n' % (self.sanitised_json(requested), self.sanitised_json(slots))).encode('utf-8') + for slotname, slot in slots['slots'].items(): + for choice, card in slot.items(): + carddev = card['device'] + if carddev not in added: + pending.add(carddev) + added.add(carddev) + if (carddev not in haveextra) and (slots['defaults'].get(slotname) == choice): + haveextra.add(carddev) + cardid = self.dbcurs.get_machine_id(carddev) + carddev = self.sanitised_json(carddev) + yield ( + ' bios_sets[%s] = %s;\n machine_flags[%s] = %s;\n softwarelist_info[%s] = %s;\n' % + (carddev, self.sanitised_json(self.bios_data(cardid)), carddev, self.sanitised_json(self.flags_data(cardid)), carddev, self.sanitised_json(self.softwarelist_data(cardid)))).encode('utf-8') + yield htmltmpl.MACHINE_SLOTS_PLACEHOLDER_EPILOGUE.substitute( + machine=self.sanitised_json(self.shortname)).encode('utf=8') # list devices referenced by this system/device first = True @@ -312,6 +444,10 @@ class MachineHandler(QueryPageHandler): description=cgi.escape(description or ''), sourcefile=cgi.escape(sourcefile or '')).encode('utf-8') + @staticmethod + def sanitised_json(data): + return json.dumps(data).replace('<', '\\u003c').replace('>', '\\u003e') + class SourceFileHandler(QueryPageHandler): def __init__(self, app, application_uri, environ, start_response, **kwargs): @@ -365,8 +501,8 @@ class SourceFileHandler(QueryPageHandler): for filename, machines in self.dbcurs.get_sourcefiles(pattern): yield htmltmpl.SOURCEFILE_LIST_ROW.substitute( sourcefile=self.linked_title(filename, True), - machines=cgi.escape('%d' % machines)).encode('utf-8') - yield ' </tbody>\n</table>\n<script>make_table_sortable(document.getElementById("tbl-sourcefiles"));</script>\n</body>\n</html>\n'.encode('utf-8') + machines=cgi.escape('%d' % (machines, ))).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( @@ -395,7 +531,7 @@ class SourceFileHandler(QueryPageHandler): if first: yield '<p>No machines found.</p>\n'.encode('utf-8') else: - yield ' </tbody>\n</table>\n<script>make_table_sortable(document.getElementById("tbl-machines"));</script>\n'.encode('utf-8') + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-machines').encode('utf-8') yield '</body>\n</html>\n'.encode('utf-8') @@ -426,6 +562,184 @@ class SourceFileHandler(QueryPageHandler): parent=cgi.escape(machine_info['cloneof'] or '')).encode('utf-8') +class SoftwareListHandler(QueryPageHandler): + def __init__(self, app, application_uri, environ, start_response, **kwargs): + super(SoftwareListHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs) + self.shortname = wsgiref.util.shift_path_info(environ) + self.software = wsgiref.util.shift_path_info(environ) + + def __iter__(self): + if self.environ['PATH_INFO']: + self.start_response('404 %s' % (self.STATUS_MESSAGE[404], ), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) + return self.error_page(404) + elif self.software and ('*' not in self.software) and ('?' not in self.software): + software_info = self.dbcurs.get_software_details(self.shortname, self.software).fetchone() + if not software_info: + self.start_response('404 %s' % (self.STATUS_MESSAGE[404], ), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) + return self.error_page(404) + elif self.environ['REQUEST_METHOD'] != 'GET': + self.start_response('405 %s' % (self.STATUS_MESSAGE[405], ), [('Content-type', 'text/html; charset=utf-8'), ('Accept', 'GET, HEAD, OPTIONS'), ('Cache-Control', 'public, max-age=3600')]) + return self.error_page(405) + else: + self.start_response('200 OK', [('Content-type', 'text/html; chearset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) + return self.software_page(software_info) + elif self.software or (self.shortname and ('*' not in self.shortname) and ('?' not in self.shortname)): + softwarelist_info = self.dbcurs.get_softwarelist_details(self.shortname, self.software or None).fetchone() + if not softwarelist_info: + self.start_response('404 %s' % (self.STATUS_MESSAGE[404], ), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) + return self.error_page(404) + elif self.environ['REQUEST_METHOD'] != 'GET': + self.start_response('405 %s' % (self.STATUS_MESSAGE[405], ), [('Content-type', 'text/html; charset=utf-8'), ('Accept', 'GET, HEAD, OPTIONS'), ('Cache-Control', 'public, max-age=3600')]) + return self.error_page(405) + else: + self.start_response('200 OK', [('Content-type', 'text/html; chearset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) + return self.softwarelist_page(softwarelist_info, self.software or None) + else: + if self.environ['REQUEST_METHOD'] != 'GET': + self.start_response('405 %s' % (self.STATUS_MESSAGE[405], ), [('Content-type', 'text/html; charset=utf-8'), ('Accept', 'GET, HEAD, OPTIONS'), ('Cache-Control', 'public, max-age=3600')]) + return self.error_page(405) + else: + self.start_response('200 OK', [('Content-type', 'text/html; chearset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) + return self.softwarelist_listing_page(self.shortname or None) + + def softwarelist_listing_page(self, pattern): + if not pattern: + title = heading = 'All Software Lists' + else: + title = heading = 'Software Lists: ' + cgi.escape(pattern) + yield htmltmpl.SOFTWARELIST_LIST_PROLOGUE.substitute( + assets=cgi.escape(urlparse.urljoin(self.application_uri, 'static'), True), + title=title, + heading=heading).encode('utf-8') + for shortname, description, total, supported, partiallysupported, unsupported in self.dbcurs.get_softwarelists(pattern): + yield htmltmpl.SOFTWARELIST_LIST_ROW.substitute( + href=self.softwarelist_href(shortname), + shortname=cgi.escape(shortname), + description=cgi.escape(description), + total=cgi.escape('%d' % (total, )), + 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 htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-softwarelists').encode('utf-8') + + def softwarelist_page(self, softwarelist_info, pattern): + if not pattern: + title = 'Software List: %s (%s)' % (cgi.escape(softwarelist_info['description']), cgi.escape(softwarelist_info['shortname'])) + heading = cgi.escape(softwarelist_info['description']) + else: + title = 'Software List: %s (%s): %s' % (cgi.escape(softwarelist_info['description']), cgi.escape(softwarelist_info['shortname']), cgi.escape(pattern)) + heading = '<a href="%s">%s</a>: %s' % (self.softwarelist_href(softwarelist_info['shortname']), cgi.escape(softwarelist_info['description']), cgi.escape(pattern)) + yield htmltmpl.SOFTWARELIST_PROLOGUE.substitute( + assets=cgi.escape(urlparse.urljoin(self.application_uri, 'static'), True), + title=title, + heading=heading, + shortname=cgi.escape(softwarelist_info['shortname']), + total=cgi.escape('%d' % (softwarelist_info['total'], )), + supported=cgi.escape('%d' % (softwarelist_info['supported'], )), + supportedpc=cgi.escape('%.1f' % (softwarelist_info['supported'] * 100.0 / (softwarelist_info['total'] or 1), )), + partiallysupported=cgi.escape('%d' % (softwarelist_info['partiallysupported'], )), + partiallysupportedpc=cgi.escape('%.1f' % (softwarelist_info['partiallysupported'] * 100.0 / (softwarelist_info['total'] or 1), )), + 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 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') + 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 htmltmpl.SOFTWARELIST_SOFTWARE_TABLE_HEADER.substitute().encode('utf-8') + first = False + yield self.software_row(software_info) + if first: + yield '<p>No software found.</p>\n'.encode('utf-8') + else: + yield htmltmpl.SORTABLE_TABLE_EPILOGUE.substitute(id='tbl-software').encode('utf-8') + + yield '</body>\n</html>\n'.encode('utf-8') + + def software_page(self, software_info): + yield htmltmpl.SOFTWARE_PROLOGUE.substitute( + assets=cgi.escape(urlparse.urljoin(self.application_uri, 'static'), True), + title=cgi.escape(software_info['description']), + heading=cgi.escape(software_info['description']), + softwarelisthref=self.softwarelist_href(self.shortname), + softwarelistdescription=cgi.escape(software_info['softwarelistdescription']), + softwarelist=cgi.escape(self.shortname), + shortname=cgi.escape(software_info['shortname']), + year=cgi.escape(software_info['year']), + publisher=cgi.escape(software_info['publisher'])).encode('utf-8') + if software_info['parent'] is not None: + yield (' <tr><th>Parent:</th><td><a href="%s">%s</a></td>\n' % (self.software_href(software_info['parentsoftwarelist'], software_info['parent']), cgi.escape(software_info['parentdescription']))).encode('utf-8') + yield (' <tr><th>Supported:</th><td>%s</td>\n' % (self.format_supported(software_info['supported']), )).encode('utf-8') + for name, value in self.dbcurs.get_software_info(software_info['id']): + yield (' <tr><th>%s:</th><td>%s</td>\n' % (cgi.escape(name), cgi.escape(value))).encode('utf-8') + yield '</table>\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 '<h2>Parts</h2>\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), + interface=cgi.escape(interface)).encode('utf-8') + for name, value in self.dbcurs.get_softwarepart_features(id): + yield (' <tr><th>%s:</th><td>%s</td>\n' % (cgi.escape(name), cgi.escape(value))).encode('utf-8') + yield '</table>\n\n'.encode('utf-8') + + yield '</body>\n</html>\n'.encode('utf-8') + + def software_row(self, software_info): + 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=self.format_supported(software_info['supported']), + parts=cgi.escape('%d' % (software_info['parts'], )), + baddumps=cgi.escape('%d' % (software_info['baddumps'], )), + parent='<a href="%s">%s</a>' % (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') + + @staticmethod + def format_supported(supported): + return 'Yes' if supported == 0 else 'Partial' if supported == 1 else 'No' + + class RomIdentHandler(QueryPageHandler): def __init__(self, app, application_uri, environ, start_response, **kwargs): super(QueryPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs) @@ -458,47 +772,17 @@ class BiosRpcHandler(MachineRpcHandlerBase): class FlagsRpcHandler(MachineRpcHandlerBase): def data_page(self, machine): - result = { 'features': { } } - for feature, status, overall in self.dbcurs.get_feature_flags(machine): - detail = { } - if status == 1: - detail['status'] = 'imperfect' - elif status > 1: - detail['status'] = 'unemulated' - if overall == 1: - detail['overall'] = 'imperfect' - elif overall > 1: - detail['overall'] = 'unemulated' - result['features'][feature] = detail - yield json.dumps(result).encode('utf-8') + yield json.dumps(self.flags_data(machine)).encode('utf-8') class SlotsRpcHandler(MachineRpcHandlerBase): def data_page(self, machine): - result = { 'defaults': { }, 'slots': { } } + yield json.dumps(self.slot_data(machine)).encode('utf-8') - # get defaults and slot options - for slot, default in self.dbcurs.get_slot_defaults(machine): - result['defaults'][slot] = default - prev = None - for slot, option, shortname, description in self.dbcurs.get_slot_options(machine): - if slot != prev: - if slot in result['slots']: - options = result['slots'][slot] - else: - options = { } - result['slots'][slot] = options - prev = slot - options[option] = { 'device': shortname, 'description': description } - - # remove slots that come from default cards in other slots - for slot in tuple(result['slots'].keys()): - slot += ':' - for candidate in tuple(result['slots'].keys()): - if candidate.startswith(slot): - del result['slots'][candidate] - yield json.dumps(result).encode('utf-8') +class SoftwareListsRpcHandler(MachineRpcHandlerBase): + def data_page(self, machine): + yield json.dumps(self.softwarelist_data(machine)).encode('utf-8') class RomDumpsRpcHandler(QueryPageHandler): @@ -528,13 +812,33 @@ class RomDumpsRpcHandler(QueryPageHandler): return self.error_page(500) def data_page(self, crc, sha1): - result = { } + machines = { } for shortname, description, label, bad in self.dbcurs.get_rom_dumps(crc, sha1): - machine = result.get(shortname) + machine = machines.get(shortname) if machine is None: machine = { 'description': description, 'matches': [ ] } - result[shortname] = machine + machines[shortname] = machine machine['matches'].append({ 'name': label, 'bad': bool(bad) }) + + software = { } + for softwarelist, softwarelistdescription, shortname, description, part, part_id, label, bad in self.dbcurs.get_software_rom_dumps(crc, sha1): + listinfo = software.get(softwarelist) + if listinfo is None: + listinfo = { 'description': softwarelistdescription, 'software': { } } + software[softwarelist] = listinfo + softwareinfo = listinfo['software'].get(shortname) + if softwareinfo is None: + softwareinfo = { 'description': description, 'parts': { } } + listinfo['software'][shortname] = softwareinfo + partinfo = softwareinfo['parts'].get(part) + if partinfo is None: + partinfo = { 'matches': [ ] } + if part_id is not None: + partinfo['description'] = part_id + softwareinfo['parts'][part] = partinfo + partinfo['matches'].append({ 'name': label, 'bad': bool(bad) }) + + result = { 'machines': machines, 'software': software } yield json.dumps(result).encode('utf-8') @@ -563,24 +867,45 @@ class DiskDumpsRpcHandler(QueryPageHandler): return self.error_page(500) def data_page(self, sha1): - result = { } + machines = { } for shortname, description, label, bad in self.dbcurs.get_disk_dumps(sha1): - machine = result.get(shortname) + machine = machines.get(shortname) if machine is None: machine = { 'description': description, 'matches': [ ] } - result[shortname] = machine + machines[shortname] = machine machine['matches'].append({ 'name': label, 'bad': bool(bad) }) + + software = { } + for softwarelist, softwarelistdescription, shortname, description, part, part_id, label, bad in self.dbcurs.get_software_disk_dumps(sha1): + listinfo = software.get(softwarelist) + if listinfo is None: + listinfo = { 'description': softwarelistdescription, 'software': { } } + software[softwarelist] = listinfo + softwareinfo = listinfo['software'].get(shortname) + if softwareinfo is None: + softwareinfo = { 'description': description, 'parts': { } } + listinfo['software'][shortname] = softwareinfo + partinfo = softwareinfo['parts'].get(part) + if partinfo is None: + partinfo = { 'matches': [ ] } + if part_id is not None: + partinfo['description'] = part_id + softwareinfo['parts'][part] = partinfo + partinfo['matches'].append({ 'name': label, 'bad': bool(bad) }) + + result = { 'machines': machines, 'software': software } yield json.dumps(result).encode('utf-8') class MiniMawsApp(object): JS_ESCAPE = re.compile('([\"\'\\\\])') RPC_SERVICES = { - 'bios': BiosRpcHandler, - 'flags': FlagsRpcHandler, - 'slots': SlotsRpcHandler, - 'romdumps': RomDumpsRpcHandler, - 'diskdumps': DiskDumpsRpcHandler } + 'bios': BiosRpcHandler, + 'flags': FlagsRpcHandler, + 'slots': SlotsRpcHandler, + 'softwarelists': SoftwareListsRpcHandler, + 'romdumps': RomDumpsRpcHandler, + 'diskdumps': DiskDumpsRpcHandler } def __init__(self, dbfile, **kwargs): super(MiniMawsApp, self).__init__(**kwargs) @@ -598,6 +923,8 @@ class MiniMawsApp(object): return MachineHandler(self, application_uri, environ, start_response) elif module == 'sourcefile': return SourceFileHandler(self, application_uri, environ, start_response) + elif module == 'softwarelist': + return SoftwareListHandler(self, application_uri, environ, start_response) elif module == 'romident': return RomIdentHandler(self, application_uri, environ, start_response) elif module == 'static': |