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

Moved software type version from Interop to Metadata.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-29 01:32:12 +00:00
parent cfee0226dd
commit efc48f3e6a
8 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.idea.DiscImageChef/.idea/contentModel.xml generated
View File

@@ -679,6 +679,7 @@
</e>
<e p="Resume.cs" t="Include" />
<e p="Statistics.cs" t="Include" />
<e p="Version.cs" t="Include" />
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive" />
</e>

4
DiscImageChef.Core/Devices/Dumping/ResumeSupport.cs
View File

@@ -117,7 +117,7 @@ namespace DiscImageChef.Core.Devices.Dumping
currentTry = new DumpHardwareType
{
Software = Version.GetSoftwareType(platform),
Software = Metadata.Version.GetSoftwareType(platform),
Manufacturer = manufacturer,
Model = model,
Serial = serial
@@ -136,7 +136,7 @@ namespace DiscImageChef.Core.Devices.Dumping
};
currentTry = new DumpHardwareType
{
Software = Version.GetSoftwareType(platform),
Software = Metadata.Version.GetSoftwareType(platform),
Manufacturer = manufacturer,
Model = model,
Serial = serial

2
DiscImageChef.Core/Devices/Dumping/SSC.cs
View File

@@ -43,7 +43,7 @@ using DiscImageChef.Devices;
using DiscImageChef.Metadata;
using Schemas;
using MediaType = DiscImageChef.CommonTypes.MediaType;
using Version = DiscImageChef.Interop.Version;
using Version = DiscImageChef.Metadata.Version;
namespace DiscImageChef.Core.Devices.Dumping
{

28
DiscImageChef.Core/Remote.cs
View File

@@ -36,6 +36,7 @@ using System.Net;
using System.Threading;
using System.Xml.Serialization;
using DiscImageChef.Metadata;
using Version = DiscImageChef.Interop.Version;
namespace DiscImageChef.Core
{
@@ -54,29 +55,30 @@ namespace DiscImageChef.Core
{
try
{
#if DEBUG
#if DEBUG
System.Console.WriteLine("Uploading device report");
#else
#else
DiscImageChef.Console.DicConsole.DebugWriteLine("Submit stats", "Uploading device report");
#endif
#endif
MemoryStream xmlStream = new MemoryStream();
XmlSerializer xmlSer = new XmlSerializer(typeof(DeviceReport));
MemoryStream xmlStream = new MemoryStream();
XmlSerializer xmlSer = new XmlSerializer(typeof(DeviceReport));
xmlSer.Serialize(xmlStream, report);
xmlStream.Seek(0, SeekOrigin.Begin);
WebRequest request = WebRequest.Create("http://discimagechef.claunia.com/api/uploadreport");
WebRequest request =
WebRequest.Create("http://discimagechef.claunia.com/api/uploadreport");
((HttpWebRequest)request).UserAgent = $"DiscImageChef {typeof(Version).Assembly.GetName().Version}";
request.Method = "POST";
request.ContentLength = xmlStream.Length;
request.ContentType = "application/xml";
Stream reqStream = request.GetRequestStream();
request.Method = "POST";
request.ContentLength = xmlStream.Length;
request.ContentType = "application/xml";
Stream reqStream = request.GetRequestStream();
xmlStream.CopyTo(reqStream);
reqStream.Close();
WebResponse response = request.GetResponse();
if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK) return;
Stream data = response.GetResponseStream();
Stream data = response.GetResponseStream();
StreamReader reader = new StreamReader(data ?? throw new InvalidOperationException());
reader.ReadToEnd();
@@ -91,9 +93,9 @@ namespace DiscImageChef.Core
// ReSharper disable once RedundantCatchClause
catch
{
#if DEBUG
#if DEBUG
throw;
#endif
#endif
}
});
submitThread.Start();

6
DiscImageChef.Interop/DiscImageChef.Interop.csproj
View File

@@ -44,12 +44,6 @@
<Link>LICENSE.MIT</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DiscImageChef.Metadata\DiscImageChef.Metadata.csproj">
<Project>{9F213318-5CB8-4066-A757-074489C9F818}</Project>
<Name>DiscImageChef.Metadata</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<MonoDevelop>

19
DiscImageChef.Interop/Version.cs
View File

@@ -36,29 +36,10 @@
// Copyright © 2011-2018 Natalia Portillo
// ****************************************************************************/
using DiscImageChef.Interop;
using Schemas;
namespace DiscImageChef.Interop
{
public static class Version
{
/// <summary>
/// Gets XML software type for the running version
/// </summary>
/// <param name="platform">Platform we are running in</param>
/// <returns>XML software type</returns>
public static SoftwareType GetSoftwareType(PlatformID platform)
{
// TODO: Platform should be get automatically
return new SoftwareType
{
Name = "DiscImageChef",
OperatingSystem = platform.ToString(),
Version = typeof(Version).Assembly.GetName().Version.ToString()
};
}
/// <summary>
/// Gets version string
/// </summary>

7
DiscImageChef.Metadata/DiscImageChef.Metadata.csproj
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,6 +45,7 @@
<Compile Include="Statistics.cs" />
<Compile Include="Resume.cs" />
<Compile Include="ExtentsConverter.cs" />
<Compile Include="Version.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
@@ -60,6 +61,10 @@
<Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
<Name>DiscImageChef.Helpers</Name>
</ProjectReference>
<ProjectReference Include="..\DiscImageChef.Interop\DiscImageChef.Interop.csproj">
<Project>{9183f2e0-a879-4f23-9ee3-c6908f1332b2}</Project>
<Name>DiscImageChef.Interop</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\LICENSE.LGPL">

56
DiscImageChef.Metadata/Version.cs Normal file
View File

@@ -0,0 +1,56 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : Statistics.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// Component : XML metadata.
//
// --[ Description ] ----------------------------------------------------------
//
// Returns DiscImageChef version in XML software type format.
//
// --[ License ] --------------------------------------------------------------
//
// This library is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation; either version 2.1 of the
// License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2011-2018 Natalia Portillo
// ****************************************************************************/
using DiscImageChef.Interop;
using Schemas;
namespace DiscImageChef.Metadata
{
public static class Version
{
/// <summary>
/// Gets XML software type for the running version
/// </summary>
/// <param name="platform">Platform we are running in</param>
/// <returns>XML software type</returns>
public static SoftwareType GetSoftwareType(PlatformID platform)
{
// TODO: Platform should be get automatically
return new SoftwareType
{
Name = "DiscImageChef",
OperatingSystem = platform.ToString(),
Version = typeof(Version).Assembly.GetName().Version.ToString()
};
}
}
}