KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle detection of binary files

Browse Source
This commit is contained in:
Vicent Marti
2014-07-02 19:51:06 +02:00
parent 1b712d2800
commit f5e4789ccb
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/linguist/language.rb
View File

@@ -92,13 +92,20 @@ module Linguist
# Public: Detects the Language of the blob. # Public: Detects the Language of the blob.
# #
# blob - an object that implements the Linguist `Blob` interface; # blob - an object that includes the Linguist `BlobHelper` interface;
# see Linguist::LazyBlob and Linguist::FileBlob for examples # see Linguist::LazyBlob and Linguist::FileBlob for examples
# #
# Returns Language or nil. # Returns Language or nil.
def self.detect(blob) def self.detect(blob)
name = blob.name.to_s name = blob.name.to_s
# Check if the blob is possibly binary and bail early; this is a cheap
# test that uses the extension name to guess a binary binary mime type.
#
# We'll perform a more comprehensive test later which actually involves
# looking for binary characters in the blob
return nil if blob.likely_binary?
# A bit of an elegant hack. If the file is executable but extensionless, # A bit of an elegant hack. If the file is executable but extensionless,
# append a "magic" extension so it can be classified with other # append a "magic" extension so it can be classified with other
# languages that have shebang scripts. # languages that have shebang scripts.
@@ -116,8 +123,8 @@ module Linguist
data = blob.data data = blob.data
possible_language_names = possible_languages.map(&:name) possible_language_names = possible_languages.map(&:name)
# Don't bother with emptiness # Don't bother with binary contents or an empty file
if data.nil? || data == "" if blob.binary? || data.nil? || data == ""
nil nil
# Check if there's a shebang line and use that as authoritative # Check if there's a shebang line and use that as authoritative
elsif (result = find_by_shebang(data)) && !result.empty? elsif (result = find_by_shebang(data)) && !result.empty?