diff --git a/Support/environment.rb b/Support/environment.rb
index a47a953..05e3808 100644
--- a/Support/environment.rb
+++ b/Support/environment.rb
@@ -130,6 +130,31 @@ def update_pbfind(search)
IO.popen('pbcopy -pboard find', 'w') {|pbcopy| pbcopy.write @pbfind}
end
+ # read file type filter
+ def search_filetype_filter
+
+ unless @search_filetype_filter
+ filetype_filter_command = "defaults read com.macromates.textmate fileTypeString 2>/dev/null"
+ @search_filetype_filter = OSX::PropertyList::load(Base64.decode64(%x{#{filetype_filter_command}}))
+ end
+
+ @search_filetype_filter
+
+ rescue
+ @search_filetype_filter = [] # oh the humanity!
+ end
+
+ # update file type filter
+ def update_search_filetype_filter(filetype_filter)
+ search_filetype_filter = filetype_filter
+
+ filter_history = Base64.encode64(search_filetype_filter.to_plist)
+
+ history_command = %Q|defaults write com.macromates.textmate fileTypeString -string #{e_sh filter_history} 2>/dev/null|
+ %x{#{history_command}}
+ rescue
+ end
+
end
end
diff --git a/Support/lib/search.rb b/Support/lib/search.rb
index 1365f0e..5b048d1 100644
--- a/Support/lib/search.rb
+++ b/Support/lib/search.rb
@@ -4,7 +4,7 @@ class AckInProject::Search
include AckInProject::Environment
AckInProject::Environment.ghetto_include %w(escape), binding
- attr_accessor :plist, :current_file, :lines_matched, :files_matched
+ attr_accessor :plist, :current_file, :lines_matched, :files_matched, :filter
def initialize(plist)
self.plist = plist;
@@ -79,6 +79,7 @@ def scrub(content)
def prepare_search
# TODO: bail if the search term is empty
result = plist['result']
+ fileTypes = result['fileTypeString'].split(',') if result['fileTypeString']
options = %w(--group --color --flush)
options << '-w' if result['matchWholeWords'] == 1
@@ -87,13 +88,37 @@ def prepare_search
options << '-C' if result['showContext'] == 1
options << "--#{result['followSymLinks'] == 1 ? '' : 'no'}follow"
options << "--#{result['loadAckRC'] == 1 ? '' : 'no'}env"
+
+ # add file type filters
+ self.filter = ""
+ if result['fileTypeString']
+ fileTypes.each do |f|
+ f = f.gsub(/\s+/, "")
+ f = parse_filters(f)
+ # options << "#{f}" if f != self.filter
+ end
+ end
+
+ options << "-G '#{self.filter[0..self.filter.length-2]}'" if self.filter != ""
AckInProject.update_search_history result['returnArgument']
AckInProject.update_pbfind result['returnArgument']
+ AckInProject.update_search_filetype_filter result['fileTypeString'] || ''
%{cd #{e_sh search_directory}; #{e_sh ack} #{options.join(' ')} -- #{e_sh result['returnArgument']}}
end
+ # check to see it's a big filter or small filter
+ # update: only support small filter
+ # TODO: add more types support
+ def parse_filters(filter)
+ # if ['ruby', 'shell', 'rake', 'php', 'html', 'xml', 'yaml'].include?(filter)
+ # " --#{filter} "
+ # else
+ self.filter << "\\.#{filter}$|"
+ # end
+ end
+
def search
# tell ack about potential .ackrc files in the project directory
ENV['ACKRC'] = File.join(project_directory, '.ackrc')
diff --git a/Support/lib/search_dialog.rb b/Support/lib/search_dialog.rb
index aef8234..3e78815 100644
--- a/Support/lib/search_dialog.rb
+++ b/Support/lib/search_dialog.rb
@@ -9,6 +9,7 @@ def show(&block)
command = %Q{#{TM_DIALOG} -cm -p #{e_sh params.to_plist} -d #{e_sh defaults.to_plist} #{e_sh nib_file('AckInProjectSearch.nib')}}
plist = OSX::PropertyList::load(%x{#{command}})
+
if plist['result']
block.call(plist)
end
@@ -26,8 +27,10 @@ def defaults
def params
history = AckInProject.search_history
+ filetype_filter = AckInProject.search_filetype_filter
{
- #'contentHeight' => 168,
+ #'contentHeight' => 150,
+ 'fileTypeString' => filetype_filter,
'ackExpression' => AckInProject.pbfind,
'ackHistory' => history
}
diff --git a/Support/nibs/AckInProjectSearch.nib/classes.nib b/Support/nibs/AckInProjectSearch.nib/classes.nib
deleted file mode 100644
index a731b33..0000000
--- a/Support/nibs/AckInProjectSearch.nib/classes.nib
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {ACTIONS = {performButtonClick = id; }; CLASS = NSObject; LANGUAGE = ObjC; }
- );
- IBVersion = 1;
-}
\ No newline at end of file
diff --git a/Support/nibs/AckInProjectSearch.nib/designable.nib b/Support/nibs/AckInProjectSearch.nib/designable.nib
new file mode 100644
index 0000000..0b46d78
--- /dev/null
+++ b/Support/nibs/AckInProjectSearch.nib/designable.nib
@@ -0,0 +1,1575 @@
+
+
+
+ 1060
+ 10K549
+ 1306
+ 1038.36
+ 461.00
+
+
+ NSUserDefaultsController
+ NSObjectController
+ NSComboBoxCell
+ NSButton
+ NSButtonCell
+ NSTextFieldCell
+ NSBox
+ NSComboBox
+ NSMatrix
+ NSCustomObject
+ NSCustomView
+ NSView
+ NSWindowTemplate
+ NSTextField
+ NSDrawer
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+
+ YES
+ 3
+
+
diff --git a/Support/nibs/AckInProjectSearch.nib/info.nib b/Support/nibs/AckInProjectSearch.nib/info.nib
deleted file mode 100644
index 97c8dd1..0000000
--- a/Support/nibs/AckInProjectSearch.nib/info.nib
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- IBDocumentLocation
- 425 98 703 386 0 0 1680 1028
- IBEditorPositions
-
- 185
- 756 617 214 136 0 0 1680 1028
-
- IBFramework Version
- 443.0
- IBOpenObjects
-
- 5
- 185
-
- IBSystem Version
- 8S2167
-
-
diff --git a/Support/nibs/AckInProjectSearch.nib/keyedobjects.nib b/Support/nibs/AckInProjectSearch.nib/keyedobjects.nib
index 5489a5c..4f9ace4 100644
Binary files a/Support/nibs/AckInProjectSearch.nib/keyedobjects.nib and b/Support/nibs/AckInProjectSearch.nib/keyedobjects.nib differ