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
include Utils::CharEncode
def diff_line(line, line_new = 0, line_old = 0)
full_line = html_escape(line.gsub(/\n/, ''))
color = if line[0] == "+"
......
class Commit
include Utils::CharEncode
attr_accessor :commit
attr_accessor :head
......@@ -20,7 +22,7 @@ class Commit
end
def safe_message
message.force_encoding(Encoding::UTF_8)
encode(message)
end
def created_at
......@@ -28,10 +30,10 @@ class Commit
end
def author_email
author.email.force_encoding(Encoding::UTF_8)
encode(author.email)
end
def author_name
author.name.force_encoding(Encoding::UTF_8)
encode(author.name)
end
end
......@@ -2,7 +2,7 @@
- line_new = 0
- lines_arr = diff.diff.lines.to_a
- lines_arr.each do |line|
- line.force_encoding(Encoding::UTF_8)
- encode(line)
- next if line.match(/^--- \/dev\/null/)
- next if line.match(/^--- a/)
- next if line.match(/^\+\+\+ b/)
......
require "grit"
class GraphCommit
include Utils::CharEncode
attr_accessor :time, :space
attr_accessor :refs
......@@ -65,7 +66,7 @@ class GraphCommit
# @param [GraphCommit] the commit object.
# @param [Hash<String,GraphCommit>] map of commits
#
# @return [Fixnum] max space used.
# @return [Fixnum] max space used.
def self.mark_chain(mark, commit, map)
commit.space = mark if commit.space == 0
m1 = mark - 1
......@@ -96,13 +97,13 @@ class GraphCommit
h[:parents] = self.parents.collect do |p|
[p.id,0,0]
end
h[:author] = author.name.force_encoding("UTF-8")
h[:author] = encode(author.name)
h[:time] = time
h[:space] = space
h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil?
h[:id] = sha
h[:date] = date
h[:message] = message.force_encoding("UTF-8")
h[:message] = encode(message)
h[:login] = author.email
h
end
......
......@@ -16,9 +16,20 @@ module Utils
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
include CharEncode
def colorize
system_colorize(data, name)
system_colorize(encode(data), name)
end
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