claunia/apprepodbmgr
1
0
Fork 0
mirror of https://github.com/claunia/apprepodbmgr.git synced 2025-12-16 19:24:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Format document.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-19 18:22:54 +01:00
parent 0b23650ad0
commit 97f519f88b
20 changed files with 84 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osrepodbmgr.Core/ChangeLog
View File

@@ -1,3 +1,10 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* Settings.cs:
* packages.config:
* Workers/VirusTotal.cs:
Refactor: Format document.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* AlgoEnum.cs:

4
osrepodbmgr.Core/Settings.cs
View File

@@ -241,7 +241,7 @@ namespace osrepodbmgr.Core
prefsFs.Close();
if(prefsSr != null)
prefsSr.Close();
SetDefaultSettings();
SaveSettings();
}
@@ -292,7 +292,7 @@ namespace osrepodbmgr.Core
key.SetValue("TemporaryFolder", Current.TemporaryFolder);
key.SetValue("DatabasePath", Current.DatabasePath);
key.SetValue("RepositoryPath", Current.RepositoryPath);
if (Current.UnArchiverPath != null)
if(Current.UnArchiverPath != null)
key.SetValue("UnArchiverPath", Current.UnArchiverPath);
key.SetValue("CompressionAlgorithm", Current.CompressionAlgorithm);
key.SetValue("UseAntivirus", Current.UseAntivirus);

2
osrepodbmgr.Core/Workers/VirusTotal.cs
View File

@@ -311,7 +311,7 @@ namespace osrepodbmgr.Core
// Timeout...
if(counter == 10)
break;
// Wait 15 seconds so we fall in the 4 requests/minute
Thread.Sleep(15000);

18
osrepodbmgr.Core/packages.config
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
<package id="nClam" version="3.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
<package id="plist-cil" version="1.15.0" targetFramework="net45" />
<package id="SharpCompress" version="0.15.2" targetFramework="net45" />
<package id="System.Data.SQLite.Core" version="1.0.105.0" targetFramework="net45" />
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net45" />
<package id="System.Net.Http" version="4.3.1" targetFramework="net45" />
<package id="VirusTotal.NET" version="1.5.3" targetFramework="net45" />
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
<package id="nClam" version="3.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
<package id="plist-cil" version="1.15.0" targetFramework="net45" />
<package id="SharpCompress" version="0.15.2" targetFramework="net45" />
<package id="System.Data.SQLite.Core" version="1.0.105.0" targetFramework="net45" />
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net45" />
<package id="System.Net.Http" version="4.3.1" targetFramework="net45" />
<package id="VirusTotal.NET" version="1.5.3" targetFramework="net45" />
</packages>

6
osrepodbmgr.Eto.Desktop/ChangeLog
View File

@@ -1,3 +1,9 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* Program.cs:
* packages.config:
Refactor: Format document.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* Program.cs:

2
osrepodbmgr.Eto.Desktop/Program.cs
View File

@@ -47,7 +47,7 @@ namespace osrepodbmgr.Eto.Desktop
Context.virusTotalEnabled = Workers.InitVirusTotal(Settings.Current.VirusTotalKey);
}
Context.usableDotNetZip = !Platform.Detect.IsMac && !Platform.Detect.IsIos;
new Application(Platform.Detect).Run(new frmMain());
}
}

10
osrepodbmgr.Eto.Desktop/packages.config
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Eto.Forms" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.Gtk" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.Gtk3" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.Windows" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.Wpf" version="2.3.0" targetFramework="net45" />
<package id="Eto.Forms" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.Gtk" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.Gtk3" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.Windows" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.Wpf" version="2.3.0" targetFramework="net45" />
</packages>

5
osrepodbmgr.Eto.XamMac2/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* packages.config:
Refactor: Format document.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* Program.cs:

4
osrepodbmgr.Eto.XamMac2/packages.config
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Eto.Forms" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.XamMac2" version="2.3.0" targetFramework="net45" />
<package id="Eto.Forms" version="2.3.0" targetFramework="net45" />
<package id="Eto.Platform.XamMac2" version="2.3.0" targetFramework="net45" />
</packages>

10
osrepodbmgr.Eto/ChangeLog
View File

@@ -1,3 +1,13 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* dlgAdd.xeto:
* frmMain.xeto:
* dlgAdd.xeto.cs:
* frmMain.xeto.cs:
* packages.config:
* dlgSettings.xeto.cs:
Refactor: Format document.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* dlgAdd.xeto.cs:

14
osrepodbmgr.Eto/dlgAdd.xeto
View File

@@ -100,7 +100,7 @@
<StackLayoutItem Expand="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<TabControl>
<TabPage Text="Files">
<GridView ID="treeFiles" SelectionChanged="treeFilesSelectionChanged"/>
<GridView ID="treeFiles" SelectionChanged="treeFilesSelectionChanged" />
</TabPage>
<TabPage Text="OSes" ID="tabOSes" Visible="False">
<GridView ID="treeOSes" />
@@ -109,9 +109,9 @@
</StackLayoutItem>
</StackLayout>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Center">
<Label ID="lblStatus" Visible="False">lblStatus</Label>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Center">
<Label ID="lblStatus" Visible="False">lblStatus</Label>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Stretch">
<Label ID="lblProgress" Visible="False">Progress</Label>
</StackLayoutItem>
@@ -129,9 +129,9 @@
<StackLayoutItem HorizontalAlignment="Left">
<Button ID="btnRemoveFile" Click="OnBtnRemoveFileClicked" Visible="False">Remove</Button>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Left">
<Button ID="btnToggleCrack" Click="OnBtnToggleCrackClicked" Visible="False">Mark as crack</Button>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Left">
<Button ID="btnToggleCrack" Click="OnBtnToggleCrackClicked" Visible="False">Mark as crack</Button>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Left">
<Button ID="btnMetadata" Click="OnBtnMetadataClicked" Visible="False">Metadata</Button>
</StackLayoutItem>

2
osrepodbmgr.Eto/dlgAdd.xeto.cs
View File

@@ -472,7 +472,7 @@ namespace osrepodbmgr.Eto
}
else
btnMetadata.BackgroundColor = Colors.Red;
lblStatus.Visible = true;
lblStatus.Text = string.Format("{0} files ({1} already known)", fileView.Count, knownFiles);
});

5
osrepodbmgr.Eto/dlgSettings.xeto.cs
View File

@@ -128,7 +128,8 @@ namespace osrepodbmgr.Eto
{
Core.Settings.Current.UseVirusTotal = false;
Core.Settings.Current.VirusTotalKey = null;
} Settings.SaveSettings();
}
Settings.SaveSettings();
Workers.CloseDB();
Workers.InitDB();
Context.clamdVersion = null;
@@ -143,7 +144,7 @@ namespace osrepodbmgr.Eto
dlgFile.Title = "Choose UnArchiver executable";
dlgFile.MultiSelect = false;
if(!string.IsNullOrWhiteSpace(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)))
dlgFile.Directory = new Uri(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles));
dlgFile.Directory = new Uri(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles));
if(dlgFile.ShowDialog(this) == DialogResult.Ok)
{

18
osrepodbmgr.Eto/frmMain.xeto
View File

@@ -6,9 +6,9 @@
<StackLayoutItem Expand="True" HorizontalAlignment="Stretch">
<GridView ID="treeOSes" Enabled="False" />
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Center">
<Label ID="lblOSStatus" Visible="False">lblOSStatus</Label>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Center">
<Label ID="lblOSStatus" Visible="False">lblOSStatus</Label>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Stretch">
<Label ID="lblProgress">lblProgress</Label>
</StackLayoutItem>
@@ -37,9 +37,9 @@
<StackLayoutItem Expand="True" HorizontalAlignment="Stretch">
<GridView ID="treeFiles" Enabled="False" SelectionChanged="treeFilesSelectionChanged" />
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Center">
<Label ID="lblFileStatus" Visible="False">lblFileStatus</Label>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Center">
<Label ID="lblFileStatus" Visible="False">lblFileStatus</Label>
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Stretch">
<Label ID="lblProgressFiles1" Visible="False">lblProgress</Label>
</StackLayoutItem>
@@ -55,10 +55,10 @@
<StackLayoutItem HorizontalAlignment="Center">
<StackLayout Orientation="Horizontal">
<Button x:Name="btnStopFiles" Click="OnBtnStopFilesClicked" Visible="False">Stop</Button>
<Button x:Name="btnCleanFiles" Click="OnBtnCleanFilesClicked" Visible="False">Clean files</Button>
<Button x:Name="btnCleanFiles" Click="OnBtnCleanFilesClicked" Visible="False">Clean files</Button>
<Button x:Name="btnToggleCrack" Click="OnBtnToggleCrackClicked" Visible="False">Mark as crack</Button>
<Button x:Name="btnScanAllPending" Click="OnBtnScanAllPendingClicked" Visible="False">Scan all with clamd</Button>
<Button x:Name="btnScanWithClamd" Click="OnBtnScanWithClamdClicked" Visible="False">Scan with clamd</Button>
<Button x:Name="btnScanAllPending" Click="OnBtnScanAllPendingClicked" Visible="False">Scan all with clamd</Button>
<Button x:Name="btnScanWithClamd" Click="OnBtnScanWithClamdClicked" Visible="False">Scan with clamd</Button>
<Button x:Name="btnCheckInVirusTotal" Click="OnBtnCheckInVirusTotalClicked" Visible="False">Check with VirusTotal</Button>
<Button x:Name="btnPopulateFiles" Click="OnBtnPopulateFilesClicked">Populate</Button>
</StackLayout>

2
osrepodbmgr.Eto/frmMain.xeto.cs
View File

@@ -1045,7 +1045,7 @@ namespace osrepodbmgr.Eto
"belong to any OS and remove it from the database.\n\n" +
"It will then search the repository for any file not on the database and remove it.\n\n" +
"THIS OPERATION MAY VERY LONG, CANNOT BE CANCELED AND REMOVES DATA ON DISK.\n\n" +
"Are you sure to continue?", MessageBoxButtons.YesNo, MessageBoxType.Question);
"Are you sure to continue?", MessageBoxButtons.YesNo, MessageBoxType.Question);
if(result == DialogResult.Yes)
{
btnCleanFiles.Visible = false;

8
osrepodbmgr.Eto/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Eto.Forms" version="2.3.0" targetFramework="net45" />
<package id="Eto.Serialization.Xaml" version="2.3.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
<package id="Portable.Xaml" version="0.14.0" targetFramework="net45" />
<package id="Eto.Forms" version="2.3.0" targetFramework="net45" />
<package id="Eto.Serialization.Xaml" version="2.3.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
<package id="Portable.Xaml" version="0.14.0" targetFramework="net45" />
</packages>

7
osrepodbmgr/ChangeLog
View File

@@ -1,3 +1,10 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* frmMain.cs:
* Program.cs:
* packages.config:
Refactor: Format document.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* frmMain.cs:

2
osrepodbmgr/Program.cs
View File

@@ -42,7 +42,7 @@ namespace osrepodbmgr
if(Core.Settings.Current.UseClamd)
Workers.InitClamd();
if(Core.Settings.Current.UseVirusTotal)
Context.virusTotalEnabled = Workers.InitVirusTotal(Core.Settings.Current.VirusTotalKey);
Context.virusTotalEnabled = Workers.InitVirusTotal(Core.Settings.Current.VirusTotalKey);
}
Application.Init();
frmMain win = new frmMain();

2
osrepodbmgr/frmMain.cs
View File

@@ -635,7 +635,7 @@ namespace osrepodbmgr
thdScanFile = null;
}
}
AllClamdFinished();
AllClamdFinished();
}
protected void OnBtnToggleCrackClicked(object sender, EventArgs e)

4
osrepodbmgr/packages.config
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
<package id="DotNetZip" version="1.10.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
</packages>