Skip to content

Commit

Permalink
feat: config to disable auto select source
Browse files Browse the repository at this point in the history
  • Loading branch information
CKylinMC committed Jul 16, 2023
1 parent 6e32da1 commit fa68ee4
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cmand",
"version": "0.7.2",
"version": "0.7.3",
"author": "CKylinMC",
"description": "A simple command-line tool for Windows managing your small scripts.",
"main": "build/main/index.js",
Expand Down
33 changes: 18 additions & 15 deletions src/actions/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -412,26 +412,29 @@ async function determineSource(sources, verbose = false, spinner = null) {
}
}
const fastest = {
source: "github",
source: await Settings.get('source', "github"),
time:Infinity
}
for (const sourceName in sources) {
const sourceUrl = getHostname(sources[sourceName]);
if(verbose)spinner.text(`Testing source ${sourceName}...`);
const result = await ping.promise.probe(sourceUrl, {
timeout: 2
});
if (result.alive&&_pingTimeIsValid(result.time)) {
if(verbose)spinner.log(`${sourceName} => ${result.time} ms`);
if(result.time < fastest.time){
fastest.source = sourceName;
fastest.time = result.time;
const autoCheck = await Settings.get('auto_select_source', true);
if (!!autoCheck) {
for (const sourceName in sources) {
const sourceUrl = getHostname(sources[sourceName]);
if (verbose) spinner.text(`Testing source ${sourceName}...`);
const result = await ping.promise.probe(sourceUrl, {
timeout: 2
});
if (result.alive && _pingTimeIsValid(result.time)) {
if (verbose) spinner.log(`${sourceName} => ${result.time} ms`);
if (result.time < fastest.time) {
fastest.source = sourceName;
fastest.time = result.time;
}
} else {
if (verbose) spinner.log(`Source ${sourceName} is not reachable.`);
}
} else {
if(verbose)spinner.log(`Source ${sourceName} is not reachable.`);
}
if(verbose)spinner.success(`Fastest source is ${fastest.source} with ${fastest.time}ms.`);
}
if(verbose)spinner.success(`Fastest source is ${fastest.source} with ${fastest.time}ms.`);
if (verbose) await new Promise(r => setTimeout(r, 10));
return fastest.source;
}
Expand Down
2 changes: 1 addition & 1 deletion src/info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import homedir from 'homedir';

export const Info = {
name: 'cmand',
version: '0.7.2',
version: '0.7.3',
description: 'A command line tool for managing your script snippets on Windows.',
author: 'CKylinMC',
}
Expand Down
1 change: 1 addition & 0 deletions src/lib/Db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ export class Settings{
await Settings.set('cfproxy', '', true);
await Settings.set('proxy', '', true);
await Settings.set('update_url', CONSTS.UPDATE_URL, true);
await Settings.set('auto_select_source', true, true);
}
}

Expand Down

0 comments on commit fa68ee4

Please sign in to comment.