dle 0.1.7 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925684c19f7b8b0f4e34406a8d6954e7a6b3c95b
-  data.tar.gz: 9fc9e15525c47d1d64d9e60a72778fc4583bc61e
+  metadata.gz: c1222ce5b458c3140edf473d1505c02fc789edaf
+  data.tar.gz: e172707845f3c78cc6d5bcff8a2f4ae84eae6786
 SHA512:
-  metadata.gz: 896a00ec5bb4c4c89b49819d0a276df2cbaa19b6faf2230f2a81b537b77d038b5b8633348d891a99f0bcb6317b34714175daa49bdc7fdc097b3e71f4a0123e65
-  data.tar.gz: 774d08af7e89e476569a4c69d7184bbc5a949ca5a18368d0e6b3d304de99fe7b4455d3796f66cf090114ff2a76722a4aca44047d8b5dc7feb63fa78e92b87430
+  metadata.gz: 730402aa582c113b6904b3fd511c396679b4621a8981e1caafc7faa174adcca70be21e92e8993fd632595ec5db49cf8ee19729491cb316df5579b50519003447
+  data.tar.gz: 816a8bb37cde6ecae9b49c40392ea89168222495271794d8a7eb3350236231de006232507f116a9aa055a8cafdb7e774c33ff3eb2fe6367b9d0d1d89ec1d2414

data/README.md

@@ -5,11 +5,12 @@ You can copy, move, rename, chmod, chown or remove individual files or directori
 
 **BETA product, use at your own risk, use `--simulate` to be sure, always have a backup!**
 
-**[» See it in action!](https://www.youtube.com/watch?v=-xfnx3VQvNQ)**
+[![YouTube](http://img.youtube.com/vi/-xfnx3VQvNQ/mqdefault.jpg)](https://www.youtube.com/watch?v=-xfnx3VQvNQ)
+**[▶ See it in action](https://www.youtube.com/watch?v=-xfnx3VQvNQ)**
 
 ## Requirements
 
-You will need a UNIX system with a working Ruby installation, sorry Windozer!
+You will need a UNIX system with a working Ruby (>= 1.9.3) installation, sorry Windozer!
 
 ## Installation
 
@@ -28,16 +29,26 @@ Note that you need a blocking call to the editor (for GUI editors). Sublime and
 To get a list of available options invoke DLE with the `--help` or `-h` option:
 
     Usage: dle [options] base_directory
+    # Application options
         -d, --dotfiles                   Include dotfiles (unix invisible)
         -r, --skip-review                Skip review changes before applying
         -s, --simulate                   Don't apply changes, show commands instead
         -f, --file DLFILE                Use input file (be careful)
         -o, --only pattern               files, dirs or regexp (without delimiters)
                                            e.g.: dle ~/Movies -o "(mov|mkv|avi)$"
+        -a, --apply NAMED,FILTERS        Filter collection with saved filters
+        -q, --query                      Filter collection with ruby code
+        -e, --edit FILTER                Edit/create filter scripts
+
+    # General options
         -m, --monochrome                 Don't colorize output
         -h, --help                       Shows this help
         -v, --version                    Shows version and other info
         -z                               Do not check for updates on GitHub (with -v/--version)
+            --console                    Start console to play around with the collection (requires pry)
+
+
+
 
 Change into a directory you want to work with and invoke DLE:
 
@@ -62,6 +73,23 @@ Your editor will open with a list of your directory structure which you can edit
     * Copy
     * Delete
 
+
+### Filters
+
+You can easily filter your movies with Ruby. It's not hard, just look at these examples.
+
+```ruby
+# Filter by name, for regex see http://rubular.com
+@fs.index.reject! {|inode, node| node.basename =~ /whatever/i }
+
+# Only big files
+@fs.index.select! {|inode, node| node.file? && node.size > 1024 * 1024 * 10 }
+
+# Sort by size
+@fs.index.replace Hash[@fs.index.sort_by{|inode, node| node.size }.reverse]
+```
+
+
 ## Caveats
 
 DLE relies on inode values, do not use with hardlinks! This may lead to unexpected file operations or data loss!

data/VERSION

@@ -1 +1 @@
-0.1.7
+1.0.1

data/lib/dle.rb

@@ -18,6 +18,7 @@ require "dle/filesystem/destructive"
 require "dle/filesystem/softnode"
 require "dle/filesystem/node"
 require "dle/filesystem"
+require "dle/application/filter"
 require "dle/application/dispatch"
 require "dle/application"
 

data/lib/dle/application.rb

@@ -8,6 +8,7 @@ module Dle
   class Application
     attr_reader :opts
     include Dispatch
+    include Filter
     include Helpers
 
     # =========
@@ -30,27 +31,47 @@ module Dle
       @editor = which_editor
       @opts = {
         dispatch: :index,
+        console: false,
         dotfiles: false,
         check_for_updates: true,
         review: true,
+        select_scripts: false,
         simulate: false,
+        query: false,
       }
       yield(self)
     end
 
+    def collection_size_changed cold, cnew, reason = nil
+      if cold != cnew
+        log(
+          "We have filtered " << c("#{cnew}", :magenta) <<
+          c(" nodes") << c(" (#{cnew - cold})", :red) <<
+          c(" from originally ") << c("#{cold}", :magenta) <<
+          (reason ? c(" (#{reason})", :blue) : "")
+        )
+      end
+    end
+
     def parse_params
       @optparse = OptionParser.new do |opts|
         opts.banner = "Usage: dle [options] base_directory"
 
+        opts.separator(c "# Application options", :blue)
         opts.on("-d", "--dotfiles", "Include dotfiles (unix invisible)") { @opts[:dotfiles] = true }
         opts.on("-r", "--skip-review", "Skip review changes before applying") { @opts[:review] = false }
         opts.on("-s", "--simulate", "Don't apply changes, show commands instead") { @opts[:simulate] = true ; @opts[:review] = false }
         opts.on("-f", "--file DLFILE", "Use input file (be careful)") {|f| @opts[:input_file] = f }
         opts.on("-o", "--only pattern", c("files", :blue) << c(", ") << c("dirs", :blue) << c(" or regexp (without delimiters)"), "  e.g.:" << c(%{ dle ~/Movies -o "(mov|mkv|avi)$"}, :blue)) {|p| @opts[:pattern] = p }
+        opts.on("-a", "--apply NAMED,FILTERS", Array, "Filter collection with saved filters") {|s| @opts[:select_scripts] = s }
+        opts.on("-q", "--query", "Filter collection with ruby code") { @opts[:query] = true }
+        opts.on("-e", "--edit FILTER", "Edit/create filter scripts") {|s| @opts[:dispatch] = :edit_script; @opts[:select_script] = s }
+        opts.separator("\n" << c("# General options", :blue))
         opts.on("-m", "--monochrome", "Don't colorize output") { logger.colorize = false }
         opts.on("-h", "--help", "Shows this help") { @opts[:dispatch] = :help }
         opts.on("-v", "--version", "Shows version and other info") { @opts[:dispatch] = :info }
         opts.on("-z", "Do not check for updates on GitHub (with -v/--version)") { @opts[:check_for_updates] = false }
+        opts.on("--console", "Start console to play around with the collection (requires pry)") {|f| @opts[:console] = true }
       end
 
       begin

data/lib/dle/application/dispatch.rb

@@ -14,6 +14,12 @@ module Dle
         end
       end
 
+      def dispatch_edit_script
+        log("Opening file in editor...")
+        f = record_filter(filter_script(@opts[:select_script]))
+        log("Saved file " << c(f, :magenta))
+      end
+
       def dispatch_help
         logger.log_without_timestr do
           @optparse.to_s.split("\n").each(&method(:log))
@@ -96,93 +102,123 @@ module Dle
         abort("Base directory is empty or not readable", 1) if @fs.index.empty?
         log("indexed #{c "#{human_number @fs.index.count} nodes", :magenta}") if @fs.index.count > 1000
 
-        file = "#{Dir.tmpdir}/#{SecureRandom.urlsafe_base64}"
-        begin
-          # read input file or open editor
-          if @opts[:input_file]
-            ifile = File.expand_path(@opts[:input_file])
-            if FileTest.file?(ifile) && FileTest.readable?(ifile)
-              log "processing file..."
-              @dlfile = DlFile.parse(ifile)
+        if @opts[:console]
+          log "You have access to the collection with " << c("@fs", :magenta)
+          log "Apply existent select script with " << c("apply_filter(@fs, 'filter_name')", :magenta)
+          log "Type " << c("exit", :magenta) << c(" to leave the console.")
+          begin
+            binding.pry(quiet: true)
+            abort c("No changes, nothing to do..."), 0
+          rescue NoMethodError => ex
+            raise ex unless ex.message["undefined method `pry'"]
+            abort c("The pry gem is required to display the console. Please install it: " << c("gem install pry", :blue)), 3
+          end
+        else
+          file = "#{Dir.tmpdir}/#{SecureRandom.urlsafe_base64}"
+          begin
+            # read input file or open editor
+            if @opts[:input_file]
+              ifile = File.expand_path(@opts[:input_file])
+              if FileTest.file?(ifile) && FileTest.readable?(ifile)
+                log "processing file..."
+                @dlfile = DlFile.parse(ifile)
+              else
+                abort "Input file not readable: " << c(ifile, :magenta)
+              end
             else
-              abort "Input file not readable: " << c(ifile, :magenta)
-            end
-          else
-            FileUtils.mkdir_p(File.dirname(file)) if !FileTest.exist?(File.dirname(file))
-            if !FileTest.exist?(file) || File.read(file).strip.empty?
-              notifier do
-                sleep 3
-                log "writing result list to file..."
-              end.perform do
-                File.open(file, "w") {|f| f.write @fs.to_dlfile }
+              old_count = @fs.index.count
+              if @opts[:query]
+                apply_filter(@fs, record_filter)
+                collection_size_changed old_count, @fs.index.count, "custom filter"
+                old_count = @fs.index.count
               end
+
+              # filter
+              (@opts[:select_scripts] || []).each do |filter|
+                apply_filter(@fs, filter_script(filter))
+                collection_size_changed old_count, @fs.index.count, "filter: #{filter}"
+                old_count = @fs.index.count
+              end
+
+              # save file
+              FileUtils.mkdir_p(File.dirname(file)) if !FileTest.exist?(File.dirname(file))
+              if !FileTest.exist?(file) || File.read(file).strip.empty?
+                notifier do
+                  sleep 3
+                  log "writing result list to file..."
+                end.perform do
+                  File.open(file, "w") {|f| f.write @fs.to_dlfile }
+                end
+              end
+
+              # open editor
+              log "open list for editing..."
+              open_editor(file)
+              log "processing file..."
+              @dlfile = DlFile.parse(file)
             end
-            log "open list for editing..."
-            open_editor(file)
-            log "processing file..."
-            @dlfile = DlFile.parse(file)
-          end
 
-          # delta changes
-          @delta = @fs.delta(@dlfile)
+            # delta changes
+            @delta = @fs.delta(@dlfile)
 
-          # no changes
-          if @delta.all?{|_, v| v.empty? }
-            abort c("No changes, nothing to do..."), 0
-          end
+            # no changes
+            if @delta.all?{|_, v| v.empty? }
+              abort c("No changes, nothing to do..."), 0
+            end
 
-          # review
-          if @opts[:review]
-            @delta.each do |action, snodes|
-              logger.ensure_prefix c("[#{action}]\t", :magenta) do
-                snodes.each do |snode|
-                  if [:chown, :chmod].include?(action)
-                    log(c("#{snode.node.relative_path} ", :blue) << c(snode.is, :red) << c(" » ") << c(snode.should, :green))
-                  elsif [:cp, :mv].include?(action)
-                    log(c(snode.is, :red) << c(" » ") << c(snode.should, :green))
-                  else
-                    log(c(snode.is, :red) << " (#{snode.snode.mode})")
+            # review
+            if @opts[:review]
+              @delta.each do |action, snodes|
+                logger.ensure_prefix c("[#{action}]\t", :magenta) do
+                  snodes.each do |snode|
+                    if [:chown, :chmod].include?(action)
+                      log(c("#{snode.node.relative_path} ", :blue) << c(snode.is, :red) << c(" » ") << c(snode.should, :green))
+                    elsif [:cp, :mv].include?(action)
+                      log(c(snode.is, :red) << c(" » ") << c(snode.should, :green))
+                    else
+                      log(c(snode.is, :red) << " (#{snode.snode.mode})")
+                    end
                   end
                 end
               end
-            end
 
-            answer = ask("Do you want to apply these changes? [yes/no/edit]")
-            while !["y", "yes", "n", "no", "e", "edit"].include?(answer.downcase)
-              answer = ask("Please be explicit, yes/no/edit:")
+              answer = ask("Do you want to apply these changes? [yes/no/edit]")
+              while !["y", "yes", "n", "no", "e", "edit"].include?(answer.downcase)
+                answer = ask("Please be explicit, yes/no/edit:")
+              end
+              raise "retry" if ["e", "edit"].include?(answer.downcase)
+              abort("Aborted, nothing changed", 0) if !["y", "yes"].include?(answer.downcase)
             end
-            raise "retry" if ["e", "edit"].include?(answer.downcase)
-            abort("Aborted, nothing changed", 0) if !["y", "yes"].include?(answer.downcase)
+          rescue
+            $!.message == "retry" ? retry : raise
           end
-        rescue
-          $!.message == "retry" ? retry : raise
-        end
 
-        # apply changes
-        log "#{@opts[:simulate] ? "Simulating" : "Applying"} changes..."
-        @fs.opts[:verbose] = false
-        total_actions = @delta.map{|_, nodes| nodes.count }.inject(&:+)
-        actions_performed = 0
-        begin
-          notifier do
-            loop do
-              if BASH_ENABLED
-                logger.raw("\033]0;#{@opts[:simulate] ? "Simulated" : "Peformed"} #{human_number actions_performed}/#{human_number total_actions} changes\007", :print)
+          # apply changes
+          log "#{@opts[:simulate] ? "Simulating" : "Applying"} changes..."
+          @fs.opts[:verbose] = false
+          total_actions = @delta.map{|_, nodes| nodes.count }.inject(&:+)
+          actions_performed = 0
+          begin
+            notifier do
+              loop do
+                if BASH_ENABLED
+                  logger.raw("\033]0;#{@opts[:simulate] ? "Simulated" : "Peformed"} #{human_number actions_performed}/#{human_number total_actions} changes\007", :print)
+                end
+                sleep 1
               end
-              sleep 1
-            end
-          end.perform do
-            @delta.each do |action, snodes|
-              logger.ensure_prefix c("[apply-#{action}]\t", :magenta) do
-                snodes.each do |snode|
-                  actions_performed += 1
-                  Filesystem::Destructive.new(self, action, @fs, snode).perform
+            end.perform do
+              @delta.each do |action, snodes|
+                logger.ensure_prefix c("[apply-#{action}]\t", :magenta) do
+                  snodes.each do |snode|
+                    actions_performed += 1
+                    Filesystem::Destructive.new(self, action, @fs, snode).perform
+                  end
                 end
               end
             end
+          ensure
+            log "#{@opts[:simulate] ? "Simulated" : "Peformed"} #{human_number actions_performed} changes..."
           end
-        ensure
-          log "#{@opts[:simulate] ? "Simulated" : "Peformed"} #{human_number actions_performed} changes..."
         end
       end
     end

data/lib/dle/application/filter.rb

@@ -0,0 +1,36 @@
+module Dle
+  class Application
+    module Filter
+      def filter_script name
+        File.expand_path("~/.dle/#{name}.rb")
+      end
+
+      def apply_filter collection, file
+        app = @app
+        eval File.read(file), binding, file
+        collection
+      end
+
+      def permute_script collection, file = nil
+        file ||= "#{Dir.tmpdir}/#{SecureRandom.urlsafe_base64}"
+        FileUtils.mkdir(File.dirname(file)) if !File.exist?(File.dirname(file))
+        if !File.exist?(file) || File.read(file).strip.empty?
+          File.open(file, "w") {|f| f.puts("# Permute your collection, same as with the selector script filters.") }
+        end
+        system "#{cfg :application, :editor} #{file}"
+        eval File.read(file), binding, file
+        collection
+      end
+
+      def record_filter file = nil
+        file ||= "#{Dir.tmpdir}/#{SecureRandom.urlsafe_base64}.rb"
+        FileUtils.mkdir(File.dirname(file)) if !File.exist?(File.dirname(file))
+        if !File.exist?(file) || File.read(file).strip.empty?
+          FileUtils.cp("#{ROOT}/lib/dle/application/filter.tpl", file)
+        end
+        open_editor(file)
+        file
+      end
+    end
+  end
+end

data/lib/dle/application/filter.tpl

@@ -0,0 +1,55 @@
+# TIP: Using vim and want to get rid of this example shit?
+#      In nav-mode type: 100dd
+
+# Hey there,
+# to filter your records you will use Ruby
+# but don't be afraid, it's fairly simple.
+# Just look at the examples and referenced links.
+
+# Use ruby methods to narrow down you result set.
+#   * http://www.ruby-doc.org/core-2.1.1/File.html
+#   * http://www.ruby-doc.org/core-2.1.1/Enumerable.html
+
+# ====================================================
+# = Doc (remove, reuse or comment out the examples!) =
+# ====================================================
+
+puts "Filtering in #{@fs.base_dir}"
+@fs.index.select! do |inode, node|
+  # node has the following methods
+  #   * dir              => source movie directory (e.g. C:/Movies)
+  #   * relative_path    => relative path to @fs.base_dir
+  #   * mode             => file mode
+  #   * owner            => name of the file owner
+  #   * group            => name of the file group
+  #   * owngrp           => owner and group combined by a colon
+  #   * basename         => alias for File#basename
+  #   * dirname          => alias for File#dirname
+  #   * extname          => alias for File#extname
+  #   * stat             => alias for File#stat
+  #   * size             => alias for File#size
+  #   * directory?       => alias for FileTest#directory?
+  #   * file?            => alias for FileTest#file?
+  #   * symlink?         => alias for FileTest#symlink?
+
+  # The index is NOT NESTED! If you remove a directory node, all sub nodes
+  # will still be in the index!
+
+  # Set break point to interactively call methods from here.
+  # See http://pryrepl.org ory type "help" when you are in the REPL.
+  # Use exit or exit! to break out of REPL.
+  # binding.pry
+
+  # --------------------------------------------------------------
+
+  node.directory? && node.basename =~ /^[a-z0-9]+$/
+end
+
+# Filter by name, for regex see http://rubular.com
+@fs.index.reject! {|inode, node| node.basename =~ /whatever/i }
+
+# Only big files
+@fs.index.select! {|inode, node| node.file? && node.size > 1024 * 1024 * 10 }
+
+# Sort by size
+@fs.index.replace Hash[@fs.index.sort_by{|inode, node| node.size }.reverse]

data/lib/dle/helpers.rb

@@ -35,7 +35,7 @@ module Dle
       [].tap do |r|
         col_sizes = table.map{|col| col.map(&:to_s).map(&:length).max }
         headers.map(&:length).each_with_index do |length, header|
-          col_sizes[header] = [col_sizes[header], length].max
+          col_sizes[header] = [col_sizes[header] || 0, length || 0].max
         end
 
         # header

data/lib/dle/version.rb

@@ -1,4 +1,4 @@
 module Dle
-  VERSION = "0.1.7"
+  VERSION = "1.0.1"
   UPDATE_URL = "https://raw.githubusercontent.com/2called-chaos/dle/master/VERSION"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dle
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.0.1
 platform: ruby
 authors:
 - Sven Pachnit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -77,6 +77,8 @@ files:
 - lib/dle.rb
 - lib/dle/application.rb
 - lib/dle/application/dispatch.rb
+- lib/dle/application/filter.rb
+- lib/dle/application/filter.tpl
 - lib/dle/dl_file.rb
 - lib/dle/filesystem.rb
 - lib/dle/filesystem/destructive.rb
@@ -104,9 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Directory List Edit – Edit file structures in your favorite editor!
 test_files: []
-has_rdoc: