mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved installation script a bit

Browse Source
This commit is contained in:
Master Kwoth 2017-06-05 07:39:06 +02:00
parent d391e42fa7
commit 53b45c1fdb
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NadekoBot.iss
View File

@ -15,6 +15,7 @@ OutputDir=userdocs:projekti/NadekoInstallerOutput
OutputBaseFilename=NadekoBot-setup-{#version} OutputBaseFilename=NadekoBot-setup-{#version}
AppReadmeFile=http://nadekobot.readthedocs.io/en/1.4/Commands%20List/ AppReadmeFile=http://nadekobot.readthedocs.io/en/1.4/Commands%20List/
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode=x64
UsePreviousSetupType=no
[Files] [Files]
;install ;install
@ -39,8 +40,12 @@ Filename: "{app}\{#sysfolder}\credentials.json"; Flags: postinstall shellexec ru
Name: "{app}\NadekoBot"; Filename: "{app}\{#sysfolder}\NadekoBot.exe"; IconFilename: "{app}\{#sysfolder}\nadeko_icon.ico" Name: "{app}\NadekoBot"; Filename: "{app}\{#sysfolder}\NadekoBot.exe"; IconFilename: "{app}\{#sysfolder}\nadeko_icon.ico"
Name: "{app}\credentials"; Filename: "{app}\{#sysfolder}\credentials.json" Name: "{app}\credentials"; Filename: "{app}\{#sysfolder}\credentials.json"
Name: "{app}\data"; Filename: "{app}\{#sysfolder}\data" Name: "{app}\data"; Filename: "{app}\{#sysfolder}\data"
; desktop shortcut ; desktop shortcut
Name: "{commondesktop}\NadekoBot"; Filename: "{app}\NadekoBot"; Name: "{commondesktop}\NadekoBot"; Filename: "{app}\NadekoBot"; Tasks: desktopicon
; desktop icon checkbox
[Tasks]
Name: desktopicon; Description: "Create a &desktop shortcut";
[Registry] [Registry]
;make the app run as administrator ;make the app run as administrator

46
src/NadekoBot/Services/Impl/NadekoStrings.cs
View File

@ -47,31 +47,31 @@ namespace NadekoBot.Services
string.Join(",", responseStrings.Keys), string.Join(",", responseStrings.Keys),
sw.Elapsed.TotalSeconds); sw.Elapsed.TotalSeconds);
//improper string format checks ////improper string format checks
var compareTo = responseStrings["en-us"] //var compareTo = responseStrings["en-us"]
.Select(x => // .Select(x =>
{ // {
return (StringKey: x.Key, Placeholders: formatFinder.Matches(x.Value).Cast<Match>().Select(y => y.Value).ToArray()); // return (StringKey: x.Key, Placeholders: formatFinder.Matches(x.Value).Cast<Match>().Select(y => y.Value).ToArray());
}) // })
.ToDictionary(x => x.StringKey, x => x.Placeholders); // .ToDictionary(x => x.StringKey, x => x.Placeholders);
var errors = responseStrings //var errors = responseStrings
.Select(a => (a.Key, a.Value.Select(x => // .Select(a => (a.Key, a.Value.Select(x =>
{ // {
if (!compareTo.ContainsKey(x.Key)) // if (!compareTo.ContainsKey(x.Key))
return (StringKey: x.Key, Placeholders: new HashSet<string>(), Missing: true); // return (StringKey: x.Key, Placeholders: new HashSet<string>(), Missing: true);
var hs = new HashSet<string>(compareTo[x.Key]); // var hs = new HashSet<string>(compareTo[x.Key]);
hs.SymmetricExceptWith(formatFinder.Matches(x.Value).Cast<Match>().Select(y => y.Value).ToArray()); // hs.SymmetricExceptWith(formatFinder.Matches(x.Value).Cast<Match>().Select(y => y.Value).ToArray());
return (StringKey: x.Key, Placeholders: hs, Missing: false); // return (StringKey: x.Key, Placeholders: hs, Missing: false);
}) // })
.Where(x => x.Placeholders.Any() || x.Missing))) // .Where(x => x.Placeholders.Any() || x.Missing)))
.Where(x => x.Item2.Any()); // .Where(x => x.Item2.Any());
var str = string.Join("\n", errors.Select(x => $"------{x.Item1}------\n" + //var str = string.Join("\n", errors.Select(x => $"------{x.Item1}------\n" +
string.Join("\n", x.Item2.Select(y => // string.Join("\n", x.Item2.Select(y =>
y.StringKey + ": " + (y.Missing ? "MISSING" : string.Join(", ", y.Placeholders)))))); // y.StringKey + ": " + (y.Missing ? "MISSING" : string.Join(", ", y.Placeholders))))));
if (!string.IsNullOrWhiteSpace(str)) //if (!string.IsNullOrWhiteSpace(str))
_log.Warn($"Improperly Formatted strings:\n{str}"); // _log.Warn($"Improperly Formatted strings:\n{str}");
} }
private string GetLocaleName(string fileName) private string GetLocaleName(string fileName)