258902 - [patch]Import OmniWeb 5 Bookmarks

Status: RESOLVED FIXED

(Camino Graveyard :: Bookmarks, defect)

Description

[David Haas (gone, not reading mail)]

This imports OmniWeb 5 bookmarks

Comment 1

[David Haas (gone, not reading mail)]

Attachment: a patch

This allows importing of OmniWeb 5 bookmarks.

If the BookmarkManager.mm part of the patch doesn't apply
cleanly, make a note.  I tried to clean out the parts that
involved the firefox menu separator import bug, but might
not have succeeded entirely.

Comment 2

[Ludovic Hirlimann [:Usul]]

(In reply to comment #1)
 
> If the BookmarkManager.mm part of the patch doesn't apply
> cleanly, make a note.  I tried to clean out the parts that
> involved the firefox menu separator import bug, but might
> not have succeeded entirely.

patching file src/bookmarks/BookmarkManager.mm
Hunk #1 succeeded at 748 (offset 7 lines).
Hunk #2 FAILED at 836.
1 out of 2 hunks FAILED -- saving rejects to file
src/bookmarks/BookmarkManager.mm.rej

dave would you care to repost a patch ?

Comment 3

[David Haas (gone, not reading mail)]

Attachment: updated patch

see if this one applies

Comment 4

[Ludovic Hirlimann [:Usul]]

Comment on attachment 163174 [details] [diff] [review]
updated patch

>     titleString = [[NSString alloc] initWithFormat:NSLocalizedString(@"Imported %@ Bookmarks",@"Imported %@ Bookmarks"),[selectedItem title]];
>+      [favoriteFolder setTitle:NSLocalizedString(@"OmniWeb Favorites",@"OmniWeb Favorites")];
>+      [publishedFolder setTitle:NSLocalizedString(@"OmniWeb Published",@"OmniWeb Published")];

These strings needs to be added to the localized.strings when the patch will be
checked in.

Comment 5

[Josh Aas]

+  NSArray *owFiles = [NSArray arrayWithObjects:
+    @"~/Library/Application Support/OmniWeb 5/Bookmarks.html", 
+    @"~/Library/Application Support/OmniWeb 5/Favorites.html",
+    @"~/Library/Application Support/OmniWeb 5/Published.html"];

This list is not nil terminated and thus crashes a lot, which is bad.

Comment 6

[Josh Aas]

Also, the folder names are funny. Could we always make a folder called "Imported
OmniWeb 5 Bookmarks" and put subfolders for each file under that?

Comment 7

[David Haas (gone, not reading mail)]

Attachment: fixed patch

I added in "nil" to arrayWithObjects.  That's it.  Not that I've done it in a
while, but I seem to recall diffs on localized.strings were always messy, so
just add the names in by hand.

As far as the goofy names for imported folders - the patch already always make
an "Imported OmniWeb 5 Bookmarks" folder.  Two of the three possible bookmark
files get dropped into their own subfolders folders insider this folder.  The
file that doesn't get a subfolder is the "main" bookmark file - it seems a
stretch to make a "Bookmarks" subfolder inside "Imported OmniWeb 5 Bookmarks"
for that file. 

Now, if you don't like the names "OmniWeb Favorites" or "OmniWeb Published" for
the special subfolder names, feel free to replace them with better names in
localized.strings file.

Comment 8

[Josh Aas]

Comment on attachment 164509 [details] [diff] [review]
fixed patch

with nil added, r+

Comment 9

[Mike Pinkerton (not reading bugmail)]

Comment on attachment 164509 [details] [diff] [review]
fixed patch

sr=pink

Comment 10

[Josh Aas]

landed on trunk