@@ -4,7 +4,10 @@

   - add Mojolicious::Plugin::DBViewer to cpanfile

   - X-Forwarded-HTTPS header is DEPRECATED! use X-Forwarded-Proto header instead.

   - remove [basic]show_ignore_space_change_link option.

-    and enable this feature on in project settings page.

+    and move this feature to project settings page.

+  - remove [basic]encoding_suspects option

+    and move this feature to project settings page.

+  

 1.12 (7 Feb 2016)

   - Catch up latest Github design.

   - Fix bug that relative image path in README.md and blob html.

@@ -452,14 +452,27 @@ If you install perl 5.10.1+ by perlbrew, you can install latest GitPrep.

 **2. remove [basic]show_ignore_space_change_link option**

+remove [basic]show_ignore_space_change_link option.

+and move this feature to project settings page.

+

+    # Go to settings page in your project

+    /kimoto/gitprep/settings

+

+**2. remove [basic]show_ignore_space_change_link option**

+

 remove [basic]show_ignore_space_change_link option.

 but enable this feature on in project settings page.

     # Go to settings page in your project

     /kimoto/gitprep/settings

-    

-    # And see the following section

-    Ignore space change in diff

+

+**3. remove [basic]encoding_suspects option**

+

+remove [basic]encoding_suspects option

+and move this feature to project settings page.

+

+    # Go to settings page in your project

+    /kimoto/gitprep/settings

 ## For Developer

@@ -29,11 +29,6 @@

 ;;; default is "$ENV{HOME}/.ssh/authorized_keys"

 ; authorized_keys_file=/home/gitprep/.ssh/authorized_keys

-;;; Suspects encoding list for source code character encoding (default:UTF-8)

-;;; set comma separated encoding list if your source code is different from UTF-8.

-;;; encoding name follow Perl encoding API.

-;encoding_suspects=cp932,UTF-8

-

 [admin]

 ;;; If you forget admin password,

 ;;; set this value to 1 and access /reset-password page.

@@ -58,14 +58,6 @@ sub startup {

   }

   $git->bin($git_bin);

-  # Encoding suspects list for Git

-  my $encoding_suspects_str = $conf->{basic}{encoding_suspects};

-  my @encoding_suspects;

-  if ($encoding_suspects_str) {

-    @encoding_suspects = split /,/, $encoding_suspects_str;

-  }

-  $git->encoding_suspects(\@encoding_suspects);

-

   # Repository Manager

   my $manager = Gitprep::Manager->new;

   $manager->app($self);

@@ -15,7 +15,6 @@ use Gitprep::Util;

 # Attributes

 has 'bin';

 has default_encoding => 'UTF-8';

-has 'encoding_suspects';

 has 'rep_home';

 has text_exts => sub { ['txt'] };

 has 'time_zone_second';

@@ -191,8 +190,10 @@ sub blame {

   my $max_author_time;

   my $min_author_time;

   my @lines = <$fh>;

+  

+  my $enc = $self->decide_encoding($user, $project, \@lines);

   for my $line (@lines) {

-    $line = $self->_dec_guess($line);

+    $line = decode($enc, $line);

     chomp $line;

     if ($blame_line) {

@@ -283,8 +284,9 @@ sub blob {

   # Format lines

   my @lines = <$fh>;

   my @new_lines;

+  my $enc = $self->decide_encoding($user, $project, \@lines);

   for my $line (@lines) {

-    $line = $self->_dec_guess($line);

+    $line = decode($enc, $line);

     chomp $line;

     push @new_lines, $line;

   }

@@ -318,9 +320,10 @@ sub blob_diffs {

   open my $fh, '-|', @cmd

     or croak('Open self-diff-tree failed');

   my @diff_tree;

-  my @diff_treelines = <$fh>;

-  for my $line (@diff_treelines) {

-    $line = $self->_dec_guess($line);

+  my @diff_tree_lines = <$fh>;

+  my $diff_tree_enc = $self->decide_encoding($user, $project, \@diff_tree_lines);

+  for my $line (@diff_tree_lines) {

+    $line = decode($diff_tree_enc, $line);

     chomp $line;

     push @diff_tree, $line if $line =~ /^:/;

     last if $line =~ /^\n/;

@@ -355,7 +358,8 @@ sub blob_diffs {

     open my $fh, '-|', @cmd

       or croak('Open self-diff-tree failed');

     my @lines = <$fh>;

-    @lines = map { $self->_dec_guess($_) } @lines;

+    my $enc = $self->decide_encoding($user, $project, \@lines);

+    @lines = map { decode($enc, $_) } @lines;

     close $fh;

     my ($lines, $diff_info) = $self->parse_blob_diff_lines(\@lines);

     my $blob_diff = {

@@ -1733,28 +1737,43 @@ sub _chop_str {

   }

 }

-sub _dec_guess {

-  my ($self, $str) = @_;

+sub decide_encoding {

+  my ($self, $user, $project, $lines) = @_;

+  

+  my $guess_encoding_str = $self->app->dbi->model('project')->select(

+    'guess_encoding',

+    where => {user_id => $user, name => $project}

+  )->value;

-  my $encoding_suspects = $self->encoding_suspects;

+  my @guess_encodings;

+  if (length $guess_encoding_str) {

+    @guess_encodings = split(/\s*,\s*/, $guess_encoding_str);

+  }

-  my $enc;

-  if (@$encoding_suspects) {

-    my $ret = Encode::Guess->guess($str, @$encoding_suspects);

+  my $encoding;

+  if (@guess_encodings) {

+    my @new_lines;

+    for (my $i = 0; $i < 100; $i++) {

+      last unless defined $lines->[$i];

+      push @new_lines, $lines->[$i];

+    }

+    

+    my $str = join('', @new_lines);

+

+    my $ret = Encode::Guess->guess($str, @guess_encodings);

+    

     if (ref $ret) {

-      $enc = $ret->name;

+      $encoding = $ret->name;

     }

     else {

-      $enc = $self->default_encoding

+      $encoding = $self->default_encoding

     }

   }

   else {

-    $enc = $self->default_encoding;

+    $encoding = $self->default_encoding;

   }

-  $str = decode($enc, $str);

-

-  return $str;

+  return $encoding;

 }

 sub _dec {

@@ -434,12 +434,3 @@ note 'Markdown normal file';

   $t->get_ok("/$user/$project/blob/12e44f2e4ecf55c5d3a307889829b47c05e216d3/dir/markdown.md");

   $t->content_like(qr#<h1 .*?>Head</h1>#);

 }

-

-note 'encoding_suspects option';

-{

-  my $app = Gitprep->new;

-  $app->git->encoding_suspects(['EUC-jp', 'UTF-8']);

-  my $t = Test::Mojo->new($app);

-  $t->get_ok("/$user/$project/blob/3cf14ade5e28ee0cd83b9a3b1e1c332aed66df53/euc-jp.txt");

-  $t->content_like(qr/あああ/);

-}