5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-29 14:35:45 +00:00
Code Issues Projects Releases Wiki Activity

Ze end ?

Browse source
This commit is contained in:
Yan Maniez 2021-02-04 15:01:37 +01:00
parent 56e571eace
commit e93d58d050
8 changed files with 8153 additions and 3652 deletions
Download patch file Download diff file Expand all files Collapse all files

22
AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
View file

@ -216,37 +216,37 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite"> <PackageReference Include="Microsoft.Data.Sqlite">
<Version>5.0.1</Version> <Version>5.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore"> <PackageReference Include="Microsoft.EntityFrameworkCore">
<Version>5.0.1</Version> <Version>5.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core"> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core">
<Version>5.0.1</Version> <Version>5.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="MoonSharp"> <PackageReference Include="MoonSharp">
<Version>2.0.0</Version> <Version>2.0.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Rg.Plugins.Popup"> <PackageReference Include="Rg.Plugins.Popup">
<Version>2.0.0.9</Version> <Version>2.0.0.10</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SkiaSharp.Svg"> <PackageReference Include="SkiaSharp.Svg">
<Version>1.60.0</Version> <Version>1.60.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SkiaSharp.Views"> <PackageReference Include="SkiaSharp.Views">
<Version>2.80.3-preview.18</Version> <Version>2.80.3-preview.24</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SkiaSharp.Views.Forms"> <PackageReference Include="SkiaSharp.Views.Forms">
<Version>2.80.3-preview.18</Version> <Version>2.80.3-preview.24</Version>
</PackageReference> </PackageReference>
<PackageReference Include="sqlite-net-pcl"> <PackageReference Include="sqlite-net-pcl">
<Version>1.8.0-beta</Version> <Version>1.8.0-beta</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SQLitePCLRaw.bundle_green"> <PackageReference Include="SQLitePCLRaw.bundle_green">
<Version>2.0.5-pre20201231105030</Version> <Version>2.0.5-pre20210119130047</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SQLitePCLRaw.core"> <PackageReference Include="SQLitePCLRaw.core">
<Version>2.0.5-pre20201231105030</Version> <Version>2.0.5-pre20210119130047</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3.linux"> <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3.linux">
<Version>1.1.14</Version> <Version>1.1.14</Version>
@ -258,13 +258,13 @@
<Version>1.9.67</Version> <Version>1.9.67</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Essentials"> <PackageReference Include="Xamarin.Essentials">
<Version>1.6.1-preview1</Version> <Version>1.6.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms"> <PackageReference Include="Xamarin.Forms">
<Version>5.0.0.1874</Version> <Version>5.0.0.1931</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.Visual.Material"> <PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>5.0.0.1874</Version> <Version>5.0.0.1931</Version>
</PackageReference> </PackageReference>
<PackageReference Include="XamiTextSharpLGPLv2"> <PackageReference Include="XamiTextSharpLGPLv2">
<Version>1.0.0</Version> <Version>1.0.0</Version>

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

File diff suppressed because it is too large Load diff

20
AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
View file

@ -224,34 +224,34 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite"> <PackageReference Include="Microsoft.Data.Sqlite">
<Version>5.0.1</Version> <Version>5.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore"> <PackageReference Include="Microsoft.EntityFrameworkCore">
<Version>5.0.1</Version> <Version>5.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core"> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core">
<Version>5.0.1</Version> <Version>5.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="MoonSharp"> <PackageReference Include="MoonSharp">
<Version>2.0.0</Version> <Version>2.0.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Rg.Plugins.Popup"> <PackageReference Include="Rg.Plugins.Popup">
<Version>2.0.0.9</Version> <Version>2.0.0.10</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SkiaSharp.Svg"> <PackageReference Include="SkiaSharp.Svg">
<Version>1.60.0</Version> <Version>1.60.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SkiaSharp.Views"> <PackageReference Include="SkiaSharp.Views">
<Version>2.80.3-preview.18</Version> <Version>2.80.3-preview.24</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SkiaSharp.Views.Forms"> <PackageReference Include="SkiaSharp.Views.Forms">
<Version>2.80.3-preview.18</Version> <Version>2.80.3-preview.24</Version>
</PackageReference> </PackageReference>
<PackageReference Include="sqlite-net-pcl"> <PackageReference Include="sqlite-net-pcl">
<Version>1.8.0-beta</Version> <Version>1.8.0-beta</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SQLitePCLRaw.core"> <PackageReference Include="SQLitePCLRaw.core">
<Version>2.0.5-pre20201231105030</Version> <Version>2.0.5-pre20210119130047</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SQLitePCLRaw.provider.sqlite3.ios_unified"> <PackageReference Include="SQLitePCLRaw.provider.sqlite3.ios_unified">
<Version>1.1.14</Version> <Version>1.1.14</Version>
@ -263,13 +263,13 @@
<Version>1.9.67</Version> <Version>1.9.67</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Essentials"> <PackageReference Include="Xamarin.Essentials">
<Version>1.6.1-preview1</Version> <Version>1.6.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms"> <PackageReference Include="Xamarin.Forms">
<Version>5.0.0.1874</Version> <Version>5.0.0.1931</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.Visual.Material"> <PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>5.0.0.1874</Version> <Version>5.0.0.1931</Version>
</PackageReference> </PackageReference>
<PackageReference Include="XamiTextSharpLGPLv2"> <PackageReference Include="XamiTextSharpLGPLv2">
<Version>1.0.0</Version> <Version>1.0.0</Version>

20
AideDeJeu/AideDeJeu/AideDeJeu.csproj
View file

@ -97,22 +97,22 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Markdig" Version="0.22.1" /> <PackageReference Include="Markdig" Version="0.23.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.2" />
<PackageReference Include="MoonSharp" Version="2.0.0" /> <PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="OnePlat.DiceNotation" Version="2.0.2" /> <PackageReference Include="OnePlat.DiceNotation" Version="2.0.2" />
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.9" /> <PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.10" />
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" /> <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views" Version="2.80.3-preview.18" /> <PackageReference Include="SkiaSharp.Views" Version="2.80.3-preview.24" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3-preview.18" /> <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3-preview.24" />
<PackageReference Include="sqlite-net-pcl" Version="1.8.0-beta" /> <PackageReference Include="sqlite-net-pcl" Version="1.8.0-beta" />
<PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1-preview1" /> <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.1931" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.1874" /> <PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.1931" />
<PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" />
<PackageReference Include="YamlDotNet" Version="9.1.1" /> <PackageReference Include="YamlDotNet" Version="9.1.5-issue-templates-0002" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

9
AideDeJeu/AideDeJeu/Models/Items/Item.cs
View file

@ -258,7 +258,8 @@ namespace AideDeJeuLib
[Indexed] [Indexed]
public virtual string Source { get; set; } public virtual string Source { get; set; }
[YamlIgnore] //[YamlIgnore]
[YamlMember(ScalarStyle = ScalarStyle.Literal)]
[DataMember(Name = "Item_Markdown", Order = 8)] [DataMember(Name = "Item_Markdown", Order = 8)]
public virtual string Markdown { get; set; } public virtual string Markdown { get; set; }
@ -567,7 +568,8 @@ namespace AideDeJeuLib
} }
[YamlIgnore] //[YamlIgnore]
[YamlMember(ScalarStyle = ScalarStyle.Literal)]
[DataMember] [DataMember]
public virtual string Description { get; set; } public virtual string Description { get; set; }
@ -575,6 +577,9 @@ namespace AideDeJeuLib
[DataMember] [DataMember]
public virtual string Table { get; set; } public virtual string Table { get; set; }
[YamlMember(ScalarStyle = ScalarStyle.Literal)]
[DataMember]
public virtual string Code { get; set; }
[YamlMember(Alias = "table", Order = 4)] [YamlMember(Alias = "table", Order = 4)]
public virtual Dictionary<string, Dictionary<string, Dictionary<string, string>>> MapTable public virtual Dictionary<string, Dictionary<string, Dictionary<string, string>>> MapTable

17
AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
View file

@ -13,17 +13,20 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.29" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.30" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.1" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.2" />
<PackageReference Include="MoonSharp" Version="2.0.0" /> <PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.8.0-beta" /> <PackageReference Include="sqlite-net-pcl" Version="1.8.0-beta" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.5-pre20201231105030" /> <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.5-pre20210119130047" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.0.5-pre20210119130047" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.5-pre20210119130047" />
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3.linux" Version="1.1.14" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
<PackageReference Include="UrhoSharp.Forms" Version="1.9.67" /> <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1-preview1" /> <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.1931" />
<PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" /> <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" />
</ItemGroup> </ItemGroup>

20
AideDeJeu/AideDeJeuCmd/Program.cs
View file

@ -4,6 +4,7 @@ using AideDeJeu.ViewModels;
using AideDeJeuLib; using AideDeJeuLib;
using Markdig; using Markdig;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Data.Sqlite;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
@ -977,7 +978,8 @@ namespace AideDeJeuCmd
{ {
Tests.Xamarin.Forms.Mocks.MockForms.Init(); Tests.Xamarin.Forms.Mocks.MockForms.Init();
//var truc = new SQLite3Provider_e_sqlite3(); //var truc = new SQLite3Provider_e_sqlite3();
SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_dynamic_cdecl()); //.SQLite3Provider_e_sqlite3()); //SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_dynamic_cdecl()); //.SQLite3Provider_e_sqlite3());
//SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3());
DependencyService.Register<INativeAPI, AideDeJeu.Cmd.Version_CMD>(); DependencyService.Register<INativeAPI, AideDeJeu.Cmd.Version_CMD>();
//var store = new StoreViewModel(); //var store = new StoreViewModel();
//await store.GetItemFromDataAsync("test", "truc"); //await store.GetItemFromDataAsync("test", "truc");
@ -1102,7 +1104,7 @@ namespace AideDeJeuCmd
{ {
int iii = 1; int iii = 1;
} }
var yaml = item.YamlMarkdown; var yamlmd = item.YamlMarkdown;
//var rx = new Regex(@"\(.*?\.md.*?\)"); //var rx = new Regex(@"\(.*?\.md.*?\)");
//var matchess = rx.Matches(yaml); //var matchess = rx.Matches(yaml);
//foreach (Match match in matchess) //foreach (Match match in matchess)
@ -1111,15 +1113,27 @@ namespace AideDeJeuCmd
//} //}
foreach (var matchid in matchids) foreach (var matchid in matchids)
{ {
yaml = yaml.Replace($"({matchid.Key})", $"({matchid.Value})"); yamlmd = yamlmd.Replace($"({matchid.Key})", $"({matchid.Value})");
} }
var filename = Path.Combine(outDir, WebUtility.UrlEncode(item.NewId)); var filename = Path.Combine(outDir, WebUtility.UrlEncode(item.NewId));
if (filename.Contains("%")) if (filename.Contains("%"))
{ {
Console.WriteLine(filename); Console.WriteLine(filename);
} }
await SaveStringAsync(filename, yamlmd);
var yaml = item.Yaml;
foreach (var matchid in matchids)
{
yaml = yaml.Replace($"({matchid.Key})", $"({matchid.Value})");
}
filename = Path.Combine(outDir, WebUtility.UrlEncode(item.NewId)) + ".yml";
if (filename.Contains("%"))
{
Console.WriteLine(filename);
}
await SaveStringAsync(filename, yaml); await SaveStringAsync(filename, yaml);
var filtervm = item.GetNewFilterViewModel(); var filtervm = item.GetNewFilterViewModel();
if (filtervm != null) if (filtervm != null)
{ {

BIN
Data/library_HD.db
View file

Binary file not shown.