delish 0.5.2 → 0.6.1

data/bin/delish

@@ -16,14 +16,14 @@ end
 
 #{{{ Output only and debug
 unless ARGV[1].nil?
-  @@OUTPUT_ONLY = true
+  OUTPUT_ONLY = true
   unless ARGV[2].nil?
-    @@DEBUG = true
+    DEBUG = true
   else
-    @@DEBUG = false
+    DEBUG = false
   end
 else
-  @@OUTPUT_ONLY = false
+  OUTPUT_ONLY = false
 end
 #}}}
 
@@ -31,7 +31,7 @@ require 'delish_bookmark_search.rb'
 
 delish_bookmark_search = Delish_Bookmark_Search.new(string, db)
 
-if @@OUTPUT_ONLY
+if OUTPUT_ONLY
   delish_bookmark_search.each { |bookmark| puts "#{bookmark[1]}: [#{bookmark[0]}]" }
 else
   delish_bookmark_search.each { |bookmark| `#{@@DELISH_COMMAND} #{bookmark[0]}` }

data/bin/import_delicious

@@ -5,45 +5,64 @@ require 'rexml/document'
 require 'net/https'
 require 'sqlite3'
 
-
-
 user = ENV['delish_user']
 pass = ENV['delish_pass']
 
 db = SQLite3::Database.new( "#{ENV['HOME']}/.delish" )
 
-# Create the table!!!
-db.execute <<SQL
-CREATE TABLE posts (
-  url VARCHAR(16384),
-  description VARCHAR(255),
-  extended VARCHAR(255),
-  created DATETIME,
-  hash CHAR(32) PRIMARY KEY,
-  accessed DATETIME
-);
-SQL
+class ImportDelish
+
+  #{{{ initialize(user, pass, db)
+  def initialize(user, pass, db)
+    @user = user
+    @pass = pass
+    @db   = db
+  end
+  #}}}
+
+  #{{{ create_database
+  def create_database
+    # Create the table!!!
+    @db.execute %{
+  CREATE TABLE posts (
+    url VARCHAR(16384),
+    description VARCHAR(255),
+    extended VARCHAR(255),
+    created DATETIME,
+    hash CHAR(32) PRIMARY KEY,
+    accessed DATETIME
+  );
+  }
 
-db.execute <<SQL
-CREATE TABLE post_tags (
-  hash CHAR(32),
-  tag VARCHAR(255)
-);
-SQL
+    @db.execute %{
+  CREATE TABLE post_tags (
+    hash CHAR(32),
+    tag_id INTEGER
+  );}
 
-# User-Agent: required for del.icio.us api
-agent = 'delish commandline client 0.4'
+    @db.execute  %{
+    CREATE TABLE tags (
+    tag VARCHAR(255) UNIQUE,
+    id  INTEGER PRIMARY KEY AUTOINCREMENT
+    );}
+  end
+  #}}}
 
-http = Net::HTTP.new('api.del.icio.us', 443)
-http.use_ssl = true
-http.start do |http|
-    request = Net::HTTP::Get.new('/v1/posts/all', {'User-Agent' => agent})
-    request.basic_auth user, pass
-    response = http.request(request)
+  #{{{ get_all_tags
+  def get_all_tags
+    # User-Agent: required for del.icio.us api
+    agent = 'delish commandline client 0.6.1'
 
-    data = REXML::Document.new(response.body)
-    data.elements.each("/posts/post") do |post|
-      db.execute(
+    http = Net::HTTP.new('api.del.icio.us', 443)
+    http.use_ssl = true
+    http.start do |http|
+      request = Net::HTTP::Get.new('/v1/posts/all', {'User-Agent' => agent})
+      request.basic_auth @user, @pass
+      response = http.request(request)
+
+      data = REXML::Document.new(response.body)
+      data.elements.each("/posts/post") do |post|
+        @db.execute(
         "INSERT INTO posts
           (url, description, extended, created, accessed, hash) VALUES
           (?, ?, ?, JULIANDAY(?), JULIANDAY(?), ?);",
@@ -52,18 +71,27 @@ http.start do |http|
           post.attributes['extended'],
           post.attributes['time'].chop,
           post.attributes['time'].chop,
-          post.attributes['hash']
-      )
+          post.attributes['hash'])
 
-      post.attributes['tag'].split(' ').each do |tag|
-        db.execute(
-          "INSERT INTO post_tags
-          (hash, tag) VALUES
-          (?, ?);",
-          post.attributes['hash'],
-          tag
-        )
+          post.attributes['tag'].split(' ').each do |tag|
+            @db.execute(
+                %{INSERT OR IGNORE INTO tags (tag) VALUES (?);},
+                tag)
+            tag_id = @db.execute( %{ SELECT id FROM tags WHERE tag = ?}, tag)[0]
+                @db.execute(
+                "INSERT INTO post_tags (hash, tag_id)
+                VALUES (?, ?);",
+                  post.attributes['hash'],
+                  tag_id)
+        end
       end
     end
+  end
+  #}}}
+
 end
 
+import = ImportDelish.new(user, pass, db)
+import.create_database
+import.get_all_tags
+

data/lib/delish_bookmark_search.rb

@@ -249,14 +249,14 @@ class Delish_Bookmark_Search
     end
 
     statement +=  " FROM posts"
-    @tag_count.times { |i| statement += ", post_tags AS pt#{i}" }
+    @tag_count.times { |i| statement += ", post_tags AS pt#{i}, tags AS t#{i}" }
     statement += " WHERE "
-    @tag_count.times { |i| statement += "pt#{i}.hash == posts.hash AND " }
+    @tag_count.times { |i| statement += "pt#{i}.hash == posts.hash AND pt#{i}.tag_id = t#{i}.id AND " }
 
     tag_count = 0
     @sss.each_with_index do |ssql,i|
       while ssql.statement.include? "PLACEHOLDER"
-        ssql.statement.sub!("PLACEHOLDER", "pt#{tag_count}.tag")
+        ssql.statement.sub!("PLACEHOLDER", "t#{tag_count}.tag")
         tag_count += 1
       end
       statement += ssql.statement

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: delish
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2007-07-03 00:00:00 -06:00
+  version: 0.6.1
+date: 2007-07-04 00:00:00 -06:00
 summary: Allows use of del.icio.us bookmarksfrom the commandline with minimum keystrokes
 require_paths: 
 - lib
 email: frioux@gmail.com
-homepage: http://afoolishmanifesto.com
+homepage: http://delish.rubyforge.com
 rubyforge_project: 
 description: 
 autorequire: