jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-06-20 11:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sketch name duplicates (#887)

Browse Source
This commit is contained in:
Alberto Iannaccone 2022-03-07 16:34:16 +00:00 committed by GitHub
parent c9996df11c
commit 04c3d0c1d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
arduino-ide-extension/src/node/sketches-service-impl.ts
View File

@ -30,10 +30,11 @@ const WIN32_DRIVE_REGEXP = /^[a-zA-Z]:\\/;
const prefix = '.arduinoIDE-unsaved'; const prefix = '.arduinoIDE-unsaved';
@injectable() @injectable()
export class SketchesServiceImpl export class SketchesServiceImpl extends CoreClientAware
extends CoreClientAware implements SketchesService {
implements SketchesService private sketchSuffixIndex = 1;
{ private lastSketchBaseName: string;
@inject(ConfigService) @inject(ConfigService)
protected readonly configService: ConfigService; protected readonly configService: ConfigService;
@ -303,22 +304,31 @@ export class SketchesServiceImpl
monthNames[today.getMonth()] monthNames[today.getMonth()]
}${today.getDate()}`; }${today.getDate()}`;
const config = await this.configService.getConfiguration(); const config = await this.configService.getConfiguration();
const user = FileUri.fsPath(config.sketchDirUri); const sketchbookPath = FileUri.fsPath(config.sketchDirUri);
let sketchName: string | undefined; let sketchName: string | undefined;
for (let i = 97; i < 97 + 26; i++) {
const sketchNameCandidate = `${sketchBaseName}${String.fromCharCode(i)}`;
// Note: we check the future destination folder (`directories.user`) for name collision and not the temp folder!
if (await promisify(fs.exists)(path.join(user, sketchNameCandidate))) {
continue;
}
// If it's another day, reset the count of sketches created today
if (this.lastSketchBaseName !== sketchBaseName) this.sketchSuffixIndex = 1;
let nameFound = false;
while (!nameFound) {
const sketchNameCandidate = `${sketchBaseName}${sketchIndexToLetters(
this.sketchSuffixIndex++
)}`;
// Note: we check the future destination folder (`directories.user`) for name collision and not the temp folder!
const sketchExists = await promisify(fs.exists)(
path.join(sketchbookPath, sketchNameCandidate)
);
if (!sketchExists) {
nameFound = true;
sketchName = sketchNameCandidate; sketchName = sketchNameCandidate;
break; }
} }
if (!sketchName) { if (!sketchName) {
throw new Error('Cannot create a unique sketch name'); throw new Error('Cannot create a unique sketch name');
} }
this.lastSketchBaseName = sketchBaseName;
const sketchDir = path.join(parentPath, sketchName); const sketchDir = path.join(parentPath, sketchName);
const sketchFile = path.join(sketchDir, `${sketchName}.ino`); const sketchFile = path.join(sketchDir, `${sketchName}.ino`);
@ -507,3 +517,23 @@ interface SketchContainerWithDetails extends SketchContainer {
readonly children: SketchContainerWithDetails[]; readonly children: SketchContainerWithDetails[];
readonly sketches: SketchWithDetails[]; readonly sketches: SketchWithDetails[];
} }
/*
* When a new sketch is created, add a suffix to distinguish it
* from other new sketches I created today.
* If 'sketch_jul8a' is already used, go with 'sketch_jul8b'.
* If 'sketch_jul8b' already used, go with 'sketch_jul8c'.
* When it reacheas 'sketch_jul8z', go with 'sketch_jul8aa',
* and so on.
*/
function sketchIndexToLetters(num: number): string {
let out = '';
let pow;
do {
pow = Math.floor(num / 26);
const mod = num % 26;
out = (mod ? String.fromCharCode(96 + mod) : (--pow, 'z')) + out;
num = pow;
} while (pow > 0);
return out;
}