Changeset 15 in bookmarks for trunk/bkmk

Timestamp:

02/09/13 21:02:43 (12 years ago)

Author:

peter

Message:

• Bookmarks uses Moose instead of Class::Accessor
• if not dbh is specified in the Bookmarks constructor, it can use a dbname parameter to create a SQLite DBH
• the SQLite DBH created form dbname has the foreign_keys pragma set
• added foreign key constraints to the bookmarks.sql table definitions for bookmarks and tags
• added a required --file option to bkmk to specify the database file to use
• added a load command to bkmk that loads bookmarks dumped as YAML using bkmk list
• Bookmarks::add() can take mtime and id parameters (useful for reconstructing a database from the YAML dump of bkmk list)
• BookmarkApp and bkmk no longer use DBI directly; just pass a dbname to the Bookmarks constructor
• changed the default database for BookmarkApp to fk.db (schema from this revision's updated bookmarks.sql, with foreign keys)

File:

• trunk/bkmk (modified) (2 diffs)

trunk/bkmk

@@ -2 +2 @@
 use strict;
 
-use DBI;
 use YAML;
 use Bookmarks;
+use Getopt::Long;
 
-my $dbname = 'new.db';
+GetOptions(
+    'file|f=s' => \my $DBNAME,
+);
 
-my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", { RaiseError => 1, PrintError => 0 });
+die "Usage: $0 --file <dbname> <command>\n" unless $DBNAME;
 
 my $bookmarks = Bookmarks->new({
-    dbh => $dbh,
+    dbname => $DBNAME,
 });
 
@@ -34 +36 @@
         # TODO: coordinate this commandline script with the CGI app
         print Dump(\@resources);
-    }
+    },
+    load => sub {
+        my ($src_file) = @_;
+        my $src_bookmarks = YAML::LoadFile($src_file);
+        for my $bookmark (@{ $src_bookmarks }) {
+            $bookmarks->add($bookmark);
+        }
+    },
 );