diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8dd4607 --- /dev/null +++ b/.gitignore @@ -0,0 +1,398 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml \ No newline at end of file diff --git a/quickLog/quickLog/Form1.cs b/quickLog/quickLog/Form1.cs index 6c0ee6c..cdc63a0 100644 --- a/quickLog/quickLog/Form1.cs +++ b/quickLog/quickLog/Form1.cs @@ -5282,7 +5282,7 @@ private void AcordeonMenu() - private void LogToConsole(string message) + internal void LogToConsole(string message) { string timestampedMessage = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} {message}"; //string timestampedMessage = $"{DateTime.Now:HH:mm:ss} {message}"; @@ -6677,75 +6677,8 @@ private void newToolStripMenuItem_Click(object sender, EventArgs e) dbname = saveFileDialog.FileName; this.ConnectionString = $"Data Source={dbname};Version=3;"; this.Text = "Quick Log v 0.1 is working on: " + dbname; - using (SQLiteConnection connection = new SQLiteConnection(ConnectionString)) - - { - connection.Open(); - - string setPragma = "PRAGMA foreign_keys = ON;"; - - string createTableLabels = @" - CREATE TABLE IF NOT EXISTS Labels ( - Label_name TEXT PRIMARY KEY NOT NULL, - Label_color TEXT - )"; - - - string createTableQuery = @" - CREATE TABLE IF NOT EXISTS LogData ( - Log_id INTEGER PRIMARY KEY AUTOINCREMENT, - TimeCreated DATETIME, - UserID TEXT, - EventID INTEGER, - MachineName TEXT, - Level INTEGER, - LogName TEXT, - EventMessage TEXT, - EventMessageXml TEXT, - ActivityID TEXT, - Label TEXT, - Comment TEXT, - FOREIGN KEY (Label) REFERENCES Labels(Label_name) - )"; - - //Crear tabla de resultados para guardar resultados y no calccular cada vez que se abre - - string createTableResults = @" - CREATE TABLE IF NOT EXISTS Results ( - Result TEXT PRIMARY KEY NOT NULL, - Result_Value INTEGER - )"; - - - - using (SQLiteCommand command = new SQLiteCommand(setPragma, connection)) - { - command.ExecuteNonQuery(); - LogToConsole("Pragma On Ok."); - } - - using (SQLiteCommand command = new SQLiteCommand(createTableLabels, connection)) - { - command.ExecuteNonQuery(); - LogToConsole("Table created Ok."); - } - - - using (SQLiteCommand command = new SQLiteCommand(createTableQuery, connection)) - { - command.ExecuteNonQuery(); - LogToConsole("Table created Ok."); - } - - using (SQLiteCommand command = new SQLiteCommand(createTableResults, connection)) - { - command.ExecuteNonQuery(); - LogToConsole("Table created Ok."); - } - - connection.Close(); - - } + var helper = new SqlHelper(new FormOneConsoleLogger(this)); + helper.CreateDatabase(ConnectionString); LogToConsole($"Workspace {dbname} created."); enable_buttons(); label_status.Text = "Add logs using the acquire logs button or drag and drop"; diff --git a/quickLog/quickLog/FormOneConsoleLogger.cs b/quickLog/quickLog/FormOneConsoleLogger.cs new file mode 100644 index 0000000..f21df21 --- /dev/null +++ b/quickLog/quickLog/FormOneConsoleLogger.cs @@ -0,0 +1,15 @@ +namespace quickLog +{ + internal class FormOneConsoleLogger : IQuickLogLogger + { + private readonly FormMain _formMain; + public void LogToConsole(string message) + { + _formMain.LogToConsole(message); + } + public FormOneConsoleLogger(FormMain formMain) + { + _formMain = formMain; + } + } +} diff --git a/quickLog/quickLog/IQuickLogLogger.cs b/quickLog/quickLog/IQuickLogLogger.cs new file mode 100644 index 0000000..5a1f8e3 --- /dev/null +++ b/quickLog/quickLog/IQuickLogLogger.cs @@ -0,0 +1,7 @@ +namespace quickLog +{ + internal interface IQuickLogLogger + { + void LogToConsole(string message); + } +} diff --git a/quickLog/quickLog/SqlHelper.cs b/quickLog/quickLog/SqlHelper.cs new file mode 100644 index 0000000..021309e --- /dev/null +++ b/quickLog/quickLog/SqlHelper.cs @@ -0,0 +1,81 @@ +using System.Data.SQLite; + +namespace quickLog +{ + internal class SqlHelper + { + private const string setPragma = "PRAGMA foreign_keys = ON;"; + + private const string createTableLabels = @" + CREATE TABLE IF NOT EXISTS Labels ( + Label_name TEXT PRIMARY KEY NOT NULL, + Label_color TEXT + )"; + + + private const string createTableQuery = @" + CREATE TABLE IF NOT EXISTS LogData ( + Log_id INTEGER PRIMARY KEY AUTOINCREMENT, + TimeCreated DATETIME, + UserID TEXT, + EventID INTEGER, + MachineName TEXT, + Level INTEGER, + LogName TEXT, + EventMessage TEXT, + EventMessageXml TEXT, + ActivityID TEXT, + Label TEXT, + Comment TEXT, + FOREIGN KEY (Label) REFERENCES Labels(Label_name) + )"; + + //Crear tabla de resultados para guardar resultados y no calccular cada vez que se abre + + private const string createTableResults = @" + CREATE TABLE IF NOT EXISTS Results ( + Result TEXT PRIMARY KEY NOT NULL, + Result_Value INTEGER + )"; + + private readonly IQuickLogLogger _logger; + public void CreateDatabase(string ConnectionString) + { + using SQLiteConnection connection = new(ConnectionString); + connection.Open(); + + using (SQLiteCommand command = new SQLiteCommand(setPragma, connection)) + { + command.ExecuteNonQuery(); + LogToConsole("Pragma On Ok."); + } + + using (SQLiteCommand command = new SQLiteCommand(createTableLabels, connection)) + { + command.ExecuteNonQuery(); + LogToConsole("Table created Ok."); + } + + using (SQLiteCommand command = new SQLiteCommand(createTableQuery, connection)) + { + command.ExecuteNonQuery(); + LogToConsole("Table created Ok."); + } + + using (SQLiteCommand command = new SQLiteCommand(createTableResults, connection)) + { + command.ExecuteNonQuery(); + LogToConsole("Table created Ok."); + } + + connection.Close(); + } + + private void LogToConsole(string message) => _logger.LogToConsole(message); + + public SqlHelper(IQuickLogLogger logger) + { + _logger = logger; + } + } +} diff --git a/quickLog/quickLog/quickLog.csproj b/quickLog/quickLog/quickLog.csproj index 6dac5c2..5a8d41e 100644 --- a/quickLog/quickLog/quickLog.csproj +++ b/quickLog/quickLog/quickLog.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net8.0-windows7.0 enable true enable