Ensure lang is skipped on any binary file

This commit is contained in:
Joshua Peek
2012-09-24 10:51:39 -05:00
parent 7c51b90586
commit 31e33f99f2
2 changed files with 4 additions and 2 deletions

View File

@@ -302,7 +302,7 @@ module Linguist
if defined?(@data) && @data.is_a?(String) if defined?(@data) && @data.is_a?(String)
data = @data data = @data
else else
data = lambda { binary_mime_type? ? "" : self.data } data = lambda { (binary_mime_type? || binary?) ? "" : self.data }
end end
@language = Language.detect(name.to_s, data, mode) @language = Language.detect(name.to_s, data, mode)

View File

@@ -84,7 +84,9 @@ module Linguist
if possible_languages.length > 1 if possible_languages.length > 1
data = data.call() if data.respond_to?(:call) data = data.call() if data.respond_to?(:call)
if result = Classifier.classify(Samples::DATA, data, possible_languages.map(&:name)).first if data.nil? || data == ""
nil
elsif result = Classifier.classify(Samples::DATA, data, possible_languages.map(&:name)).first
Language[result[0]] Language[result[0]]
end end
else else