mirror of
https://github.com/claunia/cuetools.net.git
synced 2025-12-16 18:14:25 +00:00
Finalized 2.1.2;
Starting work on 2.1.3 (prioritized metadata lookup, freedb via ctdb)
This commit is contained in:
@@ -57,7 +57,7 @@ namespace CUETools.CTDB
|
||||
}
|
||||
}
|
||||
|
||||
public void ContactDB(string server, string userAgent, string driveName, bool musicbrainz, bool fuzzy)
|
||||
public void ContactDB(string server, string userAgent, string driveName, bool ctdb, bool fuzzy, CTDBPriority musicbrainz, CTDBPriority freedb, CTDBPriority freedbFuzzy)
|
||||
{
|
||||
this.driveName = driveName;
|
||||
this.userAgent = userAgent + " (" + Environment.OSVersion.VersionString + ")" + (driveName != null ? " (" + driveName + ")" : "");
|
||||
@@ -65,7 +65,10 @@ namespace CUETools.CTDB
|
||||
this.total = 0;
|
||||
|
||||
HttpWebRequest req = (HttpWebRequest)WebRequest.Create(urlbase
|
||||
+ "/lookup2.php?musicbrainz=" + (musicbrainz ? 1 : 0)
|
||||
+ "/lookup2.php"
|
||||
+ "?ctdb=" + (ctdb ? "1" : "0")
|
||||
+ "&musicbrainz=" + ((int)musicbrainz).ToString()
|
||||
+ "&freedb=" + ((int)freedb + 8 * (int)freedbFuzzy).ToString()
|
||||
+ "&fuzzy=" + (fuzzy ? 1 : 0)
|
||||
+ "&toc=" + toc.ToString());
|
||||
req.Method = "GET";
|
||||
@@ -419,6 +422,20 @@ namespace CUETools.CTDB
|
||||
}
|
||||
}
|
||||
|
||||
public int Confidence
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.QueryExceptionStatus != WebExceptionStatus.Success)
|
||||
return 0;
|
||||
int res = 0;
|
||||
foreach (DBEntry entry in this.Entries)
|
||||
if (entry.toc.ToString() == this.toc.ToString() && !entry.hasErrors)
|
||||
res += entry.conf;
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
public DBEntry MatchingEntry
|
||||
{
|
||||
get
|
||||
@@ -738,6 +755,8 @@ namespace CUETools.CTDB
|
||||
public string name { get; set; }
|
||||
[XmlAttribute]
|
||||
public string artist { get; set; }
|
||||
[XmlAttribute]
|
||||
public string extra { get; set; }
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
@@ -753,7 +772,9 @@ namespace CUETools.CTDB
|
||||
public class CTDBResponseMeta
|
||||
{
|
||||
[XmlAttribute]
|
||||
public string release_gid { get; set; }
|
||||
public string source { get; set; }
|
||||
[XmlAttribute]
|
||||
public string id { get; set; }
|
||||
[XmlAttribute]
|
||||
public string artist { get; set; }
|
||||
[XmlAttribute]
|
||||
@@ -763,6 +784,8 @@ namespace CUETools.CTDB
|
||||
[XmlAttribute]
|
||||
public string genre { get; set; }
|
||||
[XmlAttribute]
|
||||
public string extra { get; set; }
|
||||
[XmlAttribute]
|
||||
public string country { get; set; }
|
||||
[XmlAttribute]
|
||||
public string releasedate { get; set; }
|
||||
@@ -793,4 +816,12 @@ namespace CUETools.CTDB
|
||||
[XmlElement]
|
||||
public CTDBResponseMeta[] musicbrainz;
|
||||
}
|
||||
|
||||
public enum CTDBPriority
|
||||
{
|
||||
None = 0,
|
||||
High = 1,
|
||||
Medium = 2,
|
||||
Low = 3
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user