rrename 0.2.0 → 0.3.0

data/CHANGES

@@ -0,0 +1,13 @@
+== Version Current
+
+== Version 0.3.0
+
+* work only on the selection
+* make add and remove files redo / undoable
+* apply command from menu automatically
+* added default replace schemas
+* changed quoting of replace string \\1 -> \1
+
+== Version 0.2.0
+
+== Version 0.1

data/Makefile

@@ -1,11 +1,11 @@
 
-VERSION=0.2.0
+VERSION=0.3.0
 DIST=../dist
 NAME=rrename
 DIR=${NAME}
 TARGZ=${DIR}-${VERSION}.tar.gz
 DEST=${DIST}/${DIR}
-FILES=${NAME}.glade ${NAME}.rb ${NAME}.gemspec Makefile TODO README
+FILES=${NAME}.glade ${NAME}.rb ${NAME}.gemspec replaceschemas.yaml Makefile CHANGES TODO README
 GEM=${NAME}-${VERSION}.gem
 GEMSPEC=${NAME}.gemspec
 
@@ -17,13 +17,13 @@ release: ${DIST}/${TARGZ}
 gem: ${DIST}/${GEM}
 
 
-${DIST}/${TARGZ}:
+${DIST}/${TARGZ}: $(FILES)
 	rm -rfv  ${DEST}
 	mkdir ${DEST}
 	cp ${FILES} ${DEST}
 	tar -C ${DIST} -cvzf ${DIST}/${TARGZ} ${DIR} 
 
-${DIST}/${GEM}:
+${DIST}/${GEM}: $(FILES)
 	gem build ${GEMSPEC}
 	mv ${GEM} ${DIST}
 

data/README

@@ -1,5 +1,4 @@
-RRENAME
-=======
+= Ruby Rename 
 
 A GNOME2 based tool for interactively renameing files 
 with regular expressions. 

data/TODO

@@ -1,8 +1,4 @@
-TODO
-====
-
-* work only on the selection
-* make add and remove files redo / undoable
-* apply command from menu automatically
+= TODO
+* provide replaceSchema saveAs button and dialog
 * figure out how to make translation
 * write documentation

data/replaceschemas.yaml

@@ -0,0 +1,90 @@
+--- 
+replace dots: !ruby/object:ReplaceSchema 
+  initializeCode: n=1
+  iterationCode: n=n+1
+  name: replace dots
+  pattern: "\\.(?!...$)"
+  substitute: "_"
+titlecase: !ruby/object:ReplaceSchema 
+  initializeCode: n=0
+  iterationCode: "ausnahmen=[\"of\"]\n\ns=match[0].gsub(/[^ _]*/) { |m| \n\tif ausnahmen.include?
+    m then\n\t\tm\n\telse\n\t\tm.capitalize\n\tend}"
+  name: titlecase
+  pattern: "^.*"
+  substitute: "#{s}"
+default: !ruby/object:ReplaceSchema 
+  initializeCode: n=0
+  iterationCode: n=n+1
+  name: default
+  pattern: ''
+  substitute: ''
+capitalize: !ruby/object:ReplaceSchema 
+  initializeCode: n=0
+  iterationCode: n=n+1
+  name: capitalize
+  pattern: "^.*"
+  substitute: "#{match[0].capitalize}"
+flatten dirs: !ruby/object:ReplaceSchema 
+  initializeCode: n=0
+  iterationCode: n=n+1
+  name: flatten dirs
+  pattern: "^(.*)$"
+  substitute: "../#{file.parent.name}_-_\\1"
+replace underscores: !ruby/object:ReplaceSchema 
+  initializeCode: n=1
+  iterationCode: n=n+1
+  name: replace underscores
+  pattern: "_"
+  substitute: " "
+"foo - 01 bar.bla -> foo - bar - 01 of 22.bla": !ruby/object:ReplaceSchema 
+  initializeCode: >-
+    n=1
+
+    max=22
+
+  iterationCode: n=n+1
+  name: "foo - 01 bar.bla -> foo - bar - 01 of 22.bla"
+  pattern: "(.*)_-_([0-9]+)_(.*)(\\....)"
+  substitute: "\\1_-_\\3_-_\\2_of_#{max}\\4"
+replace date to iso: !ruby/object:ReplaceSchema 
+  initializeCode: n=0
+  iterationCode: n=n+1
+  name: replace date to iso
+  pattern: "(\\d\\d)\\.(\\d\\d)\\.(\\d\\d+)"
+  substitute: "\\3-\\2-\\1"
+downcase: !ruby/object:ReplaceSchema 
+  initializeCode: n=0
+  iterationCode: n=n+1
+  name: downcase
+  pattern: "^.*"
+  substitute: "#{match[0].downcase}"
+something -> 01 of XX: !ruby/object:ReplaceSchema 
+  initializeCode: n=0
+  iterationCode: n=n+1
+  name: something -> 01 of XX
+  pattern: "_Track.*(?=\\.)"
+  substitute: "_#{\"%0.2i\" % n}_of_XX"
+insert parent name: !ruby/object:ReplaceSchema 
+  initializeCode: "n=0
+
+    "
+  iterationCode: >-
+    n=n+1
+
+    p=file.parent.name
+
+  name: insert parent name
+  pattern: Titel
+  substitute: "#{p}"
+replace whitespace: !ruby/object:ReplaceSchema 
+  initializeCode: n=1
+  iterationCode: n=n+1
+  name: replace whitespace
+  pattern: " "
+  substitute: "_"
+shrink whitespace: !ruby/object:ReplaceSchema 
+  initializeCode: n=1
+  iterationCode: n=n+1
+  name: shrink whitespace
+  pattern: "([_ ])*"
+  substitute: "\\1"

data/rrename.gemspec

@@ -6,7 +6,7 @@ spec = Gem::Specification.new do |s|
   #### Basic information.
   
   s.name = 'rrename'
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.summary = <<-EOF
 A GNOME2 based tool for interactively renameing files 
 with regular expressions. 
@@ -27,8 +27,8 @@ EOF
 
   #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)
   
-  s.files = ["rrename.glade", "rrename.rb", "rrename.gemspec", 
-    "Makefile", "TODO", "README"]
+  s.files = ["rrename.glade", "rrename.rb", "replaceschemas.yaml",
+      "rrename.gemspec", "Makefile", "TODO", "CHANGES", "README"]
   
   
   #### Load-time details: library and application (you will need one or both).

data/rrename.glade

@@ -54,7 +54,7 @@
 			  <signal name="activate" handler="on_addfiles" last_modification_time="Tue, 26 Apr 2005 20:53:14 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3">
+			    <widget class="GtkImage" id="image5">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-directory</property>
 			      <property name="icon_size">1</property>
@@ -169,6 +169,19 @@
 		</widget>
 	      </child>
 
+	      <child>
+		<widget class="GtkMenuItem" id="replace_schema">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">_Replace</property>
+		  <property name="use_underline">True</property>
+
+		  <child>
+		    <widget class="GtkMenu" id="replace_schema_menu">
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
 	      <child>
 		<widget class="GtkMenuItem" id="settings1">
 		  <property name="visible">True</property>
@@ -178,8 +191,13 @@
 		    <widget class="GtkMenu" id="settings1_menu">
 
 		      <child>
-			<widget class="GtkSeparatorMenuItem" id="separator3">
+			<widget class="GtkCheckMenuItem" id="replace_selection">
 			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">work only on selected items</property>
+			  <property name="label" translatable="yes">only replace selection</property>
+			  <property name="use_underline">True</property>
+			  <property name="active">False</property>
+			  <signal name="activate" handler="on_replace_selection_activate" last_modification_time="Sun, 03 Jul 2005 19:07:22 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -187,6 +205,12 @@
 		</widget>
 	      </child>
 
+	      <child>
+		<widget class="GtkSeparatorMenuItem" id="separator3">
+		  <property name="visible">True</property>
+		</widget>
+	      </child>
+
 	      <child>
 		<widget class="GtkMenuItem" id="help1">
 		  <property name="visible">True</property>
@@ -350,7 +374,7 @@
 			<widget class="GtkEntry" id="replace_entry">
 			  <property name="visible">True</property>
 			  <property name="tooltip" translatable="yes">insert string here 
-\\1 \\2  =&gt; matched region
+\1 \2  =&gt; matched region
 #{ruby expression}
 #{n} =&gt; 1,2,3..n 
 #{&quot;%.2i&quot; % n} =&gt; 01, 02, 03 ...

data/rrename.rb

@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2005 Jens Lincke
 # 
-# Last edited: 2005-06-27 23:52:15 by jens on wh11-618.st.uni-magdeburg.de
+# Last edited: 2005-09-05 19:33:56 by jens on wh11-618.st.uni-magdeburg.de
 #
 # This program is free software.
 # You can distribute/modify this program under the terms of
@@ -65,6 +65,10 @@ class Standoff
 
 end
 
+#
+# Command / CommandProcessor Design Pattern
+#
+
 class CommandProcessor
   attr_accessor :history
 
@@ -201,22 +205,27 @@ class AddFilesCommand
     
   def initialize(renameFiles, files)
     @renameFiles= renameFiles
-    @log= renameFiles.log
-    @files= files
+    @fileset=     renameFiles.fileset
+    @log=         renameFiles.log
+    @files=       files
   end
+
   def exec
-    @files.each {|filename|
+    @fileEntries = @files.collect {|filename|
       file= GLib.filename_to_utf8(filename)
-      @renameFiles.fileset.add(file)  
+      @fileset.add(file)  
     }      
   end
 
   def redo
+     @fileset.add_entries @fileEntries 
   end
   
   def undo
+    p "remove" +  @fileEntries.to_s
+    @fileset.remove_entries @fileEntries 
   end
-
+  
   def to_s
     return "add files to list"
   end
@@ -237,10 +246,11 @@ class RemoveSelectedCommand
 
   def undo
     @log.p "undo remove files from list: "  
-    @fileset.addEntries(@removed)
+    @fileset.add_entries(@removed)
   end
   
   def redo
+    @fileset.remove_entries(@removed)
   end
 
   def to_s
@@ -276,9 +286,10 @@ class FileSet
   attr_accessor :log
  
   def initialize(renameFiles)
-    @renameFiles= renameFiles
-    @log= renameFiles.log
-    @entries= Hash.new
+    @renameFiles = renameFiles
+    @log         = renameFiles.log
+    @entries     = Hash.new
+    @options     = renameFiles.options
   end
   
   def markup(regex_str)
@@ -291,28 +302,28 @@ class FileSet
   end
 
   def add(file)
-    addToNode(file, nil)
+    return add_to_node(file, nil)
   end
   
-  def addToNode(file, node)
+  def add_to_node(file, node)
     filename= GLib.filename_from_utf8(file)
     fileStat= File.stat(filename)
     filename= GLib.filename_from_utf8(file)
     if File.exist?(filename) then
       @log.p "added #{file}"
- 
       if node then
-          addEntry(FileEntry.new(file, self), node)
+          return add_entry(FileEntry.new(file, self), node)
       else
-        addEntry(FileEntry.new(file, self))
+        return add_entry(FileEntry.new(file, self))
       end  
 
     else
       @log.p file + " don't exist"
+      return nil
     end
   end
 
-  def addEntryToNode(entry, parent)
+  def add_entry_to_node(entry, parent)
     if(parent) then
       entry.parent= parent
     end
@@ -320,15 +331,15 @@ class FileSet
     entry.iter[0]= entry
   end
 
-  def includes?(entry)
+  def include?(entry)
     return @entries[entry.expand_path]
   end
 
-  def addEntry(entry)
-    if not includes?(entry) then 
+  def add_entry(entry)
+    if not include?(entry) then 
       @entries[entry.expand_path]=entry
       parent= @entries[File.expand_path(entry.path)]
-      addEntryToNode(entry, parent)
+      add_entry_to_node(entry, parent)
     end
   end
     
@@ -341,23 +352,43 @@ class FileSet
     end
   end
   
+  def sub_backslashes(string)
+    string.gsub(/\\([0-9])/,"\\\\\\\\\\1")
+  end
+
+  def selection_each &aBlock 
+    if @options.only_replace_selection then
+      @renameFiles.treeview.selection.selected_each { |*args| 
+        aBlock.call *args}
+    else
+      @renameFiles.treestore.each { |*args| aBlock.call *args}
+    end
+  end
+
   def replace(replaceSchema)
     file=nil
+    match=nil
     aBinding= binding
     save_eval(replaceSchema.initializeCode, aBinding)
     @regex= Regexp.new(replaceSchema.pattern)
-    @renameFiles.treestore.each do |model,path,iter|
+    substitute= '"'+sub_backslashes(replaceSchema.substitute)+'"'
+    
+    
+    selection_each { |model,path,iter|
       file= iter[0]
-      if file.match(@regex) then
+      if match= file.match(@regex) then
         save_eval(replaceSchema.iterationCode, aBinding)
-        substitute= save_eval('"'+replaceSchema.substitute+'"', aBinding)
-        file.replace(@regex,substitute) if substitute
+        evaled_substitute= save_eval(substitute, aBinding)
+        file.replace(@regex,evaled_substitute) if evaled_substitute
         model.signal_emit("row-changed", path, iter)
       end 
-    end
+    }
+  rescue RegexpError 
+    @log.p "RegexpError: " + replaceSchema.pattern
   end
   
   def file_history_pop
+    
     @renameFiles.treestore.each do |model,path,iter|
       file= iter[0]
       oldname= file.name
@@ -373,33 +404,38 @@ class FileSet
     end
   end
 
-  def remove_selected()
-    remove_list= []
-    # iter k�nnen nicht direkt entfernt werden
-    removed= []
-    @renameFiles.treeview.selection.selected_each {|model, path, iter| 
-      remove_list << iter
-      removed << iter[0]
-    }
-    remove_list.each { |iter|
+  def remove_iters(iters)
+    entries= iters.collect {|each| each[0]}
+    iters.each { |iter|
       remove_iter(iter)
     }
-    return removed
+    entries.each { |each| @entries.delete each.expand_path}
+    return entries
+  end
+
+  def remove_selected()
+    remove_entries @renameFiles.selected_entries
   end
   
   def remove_iter(iter)
     if @renameFiles.treestore.iter_is_valid? iter then
       @log.p "remove #{iter[0].name} from list"
       @entries.delete iter[0].expand_path
-        
       @renameFiles.treestore.remove(iter) 
     end
   end
   
-  def addEntries(entries)
-    entries.each { |entry| addEntry(entry) }
+  def add_entries(entries)
+    entries.each { |entry| add_entry(entry) }
   end
 
+  def remove_entries(entries)
+    iters= @renameFiles.sub_iters_of_entries(entries)
+    remove_iters(iters)
+  end
+
+
+
   def undo_rename
     @renameFiles.treestore.each { |model,path,iter|
       file= iter[0]
@@ -431,7 +467,8 @@ class FileEntry
     @path=     File.dirname(filename)
     @name=     File.basename(filename)
     @old_name= @name.clone
-    @colors=   ["red", "green", "blue", "orange"]
+    @colors=   ["red", "blue", "orange","darkred","darkblue","yellow",
+      "darkgreen"]
     @fileset=  fileset
     @name_history=   []
     @rename_history= []
@@ -491,9 +528,9 @@ class FileEntry
     if old_name_name then
       old_name_name
       @old_name= old_name_name[0]
-      @name= old_name_name[1]
+      @name=     old_name_name[1]
       from= GLib.filename_from_utf8(@path + "/" + @old_name)
-      to= GLib.filename_from_utf8(@path + "/" + @name)
+      to=   GLib.filename_from_utf8(@path + "/" + @name)
       
       if not File.exists?(from) or not File.exists?(to) then
         @log.p "rename #{to} to #{from} back" 
@@ -603,6 +640,7 @@ class RenameFiles
     glade_file= find_in_load_path("/RenameFiles/rrename.glade")
     glade_file= find_in_load_path("/rrename.glade") if not glade_file 
     glade_file= File.dirname($0) + "/rrename.glade" if not glade_file 
+    @base_dir=  File.dirname(glade_file)
     @glade= GladeXML.new(glade_file, nil, "rrename"){|handler| method(handler)}
     
     # get widgets from glade 
@@ -615,13 +653,16 @@ class RenameFiles
     @log_view=                 @glade.get_widget("log_textview")
     @textview_eval_initialize= @glade.get_widget("textview_eval_initialize")
     @textview_eval_iteration=  @glade.get_widget("textview_eval_eachmatch")
-    @settings_menu=            @glade.get_widget("settings1_menu")
+    # @settings_menu=            @glade.get_widget("settings1_menu")
+    @replace_schema_menu=      @glade.get_widget("replace_schema_menu")
     @replace_schema_name=      @glade.get_widget("replace_schema_name")
+    
 
     # initialize 
     @replace_schemas=          Hash.new
     add_replace_schema(replaceschema)    
     
+    @options=            OpenStruct.new
     @logbuffer=          @log_view.buffer
     @log=                Log.new(@logbuffer, @appbar)
     @comandProcessor=    CommandProcessor.new(self)
@@ -681,8 +722,42 @@ class RenameFiles
   end
 
   def add_replace_schema(replaceSchema)
-    @replace_schemas[replaceSchema.name]= replaceSchema
-    update_setting_menu
+    if @replace_schemas[replaceSchema.name] then
+      @replace_schemas[replaceSchema.name]= replaceSchema
+    else
+      @replace_schemas[replaceSchema.name]= replaceSchema
+      update_replace_schema_menu
+    end
+  end
+  
+  def file_entry_iters
+    result= []
+    @treestore.each{ |model,path,iter| result << iter}
+    return result
+  end
+  
+  def selected_iters()
+    result= []
+    @treeview.selection.selected_each {|model, path, iter| 
+      result << iter}
+    return result
+  end
+
+  def selected_entries()
+    return selected_iters.collect { |each| each[0]}
+  end
+  
+  def sub_iters_of_entries(entries)
+    subEntries= entries.clone
+    iters=[]
+    file_entry_iters.each { |iter| 
+      if subEntries.include? iter[0] or 
+          subEntries.include? iter[0].parent then
+        iters << iter
+        subEntries << iter[0]
+      end
+    }
+    return iters
   end
 
   def replaceschema
@@ -702,6 +777,11 @@ class RenameFiles
     @textview_eval_iteration.buffer.text  = replaceschema.iterationCode      
   end
 
+  def set_replaceschema_named(name)
+    set_replaceschema(@replace_schemas[name])
+  end
+
+
   def confpath
     GLib.home_dir+"/"+CONFDIR+"/"
   end
@@ -723,28 +803,36 @@ class RenameFiles
 
   def load_replace_schemas
     file= confpath+REPLACESCHEMAS
+    if not File.exists?(file)
+      @log.p "loading default replace schemas"
+      file=@base_dir+"/"+REPLACESCHEMAS
+    end
+    load_replace_schemas_from_file( file)
+  end
+
+  def load_replace_schemas_from_file( file)
     begin
       @replace_schemas= YAML::load(File.open(file))
       set_replaceschema= @replace_schemas[0]
     rescue
       @log.p "can not open "+file
     end
-    update_setting_menu
+    update_replace_schema_menu
   end
-
-  def update_setting_menu
-    @settings_menu.each { |each|
-      @settings_menu.remove each
+      
+  def update_replace_schema_menu
+    @replace_schema_menu.each { |each|
+      @replace_schema_menu.remove each
     }
     @replace_schemas.sort.each { |name, replaceSchema|
       item= Gtk::MenuItem.new(replaceSchema.name)
-      @settings_menu.append(item)
+      @replace_schema_menu.append(item)
       item.signal_connect( "activate" ) {
-        set_replaceschema replaceSchema
+        set_replaceschema_named(replaceSchema.name)
         @comandProcessor.exec(@replaceCommand)
       }
     }
-    @settings_menu.show_all
+    @replace_schema_menu.show_all
     
     @replace_schemas.sort.each { |name, replaceSchema|
       @replace_schema_name.append_history(0,name)
@@ -806,13 +894,17 @@ class RenameFiles
   
   def on_replace_schema_delete
     @replace_schemas.delete(replaceschema.name)
-    update_setting_menu
+    update_replace_schema_menu
   end
 
   def on_replace_schema_name_changed
     set_replaceschema @replace_schemas[@replace_schema_name.gtk_entry.text]
   end
 
+  def on_replace_selection_activate(*widget)
+    @options.only_replace_selection=  widget[0].active?
+  end
+
   def on_quit(*widget)
     save_replace_schemas
     Gtk.main_quit
@@ -838,7 +930,7 @@ class RenameFiles
     return result
   end
 
-  def afterStart
+  def after_start
     load_replace_schemas
     set_replaceschema @replace_schemas["default"]
     if @options.recursive then
@@ -849,10 +941,10 @@ class RenameFiles
   end
 
   def parse_options(args)
-    @options= OpenStruct.new
     @options.verbose=   false
     @options.print=     true
     @options.recursive= false
+    @options.only_replace_selection= false
     @file_list= []
     
 
@@ -889,7 +981,7 @@ end
 
 @app= RenameFiles.new
 Thread.new {
-   @app.afterStart
+   @app.after_start
 }
 Gtk.main
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: rrename
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2005-06-28
+  version: 0.3.0
+date: 2005-09-05
 summary: A GNOME2 based tool for interactively renameing files  with regular expressions.
 require_paths: 
   - lib
@@ -29,9 +29,11 @@ authors:
 files: 
   - rrename.glade
   - rrename.rb
+  - replaceschemas.yaml
   - rrename.gemspec
   - Makefile
   - TODO
+  - CHANGES
   - README
 test_files: []
 rdoc_options: []