Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-25 17:25:14 +03:00
Code Wiki Activity

Properly parse filenames with versions with suffixes

Browse source 
e.g. 2.0.0-rc1 is parsed was parsed with "-rc1 " as part of the
target name.
This commit is contained in:
Alberto García Hierro 2018-06-26 23:46:06 +01:00
parent 92bf16454e
commit 71990d9e79
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
tabs/firmware_flasher.js
View file

@ -44,6 +44,20 @@ TABS.firmware_flasher.initialize = function (callback) {
worker.postMessage(str); worker.postMessage(str);
} }
function parseFilename(filename) {
//var targetFromFilenameExpression = /inav_([\d.]+)?_?([^.]+)\.(.*)/;
var targetFromFilenameExpression = /inav_([\d.]+(?:-rc\d+)?)?_?([^.]+)\.(.*)/;
var match = targetFromFilenameExpression.exec(filename);
if (!match) {
return null;
}
return {
target: match[2].replace("_", " "),
format: match[3],
};
}
$('input.show_development_releases').click(function(){ $('input.show_development_releases').click(function(){
buildBoardOptions(); buildBoardOptions();
@ -63,15 +77,13 @@ TABS.firmware_flasher.initialize = function (callback) {
var unsortedTargets = []; var unsortedTargets = [];
TABS.firmware_flasher.releasesData.forEach(function(release){ TABS.firmware_flasher.releasesData.forEach(function(release){
release.assets.forEach(function(asset){ release.assets.forEach(function(asset){
var targetFromFilenameExpression = /inav_([\d.]+)?_?([^.]+)\.(.*)/; var result = parseFilename(asset.name);
var match = targetFromFilenameExpression.exec(asset.name);
if ((!showDevReleases && release.prerelease) || !match) { if ((!showDevReleases && release.prerelease) || !result) {
return; return;
} }
var target = match[2].replace("_", " "); if($.inArray(result.target, unsortedTargets) == -1) {
if($.inArray(target, unsortedTargets) == -1) { unsortedTargets.push(result.target);
unsortedTargets.push(target);
} }
}); });
sortedTargets = unsortedTargets.sort(); sortedTargets = unsortedTargets.sort();
@ -87,17 +99,12 @@ TABS.firmware_flasher.initialize = function (callback) {
var version = matchVersionFromTag[1]; var version = matchVersionFromTag[1];
release.assets.forEach(function(asset){ release.assets.forEach(function(asset){
var targetFromFilenameExpression = /inav_([\d.]+)?_?([^.]+)\.(.*)/; var result = parseFilename(asset.name);
var match = targetFromFilenameExpression.exec(asset.name); if ((!showDevReleases && release.prerelease) || !result) {
if ((!showDevReleases && release.prerelease) || !match) {
return; return;
} }
var target = match[2].replace("_", " "); if (result.format != 'hex') {
var format = match[3];
if (format != 'hex') {
return; return;
} }
@ -116,12 +123,12 @@ TABS.firmware_flasher.initialize = function (callback) {
"version" : release.tag_name, "version" : release.tag_name,
"url" : asset.browser_download_url, "url" : asset.browser_download_url,
"file" : asset.name, "file" : asset.name,
"target" : target, "target" : result.target,
"date" : formattedDate, "date" : formattedDate,
"notes" : release.body, "notes" : release.body,
"status" : release.prerelease ? "release-candidate" : "stable" "status" : release.prerelease ? "release-candidate" : "stable"
}; };
releases[target].push(descriptor); releases[result.target].push(descriptor);
}); });
}); });
var selectTargets = []; var selectTargets = [];