diff --git a/cicm_web/Program.cs b/cicm_web/Program.cs index d0b1aba0..ba4e731c 100644 --- a/cicm_web/Program.cs +++ b/cicm_web/Program.cs @@ -123,12 +123,6 @@ namespace cicm_web Console.WriteLine("\u001b[31;1mRendering new country flags...\u001b[0m"); SvgRender.RenderCountries(); DateTime end = DateTime.Now; - Console.WriteLine("\u001b[31;1mTook \u001b[32;1m{0} seconds\u001b[31;1m...\u001b[0m", - (end - start).TotalSeconds); - start = DateTime.Now; - Console.WriteLine("\u001b[31;1mImporting company logos...\u001b[0m"); - SvgRender.ImportCompanyLogos(); - end = DateTime.Now; Console.WriteLine("\u001b[31;1mTook \u001b[32;1m{0} seconds\u001b[31;1m...\u001b[0m", (end - start).TotalSeconds); @@ -146,6 +140,12 @@ namespace cicm_web end = DateTime.Now; Console.WriteLine("\u001b[31;1mTook \u001b[32;1m{0} seconds\u001b[31;1m...\u001b[0m", (end - start).TotalSeconds); + start = DateTime.Now; + Console.WriteLine("\u001b[31;1mImporting company logos...\u001b[0m"); + SvgRender.ImportCompanyLogos(context); + end = DateTime.Now; + Console.WriteLine("\u001b[31;1mTook \u001b[32;1m{0} seconds\u001b[31;1m...\u001b[0m", + (end - start).TotalSeconds); } catch(Exception ex) { diff --git a/cicm_web/SvgRender.cs b/cicm_web/SvgRender.cs index 6843c6a2..313b8862 100644 --- a/cicm_web/SvgRender.cs +++ b/cicm_web/SvgRender.cs @@ -1,8 +1,7 @@ using System; using System.IO; -using Cicm.Database.Schemas; +using Cicm.Database.Models; using SkiaSharp; -using Console = System.Console; using SKSvg = SkiaSharp.Extended.Svg.SKSvg; namespace cicm_web @@ -74,7 +73,7 @@ namespace cicm_web } } - public static void ImportCompanyLogos() + public static void ImportCompanyLogos(cicmContext context) { if(!Directory.Exists("wwwroot/assets/incoming")) return; @@ -95,9 +94,12 @@ namespace cicm_web if(!int.TryParse(pieces[2], out int year)) continue; - CompanyLogo entry = new CompanyLogo {CompanyId = companyId, Year = year, Guid = guid}; - - if(!Program.Database.Operations.AddCompanyLogo(entry, out _)) continue; + try + { + context.CompanyLogos.Add(new CompanyLogo {CompanyId = companyId, Year = year, Guid = guid}); + context.SaveChanges(); + } + catch(Exception) { continue; } File.Move(file, $"wwwroot/assets/logos/{guid}.svg"); }