mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-05 00:02:37 +00:00
Bug 710259 - New Safari migrator (OS X & Windows). r=mak.
This commit is contained in:
Asaf Romano
parent
39328682f4
commit
b2edd02630
@ -52,8 +52,6 @@
|
||||
#if defined(XP_WIN) && !defined(__MINGW32__)
|
||||
#include "nsIEProfileMigrator.h"
|
||||
#include "nsIEHistoryEnumerator.h"
|
||||
#elif defined(XP_MACOSX)
|
||||
#include "nsSafariProfileMigrator.h"
|
||||
#endif
|
||||
|
||||
#include "rdf.h"
|
||||
@ -80,8 +78,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
|
||||
#if defined(XP_WIN) && !defined(__MINGW32__)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
|
||||
#elif defined(XP_MACOSX)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
|
||||
#endif
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
|
||||
@ -101,7 +97,6 @@ NS_DEFINE_NAMED_CID(NS_WINIEPROFILEMIGRATOR_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUMERATOR_CID);
|
||||
#elif defined(XP_MACOSX)
|
||||
NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGRATOR_CID);
|
||||
#endif
|
||||
NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
|
||||
|
||||
@ -119,7 +114,6 @@ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
|
||||
{ &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
|
||||
#elif defined(XP_MACOSX)
|
||||
{ &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
|
||||
{ &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor },
|
||||
#endif
|
||||
{ &kNS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID, false, NULL, nsPrivateBrowsingServiceWrapperConstructor },
|
||||
{ NULL }
|
||||
@ -154,7 +148,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
|
||||
{ NS_IEHISTORYENUMERATOR_CONTRACTID, &kNS_WINIEHISTORYENUMERATOR_CID },
|
||||
#elif defined(XP_MACOSX)
|
||||
{ NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
|
||||
{ NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "safari", &kNS_SAFARIPROFILEMIGRATOR_CID },
|
||||
#endif
|
||||
{ NS_PRIVATE_BROWSING_SERVICE_CONTRACTID, &kNS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID },
|
||||
{ NULL }
|
||||
|
||||
@ -46,11 +46,3 @@ DIRS = public src
|
||||
TEST_DIRS += tests
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# Needed for preprocessor removal of IE Profile Migrator label - bug 236901
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifdef GNU_CXX
|
||||
DEFINES += -DNO_IE_MIGRATOR=1
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@ -67,13 +67,8 @@
|
||||
<!-- If you are adding a migrator, please add the appropriate
|
||||
hooks to GetDefaultBrowserMigratorKey in
|
||||
browser/components/migration/src/nsProfileMigrator.cpp -->
|
||||
#ifdef XP_MACOSX
|
||||
<radio id="safari" label="&importFromSafari.label;" accesskey="&importFromSafari.accesskey;"/>
|
||||
#elifdef XP_WIN
|
||||
#ifndef NO_IE_MIGRATOR
|
||||
<radio id="ie" label="&importFromIE.label;" accesskey="&importFromIE.accesskey;"/>
|
||||
#endif
|
||||
#endif
|
||||
<radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
|
||||
<radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
|
||||
<radio id="fromfile" label="&importFromHTMLFile.label;" accesskey="&importFromHTMLFile.accesskey;" hidden="true"/>
|
||||
|
||||
@ -4,3 +4,5 @@ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
|
||||
component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
|
||||
component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=safari {4b609ecf-60b2-4655-9df4-dc149e474da1}
|
||||
|
||||
@ -48,25 +48,27 @@ ifndef MOZ_MEMORY
|
||||
USE_STATIC_LIBS = 1
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH)_$(GNU_CXX),WINNT_)
|
||||
CPPSRCS += nsIEProfileMigrator.cpp \
|
||||
nsBrowserProfileMigratorUtils.cpp \
|
||||
nsIEHistoryEnumerator.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
CPPSRCS += nsSafariProfileMigrator.cpp \
|
||||
nsBrowserProfileMigratorUtils.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
EXTRA_PP_COMPONENTS = \
|
||||
ProfileMigrator.js \
|
||||
ChromeProfileMigrator.js \
|
||||
FirefoxProfileMigrator.js \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH)_$(GNU_CXX),WINNT_)
|
||||
CPPSRCS += nsIEProfileMigrator.cpp \
|
||||
nsBrowserProfileMigratorUtils.cpp \
|
||||
nsIEHistoryEnumerator.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
EXTRA_COMPONENTS = \
|
||||
BrowserProfileMigrators.manifest \
|
||||
$(NULL)
|
||||
|
||||
@ -406,9 +406,7 @@ let MigrationUtils = Object.freeze({
|
||||
migrator = Cc["@mozilla.org/profile/migrator;1?app=browser&type=" +
|
||||
aKey].createInstance(Ci.nsIBrowserProfileMigrator);
|
||||
}
|
||||
catch(ex) {
|
||||
Cu.reportError("Could not get migrator '" + aKey + "' (" + ex + ")");
|
||||
}
|
||||
catch(ex) { }
|
||||
this._migrators.set(aKey, migrator);
|
||||
}
|
||||
|
||||
|
||||
680
browser/components/migration/src/SafariProfileMigrator.js
Normal file
680
browser/components/migration/src/SafariProfileMigrator.js
Normal file
@ -0,0 +1,680 @@
|
||||
/* This Source Code is subject to the terms of the Mozilla Public License
|
||||
* version 2.0 (the "License"). You can obtain a copy of the License at
|
||||
* http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
"use strict";
|
||||
|
||||
let Cc = Components.classes;
|
||||
let Ci = Components.interfaces;
|
||||
let Cu = Components.utils;
|
||||
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/FileUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource:///modules/MigrationUtils.jsm");
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "PropertyListUtils",
|
||||
"resource://gre/modules/PropertyListUtils.jsm");
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
|
||||
"resource://gre/modules/PlacesUtils.jsm");
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
|
||||
"resource://gre/modules/NetUtil.jsm");
|
||||
|
||||
function Bookmarks(aBookmarksFile) {
|
||||
this._file = aBookmarksFile;
|
||||
}
|
||||
Bookmarks.prototype = {
|
||||
type: MigrationUtils.resourceTypes.BOOKMARKS,
|
||||
|
||||
migrate: function B_migrate(aCallback) {
|
||||
PropertyListUtils.read(this._file,
|
||||
MigrationUtils.wrapMigrateFunction(function migrateBookmarks(aDict) {
|
||||
if (!aDict)
|
||||
throw new Error("Could not read Bookmarks.plist");
|
||||
|
||||
let children = aDict.get("Children");;
|
||||
if (!children)
|
||||
throw new Error("Invalid Bookmarks.plist format");
|
||||
|
||||
PlacesUtils.bookmarks.runInBatchMode({
|
||||
runBatched: function() {
|
||||
let collection = aDict.get("Title") == "com.apple.ReadingList" ?
|
||||
this.READING_LIST_COLLECTION : this.ROOT_COLLECTION;
|
||||
this._migrateCollection(children, collection);
|
||||
}.bind(this)
|
||||
}, null);
|
||||
}.bind(this), aCallback));
|
||||
},
|
||||
|
||||
// Bookmarks collections in Safari. Constants for migrateCollection.
|
||||
ROOT_COLLECTION: 0,
|
||||
MENU_COLLECTION: 1,
|
||||
TOOLBAR_COLLECTION: 2,
|
||||
READING_LIST_COLLECTION: 3,
|
||||
|
||||
/**
|
||||
* Recursively migrate a Safari collection of bookmarks.
|
||||
*
|
||||
* @param aEntries
|
||||
* the collection's children
|
||||
* @param aCollection
|
||||
* one of the values above.
|
||||
*/
|
||||
_migrateCollection: function B__migrateCollection(aEntries, aCollection) {
|
||||
// A collection of bookmarks in Safari resembles places roots. In the
|
||||
// property list files (Bookmarks.plist, ReadingList.plist) they are
|
||||
// stored as regular bookmarks folders, and thus can only be distinguished
|
||||
// from by their names and places in the hierarchy.
|
||||
|
||||
let entriesFiltered = [];
|
||||
if (aCollection == this.ROOT_COLLECTION) {
|
||||
for (let entry of aEntries) {
|
||||
let type = entry.get("WebBookmarkType");
|
||||
if (type == "WebBookmarkTypeList" && entry.has("Children")) {
|
||||
let title = entry.get("Title");
|
||||
let children = entry.get("Children");
|
||||
if (title == "BookmarksBar")
|
||||
this._migrateCollection(children, this.TOOLBAR_COLLECTION);
|
||||
else if (title == "BookmarksMenu")
|
||||
this._migrateCollection(children, this.MENU_COLLECTION);
|
||||
else if (title == "com.apple.ReadingList")
|
||||
this._migrateCollection(children, this.READING_LIST_COLLECTION);
|
||||
else if (entry.get("ShouldOmitFromUI") !== true)
|
||||
entriesFiltered.push(entry);
|
||||
}
|
||||
else if (type == "WebBookmarkTypeLeaf") {
|
||||
entriesFiltered.push(entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
entriesFiltered = aEntries;
|
||||
}
|
||||
|
||||
if (entriesFiltered.length == 0)
|
||||
return;
|
||||
|
||||
let folder = -1;
|
||||
switch (aCollection) {
|
||||
case this.ROOT_COLLECTION: {
|
||||
// In Safari, it is possible (though quite cumbersome) to move
|
||||
// bookmarks to the bookmarks root, which is the parent folder of
|
||||
// all bookmarks "collections". That is somewhat in parallel with
|
||||
// both the places root and the unfiled-bookmarks root.
|
||||
// Because the former is only an implementation detail in our UI,
|
||||
// the unfiled root seems to be the best choice.
|
||||
folder = PlacesUtils.unfiledBookmarksFolderId;
|
||||
break;
|
||||
}
|
||||
case this.MENU_COLLECTION: {
|
||||
folder = PlacesUtils.bookmarksMenuFolderId;
|
||||
if (!MigrationUtils.isStartupMigration) {
|
||||
folder = MigrationUtils.createImportedBookmarksFolder("Safari",
|
||||
folder);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case this.TOOLBAR_COLLECTION: {
|
||||
folder = PlacesUtils.toolbarFolderId;
|
||||
if (!MigrationUtils.isStartupMigration) {
|
||||
folder = MigrationUtils.createImportedBookmarksFolder("Safari",
|
||||
folder);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case this.READING_LIST_COLLECTION: {
|
||||
// Reading list items are imported as regular bookmarks.
|
||||
// They are imported under their own folder, created either under the
|
||||
// bookmarks menu (in the case of startup migration).
|
||||
folder = PlacesUtils.bookmarks.createFolder(
|
||||
PlacesUtils.bookmarksMenuFolderId,
|
||||
MigrationUtils.getLocalizedString("importedSafariReadingList"),
|
||||
PlacesUtils.bookmarks.DEFAULT_INDEX);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
throw new Error("Unexpected value for aCollection!");
|
||||
}
|
||||
|
||||
this._migrateEntries(entriesFiltered, folder);
|
||||
},
|
||||
|
||||
// migrate the given array of safari bookmarks to the given places
|
||||
// folder.
|
||||
_migrateEntries: function B__migrateEntries(aEntries, aFolderId) {
|
||||
for (let entry of aEntries) {
|
||||
let type = entry.get("WebBookmarkType");
|
||||
if (type == "WebBookmarkTypeList" && entry.has("Children")) {
|
||||
let title = entry.get("Title");
|
||||
let folderId = PlacesUtils.bookmarks.createFolder(
|
||||
aFolderId, title, PlacesUtils.bookmarks.DEFAULT_INDEX);
|
||||
|
||||
// Empty folders may not have a children array.
|
||||
if (entry.has("Children"))
|
||||
this._migrateEntries(entry.get("Children"), folderId, false);
|
||||
}
|
||||
else if (type == "WebBookmarkTypeLeaf" && entry.has("URLString")) {
|
||||
let title, uri;
|
||||
if (entry.has("URIDictionary"))
|
||||
title = entry.get("URIDictionary").get("title");
|
||||
|
||||
try {
|
||||
uri = NetUtil.newURI(entry.get("URLString"));
|
||||
}
|
||||
catch(ex) {
|
||||
Cu.reportError("Invalid uri set for Safari bookmark: " + entry.get("URLString"));
|
||||
}
|
||||
if (uri) {
|
||||
PlacesUtils.bookmarks.insertBookmark(aFolderId, uri,
|
||||
PlacesUtils.bookmarks.DEFAULT_INDEX, title);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function History(aHistoryFile) {
|
||||
this._file = aHistoryFile;
|
||||
}
|
||||
History.prototype = {
|
||||
type: MigrationUtils.resourceTypes.HISTORY,
|
||||
|
||||
// Helper method for converting the visit date property to a PRTime value.
|
||||
// The visit date is stored as a string, so it's not read as a Date
|
||||
// object by PropertyListUtils.
|
||||
_parseCocoaDate: function H___parseCocoaDate(aCocoaDateStr) {
|
||||
let asDouble = parseFloat(aCocoaDateStr);
|
||||
if (!isNaN(asDouble)) {
|
||||
// reference date of NSDate.
|
||||
let date = new Date("1 January 2001, GMT");
|
||||
date.setMilliseconds(asDouble * 1000);
|
||||
return date * 1000;
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
|
||||
migrate: function H_migrate(aCallback) {
|
||||
PropertyListUtils.read(this._file, function migrateHistory(aDict) {
|
||||
try {
|
||||
if (!aDict)
|
||||
throw new Error("Could not read history property list");
|
||||
if (!aDict.has("WebHistoryDates"))
|
||||
throw new Error("Unexpected history-property list format");
|
||||
|
||||
// Safari's History file contains only top-level urls. It does not
|
||||
// distinguish between typed urls and linked urls.
|
||||
let transType = PlacesUtils.history.TRANSITION_LINK;
|
||||
|
||||
let places = [];
|
||||
let entries = aDict.get("WebHistoryDates");
|
||||
for (let entry of entries) {
|
||||
if (entry.has("lastVisitedDate")) {
|
||||
let visitDate = this._parseCocoaDate(entry.get("lastVisitedDate"));
|
||||
places.push({ uri: NetUtil.newURI(entry.get("")),
|
||||
title: entry.get("title"),
|
||||
visits: [{ transitionType: transType,
|
||||
visitDate: visitDate }] });
|
||||
}
|
||||
}
|
||||
if (places.length > 0) {
|
||||
PlacesUtils.asyncHistory.updatePlaces(places, {
|
||||
_success: false,
|
||||
handleResult: function() {
|
||||
// Importing any entry is considered a successful import.
|
||||
this._success = true;
|
||||
},
|
||||
handleError: function() {},
|
||||
handleCompletion: function() {
|
||||
aCallback(this._success);
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
aCallback(false);
|
||||
}
|
||||
}
|
||||
catch(ex) {
|
||||
Cu.reportError(ex);
|
||||
aCallback(false);
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Safari's preferences property list is independently used for three purposes:
|
||||
* (a) importation of preferences
|
||||
* (b) importation of search strings
|
||||
* (c) retrieving the home page.
|
||||
*
|
||||
* So, rather than reading it three times, it's cached and managed here.
|
||||
*/
|
||||
function MainPreferencesPropertyList(aPreferencesFile) {
|
||||
this._file = aPreferencesFile;
|
||||
this._callbacks = [];
|
||||
}
|
||||
MainPreferencesPropertyList.prototype = {
|
||||
/**
|
||||
* @see PropertyListUtils.read
|
||||
*/
|
||||
read: function MPPL_read(aCallback) {
|
||||
if ("_dict" in this) {
|
||||
aCallback(this._dict);
|
||||
return;
|
||||
}
|
||||
|
||||
let alreadyReading = this._callbacks.length > 0;
|
||||
this._callbacks.push(aCallback);
|
||||
if (!alreadyReading) {
|
||||
PropertyListUtils.read(this._file, function readPrefs(aDict) {
|
||||
this._dict = aDict;
|
||||
for (let callback of this._callbacks) {
|
||||
try {
|
||||
callback(aDict);
|
||||
}
|
||||
catch(ex) {
|
||||
Cu.reportError(ex);
|
||||
}
|
||||
}
|
||||
this._callbacks.splice(0);
|
||||
}.bind(this));
|
||||
}
|
||||
},
|
||||
|
||||
// Workaround for nsIBrowserProfileMigrator.sourceHomePageURL until
|
||||
// it's replaced with an async method.
|
||||
_readSync: function MPPL__readSync() {
|
||||
if ("_dict" in this)
|
||||
return this._dict;
|
||||
|
||||
let inputStream = Cc["@mozilla.org/network/file-input-stream;1"].
|
||||
createInstance(Ci.nsIFileInputStream);
|
||||
inputStream.init(this._file, -1, -1, 0);
|
||||
let binaryStream = Cc["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Ci.nsIBinaryInputStream);
|
||||
binaryStream.setInputStream(inputStream);
|
||||
let bytes = binaryStream.readByteArray(inputStream.available());
|
||||
this._dict = PropertyListUtils._readFromArrayBufferSync(
|
||||
Uint8Array(bytes).buffer);
|
||||
return this._dict;
|
||||
}
|
||||
};
|
||||
|
||||
function Preferences(aMainPreferencesPropertyListInstance) {
|
||||
this._mainPreferencesPropertyList = aMainPreferencesPropertyListInstance;
|
||||
}
|
||||
Preferences.prototype = {
|
||||
type: MigrationUtils.resourceTypes.SETTINGS,
|
||||
|
||||
migrate: function MPR_migrate(aCallback) {
|
||||
this._mainPreferencesPropertyList.read(
|
||||
MigrationUtils.wrapMigrateFunction(function migratePrefs(aDict) {
|
||||
if (!aDict)
|
||||
throw new Error("Could not read preferences file");
|
||||
|
||||
this._dict = aDict;
|
||||
|
||||
let invert = function(webkitVal) !webkitVal;
|
||||
this._set("AutoFillPasswords", "signon.rememberSignons");
|
||||
this._set("OpenNewTabsInFront", "browser.tabs.loadInBackground", invert);
|
||||
this._set("WebKitJavaScriptCanOpenWindowsAutomatically",
|
||||
"dom.disable_open_during_load", invert);
|
||||
|
||||
// layout.spellcheckDefault is a boolean stored as a number.
|
||||
this._set("WebContinuousSpellCheckingEnabled",
|
||||
"layout.spellcheckDefault", Number);
|
||||
|
||||
// Auto-load images
|
||||
// Firefox has an elaborate set of Image preferences. The correlation is:
|
||||
// Mode: Safari Firefox
|
||||
// Blocked FALSE 2
|
||||
// Allowed TRUE 1
|
||||
// Allowed, originating site only -- 3
|
||||
this._set("WebKitDisplayImagesKey", "permissions.default.image",
|
||||
function(webkitVal) webkitVal ? 1 : 2);
|
||||
|
||||
// Default charset migration
|
||||
this._set("WebKitDefaultTextEncodingName", "intl.charset.default",
|
||||
function(webkitCharset) {
|
||||
// We don't support x-mac-korean (see bug 713516), but it mostly matches
|
||||
// x-windows-949.
|
||||
if (webkitCharset == "x-mac-korean")
|
||||
return "x-windows-949";
|
||||
|
||||
// getCharsetAlias throws if an invalid value is passed in.
|
||||
try {
|
||||
return Cc["@mozilla.org/charset-converter-manager;1"].
|
||||
getService(Ci.nsICharsetConverterManager).
|
||||
getCharsetAlias(webkitCharset);
|
||||
}
|
||||
catch(ex) {
|
||||
Cu.reportError("Could not convert webkit charset '" + webkitCharset +
|
||||
"' to a supported charset");
|
||||
}
|
||||
// Don't set the preference if we could not get the corresponding
|
||||
// charset.
|
||||
return undefined;
|
||||
});
|
||||
|
||||
#ifdef XP_WIN
|
||||
// Cookie-accept policy.
|
||||
// For the OS X version, see WebFoundationCookieBehavior.
|
||||
// Setting Safari Firefox
|
||||
// Always Accept 0 0
|
||||
// Accept from Originating 2 1
|
||||
// Never Accept 1 2
|
||||
this._set("WebKitCookieStorageAcceptPolicy",
|
||||
"network.cookie.cookieBehavior",
|
||||
function(webkitVal) webkitVal == 0 ? 0 : webkitVal == 1 ? 2 : 1);
|
||||
#endif
|
||||
|
||||
this._migrateFontSettings();
|
||||
this._migrateDownloadsFolder();
|
||||
}.bind(this), aCallback));
|
||||
},
|
||||
|
||||
/**
|
||||
* Attempts to migrates a preference from Safari. Returns whether the preference
|
||||
* has been migrated.
|
||||
* @param aSafariKey
|
||||
* The dictionary key for the preference of Safari.
|
||||
* @param aMozPref
|
||||
* The gecko/firefox preference to which aSafariKey should be migrated
|
||||
* @param [optional] aConvertFunction(aSafariValue)
|
||||
* a function that converts the safari-preference value to the
|
||||
* appropriate value for aMozPref. If it's not passed, then the
|
||||
* Safari value is set as is.
|
||||
* If aConvertFunction returns undefined, then aMozPref is not set
|
||||
* at all.
|
||||
* @return whether or not aMozPref was set.
|
||||
*/
|
||||
_set: function MPR_set(aSafariKey, aMozPref, aConvertFunction) {
|
||||
if (this._dict.has(aSafariKey)) {
|
||||
let safariVal = this._dict.get(aSafariKey);
|
||||
let mozVal = aConvertFunction !== undefined ?
|
||||
aConvertFunction(safariVal) : safariVal;
|
||||
switch (typeof(mozVal)) {
|
||||
case "string":
|
||||
Services.prefs.setCharPref(aMozPref, mozVal);
|
||||
break;
|
||||
case "number":
|
||||
Services.prefs.setIntPref(aMozPref, mozVal);
|
||||
break;
|
||||
case "boolean":
|
||||
Services.prefs.setBoolPref(aMozPref, mozVal);
|
||||
break;
|
||||
case "undefined":
|
||||
return false;
|
||||
default:
|
||||
throw new Error("Unexpected value type: " + typeof(mozVal));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
},
|
||||
|
||||
// Fonts settings are quite problematic for migration, for a couple of
|
||||
// reasons:
|
||||
// (a) Every font preference in Gecko is set for a particular language.
|
||||
// In Safari, each font preference applies to all languages.
|
||||
// (b) The current underlying implementation of nsIFontEnumerator cannot
|
||||
// really tell you anything about a font: no matter what language or type
|
||||
// you try to enumerate with EnumerateFonts, you get an array of all
|
||||
// fonts in the systems (This also breaks our fonts dialog).
|
||||
// (c) In Gecko, each langauge has a distinct serif and sans-serif font
|
||||
// preference. Safari has only one default font setting. It seems that
|
||||
// it checks if it's a serif or sans serif font, and when a site
|
||||
// explicitly asks to use serif/sans-serif font, it uses the default font
|
||||
// only if it applies to this type.
|
||||
// (d) The solution of guessing the lang-group out of the default charset (as
|
||||
// done in the old Safari migrator) can only work when:
|
||||
// (1) The default charset preference is set.
|
||||
// (2) It's not a unicode charset.
|
||||
// For now, we use the language implied by the system locale as the
|
||||
// lang-group. The only exception is minimal font size, which is an
|
||||
// accessibility preference in Safari (under the Advanced tab). If it is set,
|
||||
// we set it for all languages.
|
||||
// As for the font type of the default font (serif/sans-serif), the default
|
||||
// type for the given language is used (set in font.default.LANGGROUP).
|
||||
_migrateFontSettings: function MPR__migrateFontSettings() {
|
||||
// If "Never use font sizes smaller than [ ] is set", migrate it for all
|
||||
// languages.
|
||||
if (this._dict.has("WebKitMinimumFontSize")) {
|
||||
let minimumSize = this._dict.get("WebKitMinimumFontSize");
|
||||
if (typeof(minimumSize) == "number") {
|
||||
let prefs = Services.prefs.getChildList("font.minimum-size");
|
||||
for (let pref of prefs) {
|
||||
Services.prefs.setIntPref(pref, minimumSize);
|
||||
}
|
||||
}
|
||||
else {
|
||||
Cu.reportError("WebKitMinimumFontSize was set to an invalid value: " +
|
||||
minimumSize);
|
||||
}
|
||||
}
|
||||
|
||||
// In theory, the lang group could be "x-unicode". This will result
|
||||
// in setting the fonts for "Other Languages".
|
||||
let lang = this._getLocaleLangGroup();
|
||||
|
||||
let anySet = false;
|
||||
let fontType = Services.prefs.getCharPref("font.default." + lang);
|
||||
anySet |= this._set("WebKitFixedFont", "font.name.monospace." + lang);
|
||||
anySet |= this._set("WebKitDefaultFixedFontSize", "font.size.fixed." + lang);
|
||||
anySet |= this._set("WebKitStandardFont",
|
||||
"font.name." + fontType + "." + lang);
|
||||
anySet |= this._set("WebKitDefaultFontSize", "font.size.variable." + lang);
|
||||
|
||||
// If we set font settings for a particular language, we'll also set the
|
||||
// fonts dialog to open with the fonts settings for that langauge.
|
||||
if (anySet)
|
||||
Services.prefs.setCharPref("font.language.group", lang);
|
||||
},
|
||||
|
||||
// Get the language group for the system locale.
|
||||
_getLocaleLangGroup: function MPR__getLocaleLangGroup() {
|
||||
let locale = Services.locale.getLocaleComponentForUserAgent();
|
||||
|
||||
// See nsLanguageAtomService::GetLanguageGroup
|
||||
let localeLangGroup = "x-unicode";
|
||||
let bundle = Services.strings.createBundle(
|
||||
"resource://gre/res/langGroups.properties");
|
||||
try {
|
||||
localeLangGroup = bundle.GetStringFromName(locale);
|
||||
}
|
||||
catch(ex) {
|
||||
let hyphenAt = locale.indexOf("-");
|
||||
if (hyphenAt != -1) {
|
||||
try {
|
||||
localeLangGroup = bundle.GetStringFromName(locale.substr(0, hyphenAt));
|
||||
}
|
||||
catch(ex2) { }
|
||||
}
|
||||
}
|
||||
return localeLangGroup;
|
||||
},
|
||||
|
||||
_migrateDownloadsFolder: function MPR__migrateDownloadsFolder() {
|
||||
// Windows Safari uses DownloadPath while Mac uses DownloadsPath.
|
||||
// Check both for future compatibility.
|
||||
let key;
|
||||
if (this._dict.has("DownloadsPath"))
|
||||
key = "DownloadsPath";
|
||||
else if (this._dict.has("DownloadPath"))
|
||||
key = "DownloadPath";
|
||||
else
|
||||
return;
|
||||
|
||||
let downloadsFolder = FileUtils.File(this._dict.get(key));
|
||||
|
||||
// If the download folder is set to the Desktop or to ~/Downloads, set the
|
||||
// folderList pref appropriately so that "Desktop"/Downloads is shown with
|
||||
// pretty name in the preferences dialog.
|
||||
let folderListVal = 2;
|
||||
if (downloadsFolder.equals(FileUtils.getDir("Desk", []))) {
|
||||
folderListVal = 0;
|
||||
}
|
||||
else {
|
||||
let dnldMgr = Cc["@mozilla.org/download-manager;1"].
|
||||
getService(Ci.nsIDownloadManager);
|
||||
if (downloadsFolder.equals(dnldMgr.defaultDownloadsDirectory))
|
||||
folderListVal = 1;
|
||||
}
|
||||
Services.prefs.setIntPref("browser.download.folderList", folderListVal);
|
||||
Services.prefs.setComplexValue("browser.download.dir", Ci.nsILocalFile,
|
||||
downloadsFolder);
|
||||
}
|
||||
};
|
||||
|
||||
function SearchStrings(aMainPreferencesPropertyListInstance) {
|
||||
this._mainPreferencesPropertyList = aMainPreferencesPropertyListInstance;
|
||||
}
|
||||
SearchStrings.prototype = {
|
||||
type: MigrationUtils.resourceTypes.OTHERDATA,
|
||||
|
||||
migrate: function SS_migrate(aCallback) {
|
||||
this._mainPreferencesPropertyList.read(MigrationUtils.wrapMigrateFunction(
|
||||
function migrateSearchStrings(aDict) {
|
||||
if (!aDict)
|
||||
throw new Error("Could not get preferences dictionary");
|
||||
|
||||
if (aDict.has("RecentSearchStrings")) {
|
||||
let recentSearchStrings = aDict.get("RecentSearchStrings");
|
||||
if (recentSearchStrings && recentSearchStrings.length > 0) {
|
||||
let formHistory = Cc["@mozilla.org/satchel/form-history;1"].
|
||||
getService(Ci.nsIFormHistory2);
|
||||
for (let searchString of recentSearchStrings) {
|
||||
formHistory.addEntry("searchbar-history", searchString);
|
||||
}
|
||||
}
|
||||
}
|
||||
}.bind(this), aCallback));
|
||||
}
|
||||
};
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
// On OS X, the cookie-accept policy preference is stored in a separate
|
||||
// property list.
|
||||
// For the Windows version, check Preferences.migrate.
|
||||
function WebFoundationCookieBehavior(aWebFoundationFile) {
|
||||
this._file = aWebFoundationFile;
|
||||
}
|
||||
WebFoundationCookieBehavior.prototype = {
|
||||
type: MigrationUtils.resourceTypes.SETTINGS,
|
||||
|
||||
migrate: function WFPL_migrate(aCallback) {
|
||||
PropertyListUtils.read(this._file, MigrationUtils.wrapMigrateFunction(
|
||||
function migrateCookieBehavior(aDict) {
|
||||
if (!aDict)
|
||||
throw new Error("Could not read com.apple.WebFoundation.plist");
|
||||
|
||||
if (aDict.has("NSHTTPAcceptCookies")) {
|
||||
// Setting Safari Firefox
|
||||
// Always Accept always 0
|
||||
// Accept from Originating current page 1
|
||||
// Never Accept never 2
|
||||
let acceptCookies = aDict.get("NSHTTPAcceptCookies");
|
||||
let cookieValue = acceptCookies == "never" ? 2 :
|
||||
acceptCookies == "current page" ? 1 : 0;
|
||||
Services.prefs.setIntPref("network.cookie.cookieBehavior",
|
||||
cookieValue);
|
||||
}
|
||||
}.bind(this), aCallback));
|
||||
}
|
||||
};
|
||||
#endif
|
||||
|
||||
function SafariProfileMigrator() {
|
||||
}
|
||||
|
||||
SafariProfileMigrator.prototype = Object.create(MigratorPrototype);
|
||||
|
||||
SafariProfileMigrator.prototype.getResources = function SM_getResources() {
|
||||
let profileDir =
|
||||
#ifdef XP_MACOSX
|
||||
FileUtils.getDir("ULibDir", ["Safari"], false);
|
||||
#else
|
||||
FileUtils.getDir("AppData", ["Apple Computer", "Safari"], false);
|
||||
#endif
|
||||
if (!profileDir.exists())
|
||||
return null;
|
||||
|
||||
let resources = [];
|
||||
let pushProfileFileResource = function(aFileName, aConstructor) {
|
||||
let file = profileDir.clone();
|
||||
file.append(aFileName);
|
||||
if (file.exists())
|
||||
resources.push(new aConstructor(file));
|
||||
};
|
||||
|
||||
pushProfileFileResource("History.plist", History);
|
||||
pushProfileFileResource("Bookmarks.plist", Bookmarks);
|
||||
|
||||
// The Reading List feature was introduced at the same time in Windows and
|
||||
// Mac versions of Safari. Not surprisingly, they are stored in the same
|
||||
// format in both versions. Surpsingly, only on Windows there is a
|
||||
// separate property list for it. This isn't #ifdefed out on mac, because
|
||||
// Apple may fix this at some point.
|
||||
pushProfileFileResource("ReadingList.plist", Bookmarks);
|
||||
|
||||
let prefsDir =
|
||||
#ifdef XP_MACOSX
|
||||
FileUtils.getDir("UsrPrfs", [], false);
|
||||
#else
|
||||
FileUtils.getDir("AppData", ["Apple Computer", "Preferences"], false);
|
||||
#endif
|
||||
|
||||
let prefs = this.mainPreferencesPropertyList;
|
||||
if (prefs) {
|
||||
resources.push(new Preferences(prefs));
|
||||
resources.push(new SearchStrings(prefs));
|
||||
}
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
// On OS X, the cookie-accept policy preference is stored in a separate
|
||||
// property list.
|
||||
let wfFile = FileUtils.getFile("UsrPrfs", ["com.apple.WebFoundation.plist"]);
|
||||
if (wfFile.exists())
|
||||
resources.push(new WebFoundationCookieBehavior(wfFile));
|
||||
#endif
|
||||
|
||||
return resources;
|
||||
};
|
||||
|
||||
Object.defineProperty(SafariProfileMigrator.prototype, "mainPreferencesPropertyList", {
|
||||
get: function get_mainPreferencesPropertyList() {
|
||||
if (this._mainPreferencesPropertyList === undefined) {
|
||||
let file =
|
||||
#ifdef XP_MACOSX
|
||||
FileUtils.getDir("UsrPrfs", [], false);
|
||||
#else
|
||||
FileUtils.getDir("AppData", ["Apple Computer", "Preferences"], false);
|
||||
#endif
|
||||
if (file.exists()) {
|
||||
file.append("com.apple.Safari.plist");
|
||||
if (file.exists()) {
|
||||
return this._mainPreferencesPropertyList =
|
||||
new MainPreferencesPropertyList(file);
|
||||
}
|
||||
}
|
||||
return this._mainPreferencesPropertyList = null;
|
||||
}
|
||||
return this._mainPreferencesPropertyList;
|
||||
}
|
||||
});
|
||||
|
||||
Object.defineProperty(SafariProfileMigrator.prototype, "sourceHomePageURL", {
|
||||
get: function get_sourceHomePageURL() {
|
||||
if (this.mainPreferencesPropertyList) {
|
||||
let dict = this.mainPreferencesPropertyList._readSync();
|
||||
if (dict.has("HomePage"))
|
||||
return dict.get("HomePage");
|
||||
}
|
||||
return "";
|
||||
}
|
||||
});
|
||||
|
||||
SafariProfileMigrator.prototype.classDescription = "Safari Profile Migrator";
|
||||
SafariProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=safari";
|
||||
SafariProfileMigrator.prototype.classID = Components.ID("{4b609ecf-60b2-4655-9df4-dc149e474da1}");
|
||||
|
||||
const NSGetFactory = XPCOMUtils.generateNSGetFactory([SafariProfileMigrator]);
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,134 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is The Browser Profile Migrator.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Ben Goodger.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2004
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Ben Goodger <ben@bengoodger.com>
|
||||
* Asaf Romano <mozilla.mano@sent.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef safariprofilemigrator___h___
|
||||
#define safariprofilemigrator___h___
|
||||
|
||||
#include "nsIBrowserProfileMigrator.h"
|
||||
#include "nsIObserverService.h"
|
||||
#include "nsStringAPI.h"
|
||||
#include "nsINavHistoryService.h"
|
||||
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
|
||||
class nsIPrefBranch;
|
||||
class nsINavBookmarksService;
|
||||
class nsIRDFResource;
|
||||
class nsIRDFDataSource;
|
||||
|
||||
class nsSafariProfileMigrator : public nsIBrowserProfileMigrator,
|
||||
public nsINavHistoryBatchCallback
|
||||
{
|
||||
public:
|
||||
NS_DECL_NSIBROWSERPROFILEMIGRATOR
|
||||
NS_DECL_NSINAVHISTORYBATCHCALLBACK
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
nsSafariProfileMigrator();
|
||||
virtual ~nsSafariProfileMigrator();
|
||||
|
||||
typedef enum { STRING, INT, BOOL } PrefType;
|
||||
|
||||
typedef nsresult(*prefConverter)(void*, nsIPrefBranch*);
|
||||
|
||||
struct PrefTransform {
|
||||
CFStringRef keyName;
|
||||
PrefType type;
|
||||
const char* targetPrefName;
|
||||
prefConverter prefSetterFunc;
|
||||
bool prefHasValue;
|
||||
union {
|
||||
PRInt32 intValue;
|
||||
bool boolValue;
|
||||
char* stringValue;
|
||||
};
|
||||
};
|
||||
|
||||
static nsresult SetBool(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetBoolInverted(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetString(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetInt(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetDefaultEncoding(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetDownloadFolder(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetDownloadHandlers(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetDownloadRetention(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetDisplayImages(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetFontName(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static nsresult SetFontSize(void* aTransform, nsIPrefBranch* aBranch);
|
||||
static void CleanResource(nsIRDFDataSource* aDataSource, nsIRDFResource* aResource);
|
||||
|
||||
protected:
|
||||
nsresult CopyPreferences(bool aReplace);
|
||||
nsresult CopyCookies(bool aReplace);
|
||||
/**
|
||||
* Migrate history to Places.
|
||||
* This will end up calling CopyHistoryBatched helper, that provides batch
|
||||
* support. Batching allows for better performances and integrity.
|
||||
*
|
||||
* @param aReplace
|
||||
* Indicates if we should replace current history or append to it.
|
||||
*/
|
||||
nsresult CopyHistory(bool aReplace);
|
||||
nsresult CopyHistoryBatched(bool aReplace);
|
||||
/**
|
||||
* Migrate bookmarks to Places.
|
||||
* This will end up calling CopyBookmarksBatched helper, that provides batch
|
||||
* support. Batching allows for better performances and integrity.
|
||||
*
|
||||
* @param aReplace
|
||||
* Indicates if we should replace current bookmarks or append to them.
|
||||
* When appending we will usually default to bookmarks menu.
|
||||
*/
|
||||
nsresult CopyBookmarks(bool aReplace);
|
||||
nsresult CopyBookmarksBatched(bool aReplace);
|
||||
nsresult ParseBookmarksFolder(CFArrayRef aChildren,
|
||||
PRInt64 aParentFolder,
|
||||
nsINavBookmarksService * aBookmarksService,
|
||||
bool aIsAtRootLevel);
|
||||
nsresult CopyFormData(bool aReplace);
|
||||
nsresult CopyOtherData(bool aReplace);
|
||||
|
||||
nsresult ProfileHasContentStyleSheet(bool *outExists);
|
||||
nsresult GetSafariUserStyleSheet(nsILocalFile** aResult);
|
||||
|
||||
private:
|
||||
bool HasFormDataToImport();
|
||||
nsCOMPtr<nsIObserverService> mObserverService;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -11,7 +11,7 @@ importedSearchURLsFolder=Keyword Searches (From %S)
|
||||
importedSearchURLsTitle=Search on %S
|
||||
importedSearchUrlDesc=Type "%S <search query>" in the Location Bar to perform a search on %S.
|
||||
|
||||
importedSafariBookmarks=From Safari
|
||||
importedSafariReadingList=Reading List (From Safari)
|
||||
|
||||
# Import Sources
|
||||
1_ie=Internet Options
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user