Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1678292 - handle absence of Local State directory better when checking for chromium data to import, r=emalysz

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D99214
This commit is contained in:
Gijs Kruitbosch 2020-12-14 16:47:34 +00:00
parent c69038dcaf
commit c1e35cf746
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
browser/components/migration/ChromeMigrationUtils.jsm
View File

@ -225,16 +225,16 @@ var ChromeMigrationUtils = {
async getLocalState(dataPath = "Chrome") {
let localState = null;
try {
let localStatePath = OS.Path.join(
let localStatePath = PathUtils.join(
this.getDataPath(dataPath),
"Local State"
);
let localStateJson = await OS.File.read(localStatePath, {
encoding: "utf-8",
});
localState = JSON.parse(localStateJson);
localState = JSON.parse(await IOUtils.readUTF8(localStatePath));
} catch (ex) {
Cu.reportError(ex);
// Don't report the error if it's just a file not existing.
if (ex.name != "NotFoundError") {
Cu.reportError(ex);
}
throw ex;
}
return localState;
@ -246,7 +246,7 @@ var ChromeMigrationUtils = {
* @returns {String} The path of Chrome extension directory.
*/
getExtensionPath(profileId) {
return OS.Path.join(this.getDataPath(), profileId, "Extensions");
return PathUtils.join(this.getDataPath(), profileId, "Extensions");
},
/**
@ -281,24 +281,33 @@ var ChromeMigrationUtils = {
// Edge is not available on Linux.
},
};
let dirKey, subfolders;
subfolders = SUB_DIRECTORIES[AppConstants.platform][chromeProjectName];
let subfolders = SUB_DIRECTORIES[AppConstants.platform][chromeProjectName];
if (!subfolders) {
return null;
}
let rootDir;
if (AppConstants.platform == "win") {
dirKey = "winLocalAppDataDir";
rootDir = "LocalAppData";
subfolders = subfolders.concat(["User Data"]);
} else if (AppConstants.platform == "macosx") {
dirKey = "macUserLibDir";
rootDir = "ULibDir";
subfolders = ["Application Support"].concat(subfolders);
} else {
dirKey = "homeDir";
rootDir = "Home";
subfolders = [".config"].concat(subfolders);
}
subfolders.unshift(OS.Constants.Path[dirKey]);
return OS.Path.join(...subfolders);
try {
let target = Services.dirsvc.get(rootDir, Ci.nsIFile);
for (let subfolder of subfolders) {
target.append(subfolder);
}
return target.path;
} catch (ex) {
// The path logic here shouldn't error, so log it:
Cu.reportError(ex);
}
return null;
},
/**

12
browser/components/migration/ChromeProfileMigrator.jsm
View File

@ -165,9 +165,10 @@ ChromeProfileMigrator.prototype.getSourceProfiles = async function Chrome_getSou
return [];
}
let localState;
let profiles = [];
try {
let localState = await ChromeMigrationUtils.getLocalState(
localState = await ChromeMigrationUtils.getLocalState(
this._chromeUserDataPathSuffix
);
let info_cache = localState.profile.info_cache;
@ -178,10 +179,13 @@ ChromeProfileMigrator.prototype.getSourceProfiles = async function Chrome_getSou
});
}
} catch (e) {
Cu.reportError("Error detecting Chrome profiles: " + e);
// Avoid reporting NotFoundErrors from trying to get local state.
if (localState || e.name != "NotFoundError") {
Cu.reportError("Error detecting Chrome profiles: " + e);
}
// If we weren't able to detect any profiles above, fallback to the Default profile.
let defaultProfilePath = OS.Path.join(chromeUserDataPath, "Default");
if (await OS.File.exists(defaultProfilePath)) {
let defaultProfilePath = PathUtils.join(chromeUserDataPath, "Default");
if (await IOUtils.exists(defaultProfilePath)) {
profiles = [
{
id: "Default",