From 6dc13e8579a02f2acb6a748624add7b1b2647fb7 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 23 Jul 2018 17:37:32 -0400 Subject: [PATCH] nested folders use `/` --- src/importers/keepass2XmlImporter.ts | 2 +- src/importers/keepassxCsvImporter.ts | 2 +- src/importers/passwordSafeXmlImporter.ts | 2 +- src/importers/roboformCsvImporter.ts | 2 +- src/importers/stickyPasswordXmlImporter.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/importers/keepass2XmlImporter.ts b/src/importers/keepass2XmlImporter.ts index 21c24f783be..0bced5a80d8 100644 --- a/src/importers/keepass2XmlImporter.ts +++ b/src/importers/keepass2XmlImporter.ts @@ -38,7 +38,7 @@ export class KeePass2XmlImporter extends BaseImporter implements Importer { if (!isRootNode) { if (groupName !== '') { - groupName += ' > '; + groupName += '/'; } const nameEl = this.querySelectorDirectChild(node, 'Name'); groupName += nameEl == null ? '-' : nameEl.textContent; diff --git a/src/importers/keepassxCsvImporter.ts b/src/importers/keepassxCsvImporter.ts index 3113bf5345b..0d07fcc9988 100644 --- a/src/importers/keepassxCsvImporter.ts +++ b/src/importers/keepassxCsvImporter.ts @@ -19,7 +19,7 @@ export class KeePassXCsvImporter extends BaseImporter implements Importer { value.Group = !this.isNullOrWhitespace(value.Group) && value.Group.startsWith('Root/') ? value.Group.replace('Root/', '') : value.Group; - const groupName = !this.isNullOrWhitespace(value.Group) ? value.Group.split('/').join(' > ') : null; + const groupName = !this.isNullOrWhitespace(value.Group) ? value.Group : null; this.processFolder(result, groupName); const cipher = this.initLoginCipher(); diff --git a/src/importers/passwordSafeXmlImporter.ts b/src/importers/passwordSafeXmlImporter.ts index ff799217b6c..e4bbedb8365 100644 --- a/src/importers/passwordSafeXmlImporter.ts +++ b/src/importers/passwordSafeXmlImporter.ts @@ -24,7 +24,7 @@ export class PasswordSafeXmlImporter extends BaseImporter implements Importer { Array.from(entries).forEach((entry) => { const group = this.querySelectorDirectChild(entry, 'group'); const groupText = group != null && !this.isNullOrWhitespace(group.textContent) ? - group.textContent.split('.').join(' > ') : null; + group.textContent.split('.').join('/') : null; this.processFolder(result, groupText); const title = this.querySelectorDirectChild(entry, 'title'); diff --git a/src/importers/roboformCsvImporter.ts b/src/importers/roboformCsvImporter.ts index 6d0cc5a2a4a..741cc69e4ec 100644 --- a/src/importers/roboformCsvImporter.ts +++ b/src/importers/roboformCsvImporter.ts @@ -16,7 +16,7 @@ export class RoboFormCsvImporter extends BaseImporter implements Importer { results.forEach((value) => { const folder = !this.isNullOrWhitespace(value.Folder) && value.Folder.startsWith('/') ? value.Folder.replace('/', '') : value.Folder; - const folderName = !this.isNullOrWhitespace(folder) ? folder.split('/').join(' > ') : null; + const folderName = !this.isNullOrWhitespace(folder) ? folder : null; this.processFolder(result, folderName); const cipher = this.initLoginCipher(); diff --git a/src/importers/stickyPasswordXmlImporter.ts b/src/importers/stickyPasswordXmlImporter.ts index 6bd992f814c..6bb1dc88ee2 100644 --- a/src/importers/stickyPasswordXmlImporter.ts +++ b/src/importers/stickyPasswordXmlImporter.ts @@ -71,7 +71,7 @@ export class StickyPasswordXmlImporter extends BaseImporter implements Importer return groupText; } if (!this.isNullOrWhitespace(groupText)) { - groupText = ' > ' + groupText; + groupText = '/' + groupText; } groupText = group.getAttribute('Name') + groupText; return this.buildGroupText(doc, group.getAttribute('ParentID'), groupText);