event log: Allow restoring files with 'special' characters. Fixes #1330
This commit is contained in:
parent
c103fdb3e6
commit
5c49c1ac2b
|
@ -229,7 +229,7 @@ namespace SparkleShare {
|
||||||
this.restore_revision_info = new RevisionInfo () {
|
this.restore_revision_info = new RevisionInfo () {
|
||||||
Folder = new SparkleFolder (match.Groups [1].Value),
|
Folder = new SparkleFolder (match.Groups [1].Value),
|
||||||
Revision = match.Groups [2].Value,
|
Revision = match.Groups [2].Value,
|
||||||
FilePath = match.Groups [5].Value
|
FilePath = Uri.UnescapeDataString (match.Groups [5].Value)
|
||||||
};
|
};
|
||||||
|
|
||||||
string file_name = Path.GetFileNameWithoutExtension (this.restore_revision_info.FilePath) +
|
string file_name = Path.GetFileNameWithoutExtension (this.restore_revision_info.FilePath) +
|
||||||
|
@ -257,8 +257,7 @@ namespace SparkleShare {
|
||||||
string folder = url.Replace ("history://", "").Split ("/".ToCharArray ()) [0];
|
string folder = url.Replace ("history://", "").Split ("/".ToCharArray ()) [0];
|
||||||
string file_path = url.Replace ("history://" + folder + "/", "");
|
string file_path = url.Replace ("history://" + folder + "/", "");
|
||||||
|
|
||||||
byte [] file_path_bytes = Encoding.Default.GetBytes (file_path);
|
file_path = Uri.UnescapeDataString (file_path);
|
||||||
file_path = Encoding.UTF8.GetString (file_path_bytes);
|
|
||||||
|
|
||||||
foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
|
foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
|
||||||
if (!repo.Name.Equals (folder))
|
if (!repo.Name.Equals (folder))
|
||||||
|
|
Loading…
Reference in a new issue