Commit 46cbe541 authored by Saito's avatar Saito

fix the issue on github #157.

directly force_encoding is wrong,
must detect the file string's encoding.
then force_encoding the string to it's encoding.
last convert it to utf-8.
parent 75fa0632
module CommitsHelper module CommitsHelper
include Utils::CharEncode
def diff_line(line, line_new = 0, line_old = 0) def diff_line(line, line_new = 0, line_old = 0)
full_line = html_escape(line.gsub(/\n/, '')) full_line = html_escape(line.gsub(/\n/, ''))
color = if line[0] == "+" color = if line[0] == "+"
......
class Commit class Commit
include Utils::CharEncode
attr_accessor :commit attr_accessor :commit
attr_accessor :head attr_accessor :head
...@@ -20,7 +22,7 @@ class Commit ...@@ -20,7 +22,7 @@ class Commit
end end
def safe_message def safe_message
message.force_encoding(Encoding::UTF_8) encode(message)
end end
def created_at def created_at
...@@ -28,10 +30,10 @@ class Commit ...@@ -28,10 +30,10 @@ class Commit
end end
def author_email def author_email
author.email.force_encoding(Encoding::UTF_8) encode(author.email)
end end
def author_name def author_name
author.name.force_encoding(Encoding::UTF_8) encode(author.name)
end end
end end
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- line_new = 0 - line_new = 0
- lines_arr = diff.diff.lines.to_a - lines_arr = diff.diff.lines.to_a
- lines_arr.each do |line| - lines_arr.each do |line|
- line.force_encoding(Encoding::UTF_8) - encode(line)
- next if line.match(/^--- \/dev\/null/) - next if line.match(/^--- \/dev\/null/)
- next if line.match(/^--- a/) - next if line.match(/^--- a/)
- next if line.match(/^\+\+\+ b/) - next if line.match(/^\+\+\+ b/)
......
require "grit" require "grit"
class GraphCommit class GraphCommit
include Utils::CharEncode
attr_accessor :time, :space attr_accessor :time, :space
attr_accessor :refs attr_accessor :refs
...@@ -65,7 +66,7 @@ class GraphCommit ...@@ -65,7 +66,7 @@ class GraphCommit
# @param [GraphCommit] the commit object. # @param [GraphCommit] the commit object.
# @param [Hash<String,GraphCommit>] map of commits # @param [Hash<String,GraphCommit>] map of commits
# #
# @return [Fixnum] max space used. # @return [Fixnum] max space used.
def self.mark_chain(mark, commit, map) def self.mark_chain(mark, commit, map)
commit.space = mark if commit.space == 0 commit.space = mark if commit.space == 0
m1 = mark - 1 m1 = mark - 1
...@@ -96,13 +97,13 @@ class GraphCommit ...@@ -96,13 +97,13 @@ class GraphCommit
h[:parents] = self.parents.collect do |p| h[:parents] = self.parents.collect do |p|
[p.id,0,0] [p.id,0,0]
end end
h[:author] = author.name.force_encoding("UTF-8") h[:author] = encode(author.name)
h[:time] = time h[:time] = time
h[:space] = space h[:space] = space
h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil? h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil?
h[:id] = sha h[:id] = sha
h[:date] = date h[:date] = date
h[:message] = message.force_encoding("UTF-8") h[:message] = encode(message)
h[:login] = author.email h[:login] = author.email
h h
end end
......
...@@ -16,9 +16,20 @@ module Utils ...@@ -16,9 +16,20 @@ module Utils
end end
end end
module CharEncode
def encode(string)
cd = CharDet.detect(string)
if cd.confidence > 0.6
string.force_encoding(cd.encoding)
end
string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
end
end
module Colorize module Colorize
include CharEncode
def colorize def colorize
system_colorize(data, name) system_colorize(encode(data), name)
end end
def system_colorize(data, file_name) def system_colorize(data, file_name)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment