mirror of
https://github.com/cmclark00/retro-imager.git
synced 2025-05-18 07:55:21 +01:00
qml: move OS list fetch to backend
- Simple implementation of OS list fetching in backend - Replace frontend OS list fetching by calls to backend - OS list updates are brought in asynchronously, avoiding excessive UI blockage. - "Erase" and "Custom" OS list options are always present, even in a no-internet scenario Based-On: cillian64/rpi-imager/oslist_backend
This commit is contained in:
Tom Dewey
Tom Dewey
parent
54ae0f889c
commit
673b3c7a33
4 changed files with 274 additions and 135 deletions
213
src/main.qml
213
src/main.qml
|
|
@ -1221,29 +1221,6 @@ ApplicationWindow {
|
|||
}
|
||||
}
|
||||
|
||||
/* Utility functions */
|
||||
function httpRequest(url, callback) {
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.timeout = 5000
|
||||
xhr.onreadystatechange = (function(x) {
|
||||
return function() {
|
||||
if (x.readyState === x.DONE)
|
||||
{
|
||||
if (x.status === 200)
|
||||
{
|
||||
callback(x)
|
||||
}
|
||||
else
|
||||
{
|
||||
onError(qsTr("Error downloading OS list from Internet"))
|
||||
}
|
||||
}
|
||||
}
|
||||
})(xhr)
|
||||
xhr.open("GET", url)
|
||||
xhr.send()
|
||||
}
|
||||
|
||||
/* Slots for signals imagewrite emits */
|
||||
function onDownloadProgress(now,total) {
|
||||
var newPos
|
||||
|
|
@ -1289,6 +1266,11 @@ ApplicationWindow {
|
|||
progressText.text = qsTr("Preparing to write... (%1)").arg(msg)
|
||||
}
|
||||
|
||||
function onOsListPrepared() {
|
||||
console.log("OS list updated.");
|
||||
fetchOSlist()
|
||||
}
|
||||
|
||||
function resetWriteButton() {
|
||||
progressText.visible = false
|
||||
progressBar.visible = false
|
||||
|
|
@ -1454,42 +1436,42 @@ ApplicationWindow {
|
|||
}
|
||||
|
||||
function oslistFromJson(o) {
|
||||
var oslist = false
|
||||
var oslist_parsed = false
|
||||
var lang_country = Qt.locale().name
|
||||
if ("os_list_"+lang_country in o) {
|
||||
oslist = o["os_list_"+lang_country]
|
||||
oslist_parsed = o["os_list_"+lang_country]
|
||||
}
|
||||
else if (lang_country.includes("_")) {
|
||||
var lang = lang_country.substr(0, lang_country.indexOf("_"))
|
||||
if ("os_list_"+lang in o) {
|
||||
oslist = o["os_list_"+lang]
|
||||
oslist_parsed = o["os_list_"+lang]
|
||||
}
|
||||
}
|
||||
|
||||
if (!oslist) {
|
||||
if (!oslist_parsed) {
|
||||
if (!"os_list" in o) {
|
||||
onError(qsTr("Error parsing os_list.json"))
|
||||
return false
|
||||
}
|
||||
|
||||
oslist = o["os_list"]
|
||||
oslist_parsed = o["os_list"]
|
||||
}
|
||||
|
||||
if (hwTags != "") {
|
||||
filterItems(oslist, JSON.parse(hwTags), hwTagMatchingType)
|
||||
filterItems(oslist_parsed, JSON.parse(hwTags), hwTagMatchingType)
|
||||
}
|
||||
checkForRandom(oslist)
|
||||
checkForRandom(oslist_parsed)
|
||||
|
||||
/* Flatten subitems to subitems_json */
|
||||
for (var i in oslist) {
|
||||
var entry = oslist[i];
|
||||
for (var i in oslist_parsed) {
|
||||
var entry = oslist_parsed[i];
|
||||
if ("subitems" in entry) {
|
||||
entry["subitems_json"] = JSON.stringify(entry["subitems"])
|
||||
delete entry["subitems"]
|
||||
}
|
||||
}
|
||||
|
||||
return oslist
|
||||
return oslist_parsed
|
||||
}
|
||||
|
||||
function selectNamedOS(name, collection)
|
||||
|
|
@ -1508,80 +1490,54 @@ ApplicationWindow {
|
|||
}
|
||||
|
||||
function fetchOSlist() {
|
||||
httpRequest(imageWriter.constantOsListUrl(), function (x) {
|
||||
var o = JSON.parse(x.responseText)
|
||||
var oslist = oslistFromJson(o)
|
||||
if (oslist === false)
|
||||
return
|
||||
osmodel.clear()
|
||||
for (var i in oslist) {
|
||||
osmodel.append(oslist[i])
|
||||
}
|
||||
var oslist_json = imageWriter.getFilteredOSlist();
|
||||
var o = JSON.parse(oslist_json)
|
||||
var oslist_parsed = oslistFromJson(o)
|
||||
if (oslist_parsed === false)
|
||||
return
|
||||
osmodel.clear()
|
||||
for (var i in oslist_parsed) {
|
||||
osmodel.append(oslist_parsed[i])
|
||||
}
|
||||
|
||||
if ("imager" in o) {
|
||||
var imager = o["imager"]
|
||||
if ("imager" in o) {
|
||||
var imager = o["imager"]
|
||||
|
||||
if ("devices" in imager)
|
||||
if ("devices" in imager)
|
||||
{
|
||||
deviceModel.clear()
|
||||
var devices = imager["devices"]
|
||||
for (var j in devices)
|
||||
{
|
||||
deviceModel.clear()
|
||||
var devices = imager["devices"]
|
||||
for (var j in devices)
|
||||
devices[j]["tags"] = JSON.stringify(devices[j]["tags"])
|
||||
deviceModel.append(devices[j])
|
||||
if ("default" in devices[j] && devices[j]["default"])
|
||||
{
|
||||
devices[j]["tags"] = JSON.stringify(devices[j]["tags"])
|
||||
deviceModel.append(devices[j])
|
||||
if ("default" in devices[j] && devices[j]["default"])
|
||||
{
|
||||
hwlist.currentIndex = deviceModel.count-1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (imageWriter.getBoolSetting("check_version") && "latest_version" in imager && "url" in imager) {
|
||||
if (!imageWriter.isEmbeddedMode() && imageWriter.isVersionNewer(imager["latest_version"])) {
|
||||
updatepopup.url = imager["url"]
|
||||
updatepopup.openPopup()
|
||||
}
|
||||
}
|
||||
if ("default_os" in imager) {
|
||||
selectNamedOS(imager["default_os"], osmodel)
|
||||
}
|
||||
if (imageWriter.isEmbeddedMode()) {
|
||||
if ("embedded_default_os" in imager) {
|
||||
selectNamedOS(imager["embedded_default_os"], osmodel)
|
||||
}
|
||||
if ("embedded_default_destination" in imager) {
|
||||
imageWriter.startDriveListPolling()
|
||||
setDefaultDest.drive = imager["embedded_default_destination"]
|
||||
setDefaultDest.start()
|
||||
hwlist.currentIndex = deviceModel.count-1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Add in our 'special' items. */
|
||||
osmodel.append({
|
||||
url: "internal://format",
|
||||
icon: "icons/erase.png",
|
||||
extract_size: 0,
|
||||
image_download_size: 0,
|
||||
extract_sha256: "",
|
||||
contains_multiple_files: false,
|
||||
release_date: "",
|
||||
subitems_url: "",
|
||||
subitems_json: "",
|
||||
name: qsTr("Erase"),
|
||||
description: qsTr("Format card as FAT32"),
|
||||
tooltip: "",
|
||||
website: "",
|
||||
init_format: ""
|
||||
})
|
||||
|
||||
osmodel.append({
|
||||
url: "",
|
||||
icon: "icons/use_custom.png",
|
||||
name: qsTr("Use custom"),
|
||||
description: qsTr("Select a custom .img from your computer")
|
||||
})
|
||||
})
|
||||
if (imageWriter.getBoolSetting("check_version") && "latest_version" in imager && "url" in imager) {
|
||||
if (!imageWriter.isEmbeddedMode() && imageWriter.isVersionNewer(imager["latest_version"])) {
|
||||
updatepopup.url = imager["url"]
|
||||
updatepopup.openPopup()
|
||||
}
|
||||
}
|
||||
if ("default_os" in imager) {
|
||||
selectNamedOS(imager["default_os"], osmodel)
|
||||
}
|
||||
if (imageWriter.isEmbeddedMode()) {
|
||||
if ("embedded_default_os" in imager) {
|
||||
selectNamedOS(imager["embedded_default_os"], osmodel)
|
||||
}
|
||||
if ("embedded_default_destination" in imager) {
|
||||
imageWriter.startDriveListPolling()
|
||||
setDefaultDest.drive = imager["embedded_default_destination"]
|
||||
setDefaultDest.start()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
|
|
@ -1648,30 +1604,29 @@ ApplicationWindow {
|
|||
}
|
||||
|
||||
/* Reload list */
|
||||
httpRequest(imageWriter.constantOsListUrl(), function (x) {
|
||||
var o = JSON.parse(x.responseText)
|
||||
var oslist = oslistFromJson(o)
|
||||
if (oslist === false)
|
||||
return
|
||||
var oslist_json = imageWriter.getFilteredOSlist();
|
||||
var o = JSON.parse(oslist_json)
|
||||
var oslist_parsed = oslistFromJson(o)
|
||||
if (oslist_parsed === false)
|
||||
return
|
||||
|
||||
/* As we're filtering the OS list, we need to ensure we present a 'Recommended' OS.
|
||||
* To do this, we exploit a convention of how we build the OS list. By convention,
|
||||
* the preferred OS for a device is listed at the top level of the list, and is at the
|
||||
* lowest index. So..
|
||||
*/
|
||||
if (oslist.length != 0) {
|
||||
var candidate = oslist[0]
|
||||
/* As we're filtering the OS list, we need to ensure we present a 'Recommended' OS.
|
||||
* To do this, we exploit a convention of how we build the OS list. By convention,
|
||||
* the preferred OS for a device is listed at the top level of the list, and is at the
|
||||
* lowest index. So..
|
||||
*/
|
||||
if (oslist_parsed.length != 0) {
|
||||
var candidate = oslist_parsed[0]
|
||||
|
||||
if ("description" in candidate && !("subitems" in candidate)) {
|
||||
candidate["description"] += " (Recommended)"
|
||||
}
|
||||
if ("description" in candidate && !("subitems" in candidate)) {
|
||||
candidate["description"] += " (Recommended)"
|
||||
}
|
||||
}
|
||||
|
||||
osmodel.remove(0, osmodel.count-2)
|
||||
for (var i in oslist) {
|
||||
osmodel.insert(osmodel.count-2, oslist[i])
|
||||
}
|
||||
})
|
||||
osmodel.clear()
|
||||
for (var i in oslist_parsed) {
|
||||
osmodel.append(oslist_parsed[i])
|
||||
}
|
||||
|
||||
// When the HW device is changed, reset the OS selection otherwise
|
||||
// you get a weird effect with the selection moving around in the list
|
||||
|
|
@ -1732,19 +1687,7 @@ ApplicationWindow {
|
|||
}
|
||||
else
|
||||
{
|
||||
ospopup.categorySelected = d.name
|
||||
var suburl = d.subitems_url
|
||||
var m = newSublist()
|
||||
|
||||
httpRequest(suburl, function (x) {
|
||||
var o = JSON.parse(x.responseText)
|
||||
var oslist = oslistFromJson(o)
|
||||
if (oslist === false)
|
||||
return
|
||||
for (var i in oslist) {
|
||||
m.append(oslist[i])
|
||||
}
|
||||
})
|
||||
console.log("Failure: Backend should have pre-flattened the JSON!");
|
||||
|
||||
osswipeview.itemAt(osswipeview.currentIndex+1).currentIndex = (selectFirstSubitem === true) ? 0 : -1
|
||||
osswipeview.incrementCurrentIndex()
|
||||
|
|
@ -1757,9 +1700,9 @@ ApplicationWindow {
|
|||
if (imageWriter.mountUsbSourceMedia()) {
|
||||
var m = newSublist()
|
||||
|
||||
var oslist = JSON.parse(imageWriter.getUsbSourceOSlist())
|
||||
for (var i in oslist) {
|
||||
m.append(oslist[i])
|
||||
var usboslist = JSON.parse(imageWriter.getUsbSourceOSlist())
|
||||
for (var i in usboslist) {
|
||||
m.append(usboslist[i])
|
||||
}
|
||||
osswipeview.itemAt(osswipeview.currentIndex+1).currentIndex = (selectFirstSubitem === true) ? 0 : -1
|
||||
osswipeview.incrementCurrentIndex()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue