From 30f42c50a96a82ff986d7a5439c6d4e06c538c91 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Thu, 4 Oct 2012 17:18:47 -0600 Subject: [PATCH] Fix #528 --- lib/gollum/wiki.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 596d577c..c1bde58a 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -495,14 +495,19 @@ module Gollum @repo.git.grep(*args).split("\n").each do |line| result = line.split(':') result_1 = result[1] - file_name = result_1.chomp(::File.extname(result_1)) + # Remove ext only from known extensions. + # test.pdf => test.pdf, test.md => test + file_name = Page::valid_page_name?(result_1) ? result_1.chomp(::File.extname(result_1)) : + result_1 results[file_name] = result[2].to_i end # Use git ls-files '*query*' to search for file names. Grep only searches file content. # Spaces are converted to dashes when saving pages to disk. @repo.git.ls_files({}, "*#{ query.gsub(' ', '-') }*").split("\n").each do |line| - file_name = line.chomp(::File.extname(line)) + # Remove ext only from known extensions. + file_name = Page::valid_page_name?(line) ? line.chomp(::File.extname(line)) : + line # If there's not already a result for file_name then # the value is nil and nil.to_i is 0. results[file_name] = results[file_name].to_i + 1;