Try to fix Chromium Edge transfer

This commit is contained in:
ownedbywuigi 2026-04-01 18:21:38 +01:00
commit 3a8b83027f

View file

@ -273,8 +273,15 @@ Object.defineProperty(ChromeProfileMigrator.prototype, "sourceLocked", {
function GetBookmarksResource(aProfileFolder) { function GetBookmarksResource(aProfileFolder) {
let bookmarksFile = aProfileFolder.clone(); let bookmarksFile = aProfileFolder.clone();
bookmarksFile.append("Bookmarks"); bookmarksFile.append("Bookmarks");
if (!bookmarksFile.exists()) if (!bookmarksFile.exists()) {
return null; let bookmarksBackupFile = aProfileFolder.clone();
bookmarksBackupFile.append("Bookmarks.bak");
if (bookmarksBackupFile.exists()) {
bookmarksFile = bookmarksBackupFile;
} else {
return null;
}
}
return { return {
type: MigrationUtils.resourceTypes.BOOKMARKS, type: MigrationUtils.resourceTypes.BOOKMARKS,
@ -413,8 +420,16 @@ function GetHistoryResource(aProfileFolder) {
function GetCookiesResource(aProfileFolder) { function GetCookiesResource(aProfileFolder) {
let cookiesFile = aProfileFolder.clone(); let cookiesFile = aProfileFolder.clone();
cookiesFile.append("Cookies"); cookiesFile.append("Cookies");
if (!cookiesFile.exists()) if (!cookiesFile.exists()) {
return null; let networkCookiesFile = aProfileFolder.clone();
networkCookiesFile.append("Network");
networkCookiesFile.append("Cookies");
if (networkCookiesFile.exists()) {
cookiesFile = networkCookiesFile;
} else {
return null;
}
}
return { return {
type: MigrationUtils.resourceTypes.COOKIES, type: MigrationUtils.resourceTypes.COOKIES,
@ -465,8 +480,15 @@ function GetCookiesResource(aProfileFolder) {
function GetWindowsPasswordsResource(aProfileFolder) { function GetWindowsPasswordsResource(aProfileFolder) {
let loginFile = aProfileFolder.clone(); let loginFile = aProfileFolder.clone();
loginFile.append("Login Data"); loginFile.append("Login Data");
if (!loginFile.exists()) if (!loginFile.exists()) {
return null; let alternateLoginFile = aProfileFolder.clone();
alternateLoginFile.append("Login Data For Account");
if (alternateLoginFile.exists()) {
loginFile = alternateLoginFile;
} else {
return null;
}
}
return { return {
type: MigrationUtils.resourceTypes.PASSWORDS, type: MigrationUtils.resourceTypes.PASSWORDS,
@ -622,7 +644,7 @@ Object.defineProperty(ChromiumEdgeProfileMigrator.prototype, "sourceProfiles", {
let name = entry.leafName; let name = entry.leafName;
if (name == "Default" || name.startsWith("Profile ")) { if (name == "Default" || name.startsWith("Profile ")) {
profiles.push({ id: name, name }); profiles.push({ id: name, name: name == "Default" ? "Default" : "Profile " + name.replace(/^Profile\s+/, "") });
} }
} }