rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: let system figure slashes for paths

Browse Source
This commit is contained in:
Aman Harwara
2023-05-24 21:32:07 +05:30
parent 4ef8992d43
commit 502289aa50
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/desktop/app/javascripts/Main/FileBackups/FileBackupsManager.ts
View File

@@ -74,7 +74,7 @@ export class FilesBackupManager implements FileBackupsDevice {
await ensureDirectoryExists(newLocation) await ensureDirectoryExists(newLocation)
const legacyMappingLocation = `${legacyLocation}/info.json` const legacyMappingLocation = path.join(legacyLocation, 'info.json')
const newMappingLocation = this.getFileBackupsMappingFilePath(newLocation) const newMappingLocation = this.getFileBackupsMappingFilePath(newLocation)
await ensureDirectoryExists(path.dirname(newMappingLocation)) await ensureDirectoryExists(path.dirname(newMappingLocation))
if (existsSync(legacyMappingLocation)) { if (existsSync(legacyMappingLocation)) {
@@ -108,7 +108,7 @@ export class FilesBackupManager implements FileBackupsDevice {
} }
const LegacyTextBackupsDirectory = 'Standard Notes Backups' const LegacyTextBackupsDirectory = 'Standard Notes Backups'
return `${Paths.homeDir}/${LegacyTextBackupsDirectory}` return path.join(Paths.homeDir, LegacyTextBackupsDirectory)
} }
public async presentDirectoryPickerForLocationChangeAndTransferOld( public async presentDirectoryPickerForLocationChangeAndTransferOld(
@@ -133,7 +133,7 @@ export class FilesBackupManager implements FileBackupsDevice {
} }
private getFileBackupsMappingFilePath(backupsLocation: string): string { private getFileBackupsMappingFilePath(backupsLocation: string): string {
return `${backupsLocation}/.settings/info.json` return path.join(backupsLocation, '.settings', 'info.json')
} }
private async getFileBackupsMappingFileFromDisk(backupsLocation: string): Promise<FileBackupsMapping | undefined> { private async getFileBackupsMappingFileFromDisk(backupsLocation: string): Promise<FileBackupsMapping | undefined> {
@@ -178,9 +178,9 @@ export class FilesBackupManager implements FileBackupsDevice {
url: string url: string
}, },
): Promise<'success' | 'failed'> { ): Promise<'success' | 'failed'> {
const fileDir = `${location}/${uuid}` const fileDir = path.join(location, uuid)
const metaFilePath = `${fileDir}/${FileBackupsConstantsV1.MetadataFileName}` const metaFilePath = path.join(fileDir, FileBackupsConstantsV1.MetadataFileName)
const binaryPath = `${fileDir}/${FileBackupsConstantsV1.BinaryFileName}` const binaryPath = path.join(fileDir, FileBackupsConstantsV1.BinaryFileName)
await ensureDirectoryExists(fileDir) await ensureDirectoryExists(fileDir)
@@ -270,7 +270,7 @@ export class FilesBackupManager implements FileBackupsDevice {
} }
private getPlaintextMappingFilePath(location: string): string { private getPlaintextMappingFilePath(location: string): string {
return `${location}/.settings/info.json` return path.join(location, '.settings', 'info.json')
} }
private async getPlaintextMappingFileFromDisk(location: string): Promise<PlaintextBackupsMapping | undefined> { private async getPlaintextMappingFileFromDisk(location: string): Promise<PlaintextBackupsMapping | undefined> {