taggata 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 316d77bbeae3f1cb3224e6a8c5e7a0e35398be06
-  data.tar.gz: 847538ab0379d0a7db9d1470c6e04d9257190af5
+  metadata.gz: e853c0f197780d48d8bcda7ffb436a893b1aeac1
+  data.tar.gz: 78aeedd7b18c30966e0cf107b4959456952b4556
 SHA512:
-  metadata.gz: d648822f874cf532bd2976541cfb790b4ab104a388c8d30424e83d34baa78cf47a13144874968a2fe4da249dc712e570d36116e9363be4b685a19920c5f3c6d5
-  data.tar.gz: f49c703ac45544a2d3e6c5103aa226c98557c1f08f5984baf505cdfb3217d1340565c543b5cf22b422e1419296cf329678ac810c1ec7e4c9a71b7b39e209cb6b
+  metadata.gz: 27a4de1718710bfeb5dc3515132499a46f4ac7dd817b575b32ef35f5e2b49a45bca2712ba8a238e0bd7f18862b8f0dde18e02e87c42d945c77d5420795ef9a5d
+  data.tar.gz: 00acf36ba798372a80b61a94358cd1a51151e4e165dbf5014fdc9e62483a2ff7ddef299c186db54bd90b8f63084a3727a0f070186986bcb89ca9b93c4415e167

data/lib/taggata/cli.rb

@@ -1,8 +1,15 @@
-require 'clamp'
-require 'taggata'
-
 module Taggata
   module Cli
+
+    require 'clamp'
+    require 'taggata'
+    require 'taggata/cli/scan'
+    require 'taggata/cli/tag'
+    require 'taggata/cli/search'
+    require 'taggata/cli/remove'
+    require 'taggata/cli/list'
+    require 'taggata/cli/cleanup'
+    
     Clamp do
 
       option "--db-path", "DB_PATH", "path to the DB", :attribute_name => :db, :required => true do |db_path|
@@ -11,92 +18,18 @@ module Taggata
       option ['-v', '--verbose'], :flag, 'be verbose', :default => false
       option ['-q', '--quiet'], :flag, 'be quite', :default => false
 
-      subcommand "scan", "Scan the system" do
-
-        parameter "[ROOT]", "the root of the scanned tree", :attribute_name => :root_path, :default => './'
-
-        def execute
-          scanner = Taggata::Scanner.new db
-          root = Taggata::Persistent::Directory.find_or_create db, :name => root_path
-          scanner.process(root)
-        end
-
-      end
-
-      subcommand 'tag', 'tag a file matching query' do
-
-        parameter 'TAG_QUERY', 'the tag query', :attribute_name => :tag_query, :required => true
-        parameter 'SEARCH_QUERY', 'the query to search', :attribute_name => :search_query, :required => true
-
-        def execute
-          tags = ::Taggata::Parser::Tag.new(db).parse(tag_query)
-          files = ::Taggata::Parser::Query.new(db).parse(search_query)
-          db.transaction do
-            files.each do |file|
-              file.add_tags *tags[:add]
-              file.remove_tags *tags[:del]
-            end
-          end
-        end
-
-      end
-
-      subcommand 'search', "search the database" do
-
-        option "-c", :flag, 'show only matched count', :attribute_name => :count, :default => false
-        option "-n", :flag, 'show only names without paths', :attribute_name => :names, :default => false
-        parameter "QUERY", 'the query to perform', :attribute_name => :query, :required => true
-
-        def execute
-          results = ::Taggata::Parser::Query.new(db).parse(query)
-          if count?
-            puts results.count
-          else
-            if results.empty?
-              puts "No results matching the query."
-            else
-              method = names? ? :name : :path
-              results.each { |file| puts file.send(method) }
-            end
-          end
-        end
-
-      end
-
-      subcommand 'remove', 'remove files matching query' do
-
-        parameter "QUERY", 'the query to perform', :attribute_name => :query, :required => true
-
-        def execute
-          parser = ::Taggata::Parser::Query.new db
-          results = parser.parse query
-          db.transaction do
-            results.each(&:destroy)
-          end
-        end
-
-      end
-
-      subcommand 'list', 'list things in database' do
-
-        parameter 'TYPE', 'type of records to list, can be one of file, directory, tag', :attribute_name => :type, :required => true do |type|
-          signal_usage_error 'TYPE must be one of file, directory, tag' unless %(file directory tag).include? type
-          type.to_sym
-        end
-
-        def execute
-          case type
-          when :file
-            db.find(Taggata::Persistent::File, {}).each { |file| puts file.path }
-          when :directory
-            db.find(Taggata::Persistent::Directory, {}).each { |dir| puts dir.path }
-          when :tag
-            db.find(Taggata::Persistent::Tag, {}).each { |tag| puts tag.name }
-          end
-        end
-
-      end
-
+      subcommand 'scan', 'Scan the system', ScanCommand
+      
+      subcommand 'tag', 'Tag a file matching query', TagCommand
+ 
+      subcommand 'search', "Search the database", SearchCommand
+  
+      subcommand 'remove', 'Remove files matching query', RemoveCommand
+ 
+      subcommand 'list', 'List things in database', ListCommand
+ 
+      subcommand 'cleanup', 'Remove stale entries from the database', CleanupCommand
+  
     end
   end
 end

data/lib/taggata/cli/cleanup.rb

@@ -0,0 +1,25 @@
+module Taggata
+  module Cli
+    class CleanupCommand < Clamp::Command
+
+      option %w(-t --tags), :flag, 'remove unused tags', :default => true, :attribute_name => :tags
+      
+      def execute
+        remove_tags if tags?
+      end
+
+      private
+
+      def remove_tags
+        tags = @db.find_tags_without_files
+        count = @db.destroy(Taggata::Persistent::Tag, tags.map(&:to_hash)) unless tags.empty?
+        puts "Removed tags: #{format_count count}" unless @quiet
+      end
+
+      def format_count(count)
+        count.nil? ? 0 : count
+      end
+
+    end
+  end
+end

data/lib/taggata/cli/list.rb

@@ -0,0 +1,23 @@
+module Taggata
+  module Cli
+    class ListCommand < Clamp::Command
+
+      parameter 'TYPE', 'type of records to list, can be one of file, directory, tag', :attribute_name => :type, :required => true do |type|
+        signal_usage_error 'TYPE must be one of file, directory, tag' unless %(file directory tag).include? type
+        type.to_sym
+      end
+      
+      def execute
+        case type
+        when :file
+          @db.find(Taggata::Persistent::File, {}).each { |file| puts file.path }
+        when :directory
+          @db.find(Taggata::Persistent::Directory, {}).each { |dir| puts dir.path }
+        when :tag
+          @db.find(Taggata::Persistent::Tag, {}).each { |tag| puts tag.name }
+        end
+      end
+
+    end
+  end
+end

data/lib/taggata/cli/main.rb

@@ -0,0 +1,8 @@
+module Taggata
+  module Cli
+    class MainCommand < Clamp::Command
+      
+      
+    end
+  end
+end

data/lib/taggata/cli/remove.rb

@@ -0,0 +1,17 @@
+module Taggata
+  module Cli
+    class RemoveCommand < Clamp::Command
+
+      parameter "QUERY", 'the query to perform', :attribute_name => :query, :required => true
+      
+      def execute
+        parser = ::Taggata::Parser::Query.new @db
+        results = parser.parse query
+        @db.transaction do
+          results.each(&:destroy)
+        end
+      end
+
+    end
+  end
+end

data/lib/taggata/cli/scan.rb

@@ -0,0 +1,15 @@
+module Taggata
+  module Cli
+    class ScanCommand < Clamp::Command
+
+      parameter "[ROOT]", "the root of the scanned tree", :attribute_name => :root_path, :default => './'
+
+      def execute
+        scanner = Taggata::Scanner.new @db
+        root = Taggata::Persistent::Directory.find_or_create @db, :name => root_path
+        scanner.process(root)
+      end
+
+    end
+  end
+end

data/lib/taggata/cli/search.rb

@@ -0,0 +1,25 @@
+module Taggata
+  module Cli
+    class SearchCommand < Clamp::Command
+
+      option "-c", :flag, 'show only matched count', :attribute_name => :count, :default => false
+      option "-n", :flag, 'show only names without paths', :attribute_name => :names, :default => false
+      parameter "QUERY", 'the query to perform', :attribute_name => :query, :required => true
+ 
+      def execute
+        results = ::Taggata::Parser::Query.new(@db).parse(query)
+        if count?
+          puts results.count
+        else
+          if results.empty?
+            puts "No results matching the query."
+          else
+            method = names? ? :name : :path
+            results.each { |file| puts file.send(method) }
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/taggata/cli/tag.rb

@@ -0,0 +1,21 @@
+module Taggata
+  module Cli
+    class TagCommand < Clamp::Command
+
+      parameter 'TAG_QUERY', 'the tag query', :attribute_name => :tag_query, :required => true
+      parameter 'SEARCH_QUERY', 'the query to search', :attribute_name => :search_query, :required => true
+ 
+      def execute
+        tags = ::Taggata::Parser::Tag.new(@db).parse(tag_query)
+        files = ::Taggata::Parser::Query.new(@db).parse(search_query)
+        @db.transaction do
+          files.each do |file|
+            file.add_tags *tags[:add]
+            file.remove_tags *tags[:del]
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/taggata/db.rb

@@ -21,6 +21,10 @@ module Taggata
       adapter.find_untagged_files.map { |hash| Persistent::File.new_from_hash self, hash }
     end
 
+    def find_tags_without_files
+      adapter.find_tags_without_files.map { |hash| Persistent::Tag.new_from_hash self, hash }
+    end
+
     def destroy(klass, options)
       adapter.destroy(klass, options)
     end

data/lib/taggata/db_adapters/abstract.rb

@@ -12,6 +12,10 @@ module Taggata
         raise NotImplementedError
       end
 
+      def find_tags_without_files
+        raise NotImplementedError
+      end
+
       def transaction(&block)
         raise NotImplementedError
       end

data/lib/taggata/db_adapters/sequel.rb

@@ -22,6 +22,13 @@ module Taggata
         find(Taggata::Persistent::File, :id => untagged_ids)
       end
 
+      def find_tags_without_files
+        file_tags = db[Persistent::FileTag.table].select(:tag_id).map { |hash| hash[:tag_id] }
+        tag_ids = db[Persistent::Tag.table].select(:id).map { |hash| hash[:id] }
+        untagged_ids = tag_ids.reject { |id| file_tags.include? id }
+        find(Persistent::Tag, :id => untagged_ids)
+      end
+
       def destroy(klass, options)
         db[klass.table].where(options).delete
       end

data/lib/taggata/persistent/file.rb

@@ -32,7 +32,7 @@ module Taggata
       def remove_tags(*to_remove)
         return if to_remove.empty?
         current_tag_ids = tags.map(&:id)
-        to_remove_ids = current_tag_ids - to_remove.map(&:id)
+        to_remove_ids = current_tag_ids & to_remove.map(&:id)
         options = to_remove_ids.map { |tag_id| { :file_id => id, :tag_id => tag_id } }
         db.destroy(FileTag, options)
       end

data/lib/taggata/version.rb

@@ -1,3 +1,3 @@
 module Taggata
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taggata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Adam Ruzicka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -216,6 +216,13 @@ files:
 - bin/taggata
 - lib/taggata.rb
 - lib/taggata/cli.rb
+- lib/taggata/cli/cleanup.rb
+- lib/taggata/cli/list.rb
+- lib/taggata/cli/main.rb
+- lib/taggata/cli/remove.rb
+- lib/taggata/cli/scan.rb
+- lib/taggata/cli/search.rb
+- lib/taggata/cli/tag.rb
 - lib/taggata/constants.rb
 - lib/taggata/db.rb
 - lib/taggata/db_adapters.rb