forked from github/kensanata.oddmuse
83f13a9a1a
As we derive a lot of filenames from strings in UTF-8 encoded files, we need to make sure that any filename that might might be set by a user – including all the filenames containing a directory deriving from $DataDir – are passed through utf8::encode. That is, every character gets replaced with a sequence of one or more characters that represent the individual bytes of the character and the UTF8 flag is turned off. In other words, -d $DataDir might not work if $DataDir contains a UTF-8 encoded string. The solution is to use the following replacements: -f $name IsFile($name) -e $name IsFile($name) -d $name IsDir($name) (stat($name))[9] Modified($name) -M $name $Now - Modified($name) -z $name ZeroSize($name) unlink $name Unlink($name) mkdir $name CreateDir($name) rmdir $name RemoveDir($name) (Using IsFile for -e is probably not ideal?) If you don’t, and Oddmuse gets used with Mojolicious, and you use the Namespaces Extension, and a namespace contains non-ASCII characters such as ä, ö, or ü, these characters will end up as part of $DataDir and trigger the problem. I also wonder whether we should be using some other Perl library.
76 lines
2.2 KiB
Perl
76 lines
2.2 KiB
Perl
# Copyright (C) 2014 Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
|
|
# Copyright (C) 2011 Alex Schroeder <alex@gnu.org>
|
|
|
|
# This program is free software: you can redistribute it and/or modify it under
|
|
# the terms of the GNU General Public License as published by the Free Software
|
|
# Foundation, either version 3 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful, but WITHOUT
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along with
|
|
# this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use strict;
|
|
use v5.10;
|
|
|
|
AddModuleDescription('git-another.pl', 'Another Git Extension');
|
|
|
|
use Cwd;
|
|
use Capture::Tiny ':all';
|
|
|
|
our (%Page, $DataDir, $FootnoteNumber);
|
|
our ($GitBinary, $GitMail);
|
|
|
|
$GitBinary = 'git';
|
|
$GitMail = 'unknown@oddmuse.org';
|
|
|
|
sub GitCommit {
|
|
my ($message, $author) = @_;
|
|
my $oldDir = cwd;
|
|
ChangeDir("$DataDir/page");
|
|
capture {
|
|
system($GitBinary, qw(add -A));
|
|
system($GitBinary, qw(commit -q -m), $message, "--author=$author <$GitMail>");
|
|
};
|
|
ChangeDir($oldDir);
|
|
}
|
|
|
|
sub GitInitRepository {
|
|
return if -d "$DataDir/page/.git";
|
|
capture {
|
|
system($GitBinary, qw(init -q --), "$DataDir/page");
|
|
};
|
|
GitCommit('Initial import', 'Oddmuse');
|
|
}
|
|
|
|
sub RenderHtmlCacheWithoutPrinting { # requires an open page
|
|
$FootnoteNumber = 0;
|
|
my ($blocks, $flags);
|
|
capture {
|
|
($blocks, $flags) = ApplyRules(QuoteHtml($Page{text}), 1, 1, $Page{revision}, 'p');
|
|
};
|
|
if ($Page{blocks} ne $blocks and $Page{flags} ne $flags) {
|
|
$Page{blocks} = $blocks;
|
|
$Page{flags} = $flags;
|
|
SavePage();
|
|
}
|
|
}
|
|
|
|
*GitOldSave = \&Save;
|
|
*Save = \&GitNewSave;
|
|
|
|
sub GitNewSave {
|
|
GitInitRepository();
|
|
GitCommit('No description available', 'Oddmuse'); # commit any changes before this edit
|
|
GitOldSave(@_);
|
|
RenderHtmlCacheWithoutPrinting();
|
|
my $message = $Page{summary};
|
|
$message =~ s/^\s+$//;
|
|
$message ||= T('No summary provided');
|
|
my $author = $Page{username} || T('Anonymous');
|
|
GitCommit($message, $author); # commit this edit
|
|
}
|