Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 200359: Importing and exporting bookmarks are broken

Browse Source 
r=bsmedberg@covad.net sr=alecf a=asa


git-svn-id: svn://10.0.0.236/trunk@141856 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
chanial%noos.fr 2003-04-26 13:01:15 +00:00
parent 44a357fede
commit ca63c1a0bc
2 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/xpfe/components/bookmarks/resources/bookmarks.js
View File

@ -648,7 +648,7 @@ var BookmarksCommand = {
kFilePicker.appendFilters(kFilePickerIID.filterHTML | kFilePickerIID.filterAll);
var fileName;
if (kFilePicker.show() != kFilePickerIID.returnCancel) {
fileName = kFilePicker.fileURL.spec;
fileName = kFilePicker.file.path;
if (!fileName) return;
}
else return;
@ -692,7 +692,7 @@ var BookmarksCommand = {
kFilePicker.defaultString = "bookmarks.html";
var fileName;
if (kFilePicker.show() != kFilePickerIID.returnCancel) {
fileName = kFilePicker.fileURL.spec;
fileName = kFilePicker.file.path;
if (!fileName) return;
}
else return;

66
mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
View File

@ -4208,36 +4208,32 @@ nsBookmarksService::getFolderViaHint(nsIRDFResource *objType, PRBool fallbackFla
nsresult
nsBookmarksService::importBookmarks(nsISupportsArray *aArguments)
{
// look for #URL which is the "file:///" URL to import
nsresult rv;
nsCOMPtr<nsIRDFNode> aNode;
if (NS_FAILED(rv = getArgumentN(aArguments, kNC_URL, 0, getter_AddRefs(aNode))))
return rv;
nsCOMPtr<nsIRDFLiteral> pathLiteral = do_QueryInterface(aNode);
if (!pathLiteral) return NS_ERROR_NO_INTERFACE;
const PRUnichar *pathUni = nsnull;
// look for #URL which is the file path to import
nsresult rv;
nsCOMPtr<nsIRDFNode> aNode;
rv = getArgumentN(aArguments, kNC_URL, 0, getter_AddRefs(aNode));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIRDFLiteral> pathLiteral = do_QueryInterface(aNode, &rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_NO_INTERFACE);
const PRUnichar *pathUni = nsnull;
pathLiteral->GetValueConst(&pathUni);
if (!pathUni) return NS_ERROR_NULL_POINTER;
NS_ENSURE_TRUE(pathUni, NS_ERROR_NULL_POINTER);
nsAutoString fileName(pathUni);
nsCOMPtr<nsILocalFile> file;
NS_NewLocalFile(fileName, PR_TRUE, getter_AddRefs(file));
NS_ENSURE_TRUE(file, NS_ERROR_UNEXPECTED);
rv = NS_NewLocalFile(nsDependentString(pathUni), PR_TRUE, getter_AddRefs(file));
NS_ENSURE_SUCCESS(rv, rv);
PRBool isFile;
rv = file->IsFile(&isFile);
if(NS_FAILED(rv) || !isFile)
return NS_ERROR_UNEXPECTED;
NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && isFile, NS_ERROR_UNEXPECTED);
// figure out where to add the imported bookmarks
nsCOMPtr<nsIRDFResource> newBookmarkFolder;
if (NS_FAILED(rv = getFolderViaHint(kNC_NewBookmarkFolder, PR_TRUE,
getter_AddRefs(newBookmarkFolder))))
return rv;
nsCOMPtr<nsIRDFResource> newBookmarkFolder;
rv = getFolderViaHint(kNC_NewBookmarkFolder, PR_TRUE,
getter_AddRefs(newBookmarkFolder));
NS_ENSURE_SUCCESS(rv, rv);
// read 'em in
BookmarkParser parser;
BookmarkParser parser;
parser.Init(file, mInner, PR_TRUE);
// Note: can't Begin|EndUpdateBatch() this as notifications are required
@ -4249,34 +4245,30 @@ nsBookmarksService::importBookmarks(nsISupportsArray *aArguments)
nsresult
nsBookmarksService::exportBookmarks(nsISupportsArray *aArguments)
{
// look for #URL which is the "file:///" URL to export
// look for #URL which is the file path to export
nsCOMPtr<nsIRDFNode> node;
nsresult rv = getArgumentN(aArguments, kNC_URL, 0, getter_AddRefs(node));
if (NS_FAILED(rv)) return rv;
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIRDFLiteral> literal = do_QueryInterface(node, &rv);
if (NS_FAILED(rv)) return rv;
const PRUnichar* path = nsnull;
literal->GetValueConst(&path);
if (!path)
return NS_ERROR_FAILURE;
NS_ENSURE_SUCCESS(rv, NS_ERROR_NO_INTERFACE);
const PRUnichar* pathUni = nsnull;
literal->GetValueConst(&pathUni);
NS_ENSURE_TRUE(pathUni, NS_ERROR_NULL_POINTER);
// determine file type to export; default to HTML unless told otherwise
const PRUnichar* format = nsnull;
rv = getArgumentN(aArguments, kRDF_type, 0, getter_AddRefs(node));
if (NS_SUCCEEDED(rv))
{
literal = do_QueryInterface(node);
if (literal)
{
literal->GetValueConst(&format);
}
literal = do_QueryInterface(node, &rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_NO_INTERFACE);
literal->GetValueConst(&format);
NS_ENSURE_TRUE(format, NS_ERROR_NULL_POINTER);
}
nsAutoString fileName(path);
nsCOMPtr<nsILocalFile> file;
NS_NewLocalFile(fileName, PR_TRUE, getter_AddRefs(file));
rv = NS_NewLocalFile(nsDependentString(pathUni), PR_TRUE, getter_AddRefs(file));
NS_ENSURE_SUCCESS(rv, rv);
if (NS_LITERAL_STRING("RDF").Equals(format, nsCaseInsensitiveStringComparator()))
{