Resolved eslint issues.
This commit is contained in:
chris062689
parent
1ed3279538
commit
9db3e8547d
1 changed files with 137 additions and 133 deletions
136
app.js
136
app.js
|
|
@ -3,7 +3,7 @@ const fs = require('fs-extra');
|
|||
const exec = require('execa');
|
||||
const sha1 = require('sha1-file');
|
||||
const req = require('request-promise');
|
||||
const zip_bin = require('7zip-bin').path7za;
|
||||
const zipBin = require('7zip-bin').path7za;
|
||||
|
||||
const logger = require('winston');
|
||||
logger.exitOnError = false;
|
||||
|
|
@ -12,78 +12,78 @@ logger.add(logger.transports.File, { filename: '/var/log/citra-qt-installer/citr
|
|||
const tempDir = './temp';
|
||||
const distDir = '/citra/nginx/repo';
|
||||
|
||||
async function getReleases(repo) {
|
||||
async function getReleases (repo) {
|
||||
const result = await req({
|
||||
uri: `https://api.github.com/repos/${repo}/releases`,
|
||||
headers: {
|
||||
"Accept": "application/vnd.github.v3+json",
|
||||
"User-Agent": "Citra Installer - Repo (j-selby)"
|
||||
'Accept': 'application/vnd.github.v3+json',
|
||||
'User-Agent': 'Citra Installer - Repo (j-selby)'
|
||||
}
|
||||
});
|
||||
return JSON.parse(result);
|
||||
}
|
||||
|
||||
function getTopResultFor(jsonData, platform) {
|
||||
function getTopResultFor (jsonData, platform) {
|
||||
for (let releaseKey in jsonData) {
|
||||
const release = jsonData[releaseKey];
|
||||
for (let assetKey in release.assets) {
|
||||
const asset = release.assets[assetKey];
|
||||
if (asset.name.indexOf(platform) !== -1 && asset.name.endsWith(".7z")) {
|
||||
if (asset.name.indexOf(platform) !== -1 && asset.name.endsWith('.7z')) {
|
||||
return {
|
||||
"release_id": release.tag_name.split("-")[1],
|
||||
"published_at": release.published_at.substr(0, 10),
|
||||
"name": asset.name,
|
||||
"size": asset.size,
|
||||
"hash": release.tag_name
|
||||
}
|
||||
'release_id': release.tag_name.split('-')[1],
|
||||
'published_at': release.published_at.substr(0, 10),
|
||||
'name': asset.name,
|
||||
'size': asset.size,
|
||||
'hash': release.tag_name
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return {"notFound": true};
|
||||
return {'notFound': true};
|
||||
}
|
||||
|
||||
// The Qt Installer Framework is a pain to build or download.
|
||||
// Because all we need are a few 7-zipped + xml files, we might as well generate them for ourselves.
|
||||
let targets = [
|
||||
{
|
||||
"Name": "org.citra.nightly.%platform%",
|
||||
"DisplayName": "Citra Nightly",
|
||||
"Description": "The nightly builds of Citra are official, tested versions of Citra that are known to work.\n" +
|
||||
"(%platform%, commit: %commithash%, release date: %releasedate%)",
|
||||
"Repo": "citra-emu/citra-nightly",
|
||||
"ScriptName": "nightly",
|
||||
"Default": "script",
|
||||
"Licenses": [
|
||||
{"License": [{ _attr: { file: 'license.txt', name: "GNU General Public License v2.0" }}]}
|
||||
],
|
||||
'Name': 'org.citra.nightly.%platform%',
|
||||
'DisplayName': 'Citra Nightly',
|
||||
'Description': 'The nightly builds of Citra are official, tested versions of Citra that are known to work.\n' +
|
||||
'(%platform%, commit: %commithash%, release date: %releasedate%)',
|
||||
'Repo': 'citra-emu/citra-nightly',
|
||||
'ScriptName': 'nightly',
|
||||
'Default': 'script',
|
||||
'Licenses': [
|
||||
{'License': [{_attr: { file: 'license.txt', name: 'GNU General Public License v2.0' }}]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "org.citra.canary.%platform%",
|
||||
"DisplayName": "Citra Canary",
|
||||
"Description": "An in-development version of Citra that uses changes that are relatively untested.\n" +
|
||||
"(%platform%, commit: %commithash%, release date: %releasedate%)",
|
||||
"Repo": "citra-emu/citra-canary",
|
||||
"ScriptName": "canary",
|
||||
"Default": "script",
|
||||
"Licenses": [
|
||||
{"License": [{ _attr: { file: 'license.txt', name: "GNU General Public License v2.0" }}]}
|
||||
],
|
||||
'Name': 'org.citra.canary.%platform%',
|
||||
'DisplayName': 'Citra Canary',
|
||||
'Description': 'An in-development version of Citra that uses changes that are relatively untested.\n' +
|
||||
'(%platform%, commit: %commithash%, release date: %releasedate%)',
|
||||
'Repo': 'citra-emu/citra-canary',
|
||||
'ScriptName': 'canary',
|
||||
'Default': 'script',
|
||||
'Licenses': [
|
||||
{'License': [{_attr: { file: 'license.txt', name: 'GNU General Public License v2.0' }}]}
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
async function execute() {
|
||||
async function execute () {
|
||||
// Clean up any temporary directories.
|
||||
fs.emptyDirSync(tempDir);
|
||||
|
||||
// Get Git information
|
||||
logger.debug("Getting release info...");
|
||||
for (result_key in targets) {
|
||||
const target = targets[result_key];
|
||||
logger.debug('Getting release info...');
|
||||
for (var resultKey in targets) {
|
||||
const target = targets[resultKey];
|
||||
target.Repo = await getReleases(target.Repo);
|
||||
}
|
||||
|
||||
logger.debug("Building metadata...");
|
||||
logger.debug('Building metadata...');
|
||||
|
||||
// If updates available is still false at the end of the foreach loop
|
||||
// then that means no releases have been made -- nothing to do.
|
||||
|
|
@ -91,24 +91,24 @@ async function execute() {
|
|||
|
||||
// Updates.xml
|
||||
let updates = [
|
||||
{"ApplicationName": "{AnyApplication}"},
|
||||
{"ApplicationVersion": "1.0.0"}, // Separate from nightly / canary versions
|
||||
{"Checksum": false} // As they are pulled straight from Github
|
||||
{'ApplicationName': '{AnyApplication}'},
|
||||
{'ApplicationVersion': '1.0.0'}, // Separate from nightly / canary versions
|
||||
{'Checksum': false} // As they are pulled straight from Github
|
||||
];
|
||||
|
||||
["msvc", "osx", "linux"].forEach((platform) => {
|
||||
targets.forEach((target_source) => {
|
||||
['msvc', 'osx', 'linux'].forEach((platform) => {
|
||||
targets.forEach((targetSource) => {
|
||||
// Get Git metadata
|
||||
const release_data = getTopResultFor(target_source.Repo, platform);
|
||||
const name = target_source.Name.replace("%platform%", platform);
|
||||
const releaseData = getTopResultFor(targetSource.Repo, platform);
|
||||
const name = targetSource.Name.replace('%platform%', platform);
|
||||
|
||||
if (release_data.notFound === true) {
|
||||
if (releaseData.notFound === true) {
|
||||
logger.error(`Release information not found for ${name}!`);
|
||||
return;
|
||||
}
|
||||
|
||||
const scriptName = platform + "-" + target_source.ScriptName;
|
||||
const version = release_data.release_id;
|
||||
const scriptName = platform + '-' + targetSource.ScriptName;
|
||||
const version = releaseData.release_id;
|
||||
|
||||
const targetMetadataFilePath = `${distDir}/${name}/${version}meta.7z`;
|
||||
if (fs.existsSync(targetMetadataFilePath)) {
|
||||
|
|
@ -122,11 +122,11 @@ async function execute() {
|
|||
fs.ensureDirSync(workingDirectoryPath);
|
||||
|
||||
// Copy license
|
||||
fs.copySync("license.txt", `${workingDirectoryPath}/license.txt`);
|
||||
fs.copySync('license.txt', `${workingDirectoryPath}/license.txt`);
|
||||
fs.copySync(`scripts/${scriptName}.qs`, `${workingDirectoryPath}/installscript.qs`);
|
||||
|
||||
// Create 7zip archive
|
||||
exec.sync(zip_bin, ["a", "meta.7z", name], {"cwd": tempDir});
|
||||
exec.sync(zipBin, ['a', 'meta.7z', name], {'cwd': tempDir});
|
||||
|
||||
// Copy the metadata file into the target path.
|
||||
logger.debug(`Creating target metadata for ${name} at ${targetMetadataFilePath}`);
|
||||
|
|
@ -140,32 +140,36 @@ async function execute() {
|
|||
var metaHash = sha1(targetMetadataFilePath);
|
||||
|
||||
let target = [];
|
||||
target.push({"Name": name});
|
||||
target.push({"DisplayName": target_source.DisplayName.replace("%platform%", platform)});
|
||||
target.push({"Version": version});
|
||||
target.push({"DownloadableArchives": release_data.name});
|
||||
target.push({'Name': name});
|
||||
target.push({'DisplayName': targetSource.DisplayName.replace('%platform%', platform)});
|
||||
target.push({'Version': version});
|
||||
target.push({'DownloadableArchives': releaseData.name});
|
||||
|
||||
// Because we cannot compute the uncompressed size ourselves, just give a generous estimate
|
||||
// (to make sure they have enough disk space).
|
||||
// OS flag is useless - i.e the installer stubs it :P
|
||||
target.push({"UpdateFile": [{_attr: {UncompressedSize: release_data.size * 2,
|
||||
CompressedSize: release_data.size, OS: "Any"}}]});
|
||||
target.push({'UpdateFile': [{_attr: {
|
||||
UncompressedSize: releaseData.size * 2,
|
||||
CompressedSize: releaseData.size,
|
||||
OS: 'Any'}
|
||||
}]});
|
||||
|
||||
target.push({"ReleaseDate": release_data.published_at});
|
||||
target.push({"Description": target_source.Description.replace("%platform%", platform)
|
||||
.replace("%commithash%", release_data.hash)
|
||||
.replace("%releasedate%", release_data.published_at)});
|
||||
target.push({"Default": target_source.Default});
|
||||
target.push({"Licenses": target_source.Licenses});
|
||||
target.push({"Script": "installscript.qs"});
|
||||
target.push({"SHA": metaHash});
|
||||
target.push({'ReleaseDate': releaseData.published_at});
|
||||
target.push({'Description': targetSource.Description
|
||||
.replace('%platform%', platform)
|
||||
.replace('%commithash%', releaseData.hash)
|
||||
.replace('%releasedate%', releaseData.published_at)});
|
||||
target.push({'Default': targetSource.Default});
|
||||
target.push({'Licenses': targetSource.Licenses});
|
||||
target.push({'Script': 'installscript.qs'});
|
||||
target.push({'SHA': metaHash});
|
||||
|
||||
updates.push({"PackageUpdate": target});
|
||||
updates.push({'PackageUpdate': target});
|
||||
});
|
||||
});
|
||||
|
||||
if (updatesAvailable) {
|
||||
const updatesXml = xml({"Updates": updates}, {indent: " "});
|
||||
const updatesXml = xml({'Updates': updates}, {indent: ' '});
|
||||
|
||||
// Save Updates.xml
|
||||
fs.writeFileSync(`${distDir}/Updates.xml`, updatesXml);
|
||||
|
|
|
|||
Loading…
Reference in a new issue