5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-11-01 07:56:04 +00:00
Code Issues Projects Releases Wiki Activity

Blindage BDD

Browse source
This commit is contained in:
Yan Maniez 2018-12-16 02:43:21 +01:00
parent d5b731ef06
commit 5951e8195e
7 changed files with 212 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

7
AideDeJeu/AideDeJeu.Android/NativeAPI.cs
View file

@ -28,12 +28,19 @@ namespace AideDeJeu.Droid
}
public async Task<string> GetDatabasePathAsync(string databaseName)
{
try
{
if (await CheckDatabaseVersionAsync(databaseName))
{
await CopyOldToNewFileAsync(databaseName, "db");
await CopyOldToNewFileAsync(databaseName, "ver");
}
}
catch
{
}
return GetNewFilePath(databaseName, "db");
}

8
AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs generated
View file

@ -1,11 +1,11 @@
#pragma warning disable 1591
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Ce code a été généré par un outil.
// Version du runtime :4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
// </auto-generated>
//------------------------------------------------------------------------------

7
AideDeJeu/AideDeJeu.UWP/NativeAPI.cs
View file

@ -24,12 +24,19 @@ namespace AideDeJeu.UWP
}
public async Task<string> GetDatabasePathAsync(string databaseName)
{
try
{
if (await CheckDatabaseVersionAsync(databaseName))
{
await CopyOldToNewFileAsync(databaseName, "db");
await CopyOldToNewFileAsync(databaseName, "ver");
}
}
catch
{
}
return GetNewFilePath(databaseName, "db");
}

10
AideDeJeu/AideDeJeu/ViewModels/DeepSearchViewModel.cs
View file

@ -58,6 +58,8 @@ namespace AideDeJeu.ViewModels
}
public async Task<IEnumerable<SearchedItem>> DeepSearchAllItemsAsync(string searchText)
{
try
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
@ -69,7 +71,8 @@ namespace AideDeJeu.ViewModels
Where(item => EF.Functions.Like(item.Markdown, $"%{searchText}%")).
Select(item => new SearchedItem()
{
Item = item, Preview = (item.ParentName != null ? $"> {item.ParentName} > " : "") + GetPreview(item.Markdown, searchText)
Item = item,
Preview = (item.ParentName != null ? $"> {item.ParentName} > " : "") + GetPreview(item.Markdown, searchText)
}).ToListAsync();
//var primary = await context.Items.
// Where(item => item.Name.Contains(searchText)).
@ -116,6 +119,11 @@ namespace AideDeJeu.ViewModels
//primaryItems.AddRange(secondaryItems);
//return primaryItems;
}
catch
{
return new List<SearchedItem>();
}
}
}

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

@ -317,6 +317,8 @@ namespace AideDeJeu.ViewModels
var ecole = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.School).SelectedKey ?? "";
var ritual = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Ritual).SelectedKey ?? "";
var source = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Source).SelectedKey ?? "";
try
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
return context.SpellsVO.Where(spell =>
@ -332,6 +334,11 @@ namespace AideDeJeu.ViewModels
)).OrderBy(spell => spell.Name).ToList();
}
}
catch
{
return new List<Item>();
}
}
public override List<KeyValuePair<string, string>> Classes { get; } = new List<KeyValuePair<string, string>>()
{
@ -397,6 +404,8 @@ namespace AideDeJeu.ViewModels
var ecole = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.School).SelectedKey ?? "";
var ritual = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Ritual).SelectedKey ?? "";
var source = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Source).SelectedKey ?? "";
try
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
return context.SpellsHD.Where(spell =>
@ -412,6 +421,11 @@ namespace AideDeJeu.ViewModels
)).OrderBy(spell => spell.Name).ToList();
}
}
catch
{
return new List<Item>();
}
}
public override List<KeyValuePair<string, string>> Classes { get; } = new List<KeyValuePair<string, string>>()
{
@ -658,6 +672,8 @@ namespace AideDeJeu.ViewModels
var source = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Source).SelectedKey ?? "";
token.ThrowIfCancellationRequested();
try
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
return context.MonstersVO.Where(monster =>
@ -673,7 +689,11 @@ namespace AideDeJeu.ViewModels
)
).OrderBy(monster => monster.Name).ToList();
}
}
catch
{
return new List<Item>();
}
}
public override List<KeyValuePair<string, string>> Categories { get; } = new List<KeyValuePair<string, string>>()
@ -774,6 +794,8 @@ namespace AideDeJeu.ViewModels
var source = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Source).SelectedKey ?? "";
token.ThrowIfCancellationRequested();
try
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
return context.MonstersHD.Where(monster =>
@ -789,7 +811,11 @@ namespace AideDeJeu.ViewModels
)
).OrderBy(monster => monster.Name).ToList();
}
}
catch
{
return new List<Item>();
}
}
public override List<KeyValuePair<string, string>> Categories { get; } = new List<KeyValuePair<string, string>>()
{
@ -907,6 +933,8 @@ namespace AideDeJeu.ViewModels
var minPrice = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.MinPrice).SelectedKey ?? "0 pc";
var maxPrice = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.MaxPrice).SelectedKey ?? "1 000 000 po";
try
{
using (var context = await GetLibraryContextAsync())
{
return context.Equipments.Where(equipment =>
@ -921,6 +949,11 @@ namespace AideDeJeu.ViewModels
.ToList();
}
}
catch
{
return new List<Item>();
}
}
public abstract List<KeyValuePair<string, string>> Types { get; }
@ -1007,6 +1040,8 @@ namespace AideDeJeu.ViewModels
var rarity = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Rarity).SelectedKey ?? "";
var attunement = Filters.SingleOrDefault(filter => filter.Key == FilterKeys.Attunement).SelectedKey ?? "";
try
{
using (var context = await GetLibraryContextAsync())
{
return context.MagicItems.Where(magicitem =>
@ -1017,6 +1052,11 @@ namespace AideDeJeu.ViewModels
).OrderBy(eq => eq.Name).ToList();
}
}
catch
{
return new List<Item>();
}
}
public abstract List<KeyValuePair<string, string>> Types { get; }

7
AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs
View file

@ -418,11 +418,18 @@ namespace AideDeJeu.ViewModels
{
id += $"#{anchor}";
}
try
{
using (var context = await GetLibraryContextAsync())
{
return await context.Items.Where(item => item.Id == id || item.RootId == id).FirstOrDefaultAsync();
}
}
catch
{
return null;
}
}
public async Task<Item> GetItemFromDataAsyncOld(string source, string anchor)
{

6
AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs
View file

@ -62,11 +62,17 @@ namespace AideDeJeu.Views
async Task InitDBEngineAsync()
{
await Task.Delay(1000).ConfigureAwait(false);
try
{
using (var context = await StoreViewModel.GetLibraryContextAsync().ConfigureAwait(false))
{
var item = context.Items.FirstOrDefault();
}
}
catch
{
}
}
void PaintHeaderBar(object sender, SKPaintSurfaceEventArgs args)