Changeset 46 in bookmarks for trunk/Bookmarks.pm

Timestamp:

06/03/13 17:57:19 (11 years ago)

Author:

peter

Message:

• moved the update method from Bookmark to Bookmarks
• added a utility helper method _update_tags that is called by add and update in the Bookmarks class

File:

• trunk/Bookmarks.pm (modified) (2 diffs)

trunk/Bookmarks.pm

@@ -193 +193 @@
     }
 
+    my $changed_tags = $self->_update_tags($uri, $bookmark->{tags});
+
+    if ($bookmark_exists && $changed_tags) {
+        # update the mtime if the bookmark already existed but the tags were changed
+        my $sth_update = $self->dbh->prepare('update bookmarks set mtime = ? where uri = ?');
+        $sth_update->execute($mtime, $uri);
+    }
+
+    # return the newly created or updated bookmark
+    return $self->get_bookmark({ uri => $uri });
+}
+
+sub update {
+    my $self = shift;
+    my $bookmark = shift;
+
+    my $mtime = time;
+
+    my $changed_uri = 0;
+    my $sth_current = $self->dbh->prepare('select uri from bookmarks where id = ?');
+    $sth_current->execute($bookmark->id);
+    my ($stored_uri) = $sth_current->fetchrow_array;
+
+    if ($stored_uri ne $bookmark->uri) {
+        # the URI has changed
+        my $sth_update_uri = $self->dbh->prepare('update resources set uri = ? where uri = ?');
+        $sth_update_uri->execute($bookmark->uri, $stored_uri);
+        $changed_uri++;
+    }
+
+    # update the title
+    # TODO: only do this if the title has changed
+    # TODO: should we update mtime if the title changes?
+    my $sth_update = $self->dbh->prepare('update resources set title = ? where uri = ?');
+    $sth_update->execute($bookmark->title, $bookmark->uri);
+
+    my $changed_tags = $self->_update_tags($bookmark->uri, $bookmark->tags);
+
+    if ($changed_uri or $changed_tags) {
+        # update the mtime if the bookmark already existed but the tags were changed
+        my $sth_update = $self->dbh->prepare('update bookmarks set mtime = ? where uri = ?');
+        $sth_update->execute($mtime, $bookmark->uri);
+    }
+
+    # return the bookmark
+    return $bookmark;
+}
+
+sub _update_tags {
+    my $self = shift;
+    my ($uri, $tags) = @_;
+
     my $changed_tags = 0;
-    my %new_tags = map { $_ => 1 } @{ $bookmark->{tags} };
+    my %new_tags = map { $_ => 1 } @{ $tags };
     my $sth_delete_tag = $self->dbh->prepare('delete from tags where uri = ? and tag = ?');
     my $sth_insert_tag = $self->dbh->prepare('insert into tags (uri, tag) values (?, ?)');
@@ -214 +266 @@
     }
 
-    if ($bookmark_exists && $changed_tags) {
-        # update the mtime if the bookmark already existed but the tags were changed
-        my $sth_update = $self->dbh->prepare('update bookmarks set mtime = ? where uri = ?');
-        $sth_update->execute($mtime, $uri);
-    }
-
-    # return the newly created or updated bookmark
-    return $self->get_bookmark({ uri => $uri });
-}
+    # how many tags have changed?
+    return $changed_tags;
+}
+
 
 # module returns true