5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-12-16 23:29:47 +00:00
Code Issues Projects Releases Wiki Activity

SearchText Null

Browse source
This commit is contained in:
Yan Maniez 2018-06-24 15:59:41 +02:00
parent 22c95cdd94
commit bf0f3600f9
4 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs
View file

@ -133,7 +133,7 @@ namespace AideDeJeu.ViewModels
spell.Source.Contains(source) &&
spell.Source.Contains(classe) &&
spell.Type.Contains(rituel) &&
Helpers.RemoveDiacritics(spell.NamePHB).ToLower().Contains(Helpers.RemoveDiacritics(SearchText).ToLower());
Helpers.RemoveDiacritics(spell.NamePHB).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower());
}).OrderBy(spell => spell.NamePHB)
.AsEnumerable();
}, token);
@ -379,7 +379,7 @@ namespace AideDeJeu.ViewModels
monster.Source.Contains(source) &&
powerComparer.Compare(monster.Challenge, minPower) >= 0 &&
powerComparer.Compare(monster.Challenge, maxPower) <= 0 &&
Helpers.RemoveDiacritics(monster.NamePHB).ToLower().Contains(Helpers.RemoveDiacritics(SearchText).ToLower());
Helpers.RemoveDiacritics(monster.NamePHB).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower());
})
.OrderBy(monster => monster.NamePHB)
.AsEnumerable();

28
AideDeJeu/AideDeJeuCmd/Program.cs
View file

@ -107,9 +107,11 @@ namespace AideDeJeuCmd
};
foreach (var classe in classes)
{
//Console.WriteLine(classe);
result += string.Format("## {0}\r\n\r\n", classe);
foreach (var level in levels)
{
//Console.WriteLine(level);
var spells = items.Where(s => s.Level == level && s.Source.Contains(classe)).OrderBy(s => s.Name).Select(s => string.Format("* [{0}](spells_hd.md#{1})", s.Name, Helpers.IdFromName(s.Name))).ToList();
if (spells.Count > 0)
{
@ -119,6 +121,7 @@ namespace AideDeJeuCmd
}
}
}
Console.WriteLine(result);
await SaveStringAsync(dataDir + "spells_hd_by_class_level.md", result);
}
@ -126,6 +129,7 @@ namespace AideDeJeuCmd
{
string dataDir = @"..\..\..\..\..\Data\";
await CreateIndexes();
//var spellsVF = LoadJSon<IEnumerable<Spell>>(dataDir + "spells_vf_full.json");
//var spellsVO = LoadJSon<IEnumerable<Spell>>(dataDir + "spells_vo_full.json");
//var spellsHD = LoadJSon<IEnumerable<Spell>>(dataDir + "spells_hd_full.json");
@ -133,20 +137,20 @@ namespace AideDeJeuCmd
//var monstersVO = LoadJSon<IEnumerable<Monster>>(dataDir + "monsters_vo_full.json");
//var result = string.Empty;
var md = await LoadStringAsync(dataDir + "spells_vo.md");
//var md = await LoadStringAsync(dataDir + "spells_vo.md");
var regex = new Regex("\\[(?<name>.*?)\\]\\: spells_hd\\.md\\#(?<id>.*?)\n");
var matches = regex.Matches(md);
foreach(Match match in matches)
{
Debug.WriteLine(match.Value);
var oldMatch = match.Value;
var name = match.Groups["name"].Value;
var newMatch = string.Format("[{0}]: spells_hd.md#{1}\n", name, Helpers.IdFromName(name));
//var regex = new Regex("\\[(?<name>.*?)\\]\\: spells_hd\\.md\\#(?<id>.*?)\n");
//var matches = regex.Matches(md);
//foreach(Match match in matches)
//{
// Debug.WriteLine(match.Value);
// var oldMatch = match.Value;
// var name = match.Groups["name"].Value;
// var newMatch = string.Format("[{0}]: spells_hd.md#{1}\n", name, Helpers.IdFromName(name));
md = md.Replace(oldMatch, newMatch);
}
await SaveStringAsync(dataDir + "spells_vo_tmp.md", md);
// md = md.Replace(oldMatch, newMatch);
//}
//await SaveStringAsync(dataDir + "spells_vo_tmp.md", md);
//foreach(var spell in spellsVF)
//{
// var nameAideDD = spell.Name;

5
AideDeJeu/AideDeJeuWeb/Controllers/ValuesController.cs
View file

@ -15,7 +15,10 @@ namespace AideDeJeuWeb.Controllers
[HttpGet("{classe}")]
public async Task<IEnumerable<CardData>> Get(string classe)
{
var items = AideDeJeu.Tools.Helpers.GetResourceObject<IEnumerable<Spell>>("AideDeJeu.Data.spells_vf.json");
//var items = AideDeJeu.Tools.Helpers.GetResourceObject<IEnumerable<Spell>>("AideDeJeu.Data.spells_vf.json");
var md = await AideDeJeu.Tools.Helpers.GetResourceStringAsync("AideDeJeu.Data.spells_hd.md");
var items = AideDeJeu.Tools.MarkdownExtensions.MarkdownToSpells(md);
var fitems = items.Where(it => it.Source.Contains(classe)).OrderBy(it => it.Level).ThenBy(it => it.NamePHB);
var cardDatas = new List<CardData>();