claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the build system, now using .NET Framework v4.0 for most things

Browse Source
This commit is contained in:
Grigory Chudov
2018-03-11 17:07:48 -04:00
parent a66bfe28cc
commit 929b7de944
905 changed files with 13647 additions and 216371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
CUETools.CTDB/CUEToolsDB.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using System.Globalization;
using System.IO;
using System.Management;
using System.Net;
using System.Security.Cryptography;
using System.Text;
@@ -11,6 +10,13 @@ using System.Xml.Serialization;
using CUETools.AccurateRip;
using CUETools.CDImage;
using CUETools.Parity;
#if NET20
using System.Management;
#else
using DeviceId;
using DeviceId.Encoders;
using DeviceId.Formatters;
#endif
using Krystalware.UploadHelper;
namespace CUETools.CTDB
@@ -98,9 +104,9 @@ namespace CUETools.CTDB
this.QueryExceptionMessage = resp.StatusDescription;
if (this.QueryResponseStatus == HttpStatusCode.OK)
{
//XmlSerializer serializer = new XmlSerializer(typeof(CTDBResponse));
XmlSerializer serializer = new Microsoft.Xml.Serialization.GeneratedAssembly.CTDBResponseSerializer();
this.total = 0;
//var serializer = new XmlSerializer(typeof(CTDBResponse));
var serializer = new Microsoft.Xml.Serialization.GeneratedAssembly.CTDBResponseSerializer();
this.total = 0;
using (Stream responseStream = resp.GetResponseStream())
{
CTDBResponse ctdbResp = serializer.Deserialize(responseStream) as CTDBResponse;
@@ -277,16 +283,27 @@ namespace CUETools.CTDB
{
if (uuidInfo == null)
{
#if NET20
string id = "CTDB userid";
using (ManagementClass mc = new ManagementClass("Win32_ComputerSystemProduct"))
foreach (ManagementObject mo in mc.GetInstances())
{
id = id + mo.Properties["UUID"].Value.ToString();
break;
}
byte[] hashBytes = (new SHA1CryptoServiceProvider()).ComputeHash(Encoding.ASCII.GetBytes(id));
uuidInfo = Convert.ToBase64String(hashBytes).Replace('+', '.').Replace('/', '_').Replace('=', '-');
}
id = id + mo.Properties["UUID"].Value.ToString();
break;
}
byte[] hashBytes = (new SHA1CryptoServiceProvider()).ComputeHash(Encoding.ASCII.GetBytes(id));
uuidInfo = Convert.ToBase64String(hashBytes).Replace('+', '.').Replace('/', '_').Replace('=', '-');
#else
uuidInfo = new DeviceIdBuilder()
.AddMachineName()
#if NET40
.AddProcessorId()
.AddMotherboardSerialNumber()
#endif
.UseFormatter(new HashDeviceIdFormatter(() => SHA256.Create(), new Base64UrlByteArrayEncoder()))
.ToString();
#endif
}
return uuidInfo;
}
@@ -391,7 +408,8 @@ namespace CUETools.CTDB
{
using (Stream s = resp.GetResponseStream())
{
var serializer = new XmlSerializer(typeof(CTDBResponse));
//var serializer = new XmlSerializer(typeof(CTDBResponse));
var serializer = new Microsoft.Xml.Serialization.GeneratedAssembly.CTDBResponseSerializer();
return serializer.Deserialize(s) as CTDBResponse;
}
}