banshee r3302 - in trunk/musicbrainz-sharp/src/MusicBrainz: . MusicBrainz
- From: scottp svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3302 - in trunk/musicbrainz-sharp/src/MusicBrainz: . MusicBrainz
- Date: Fri, 22 Feb 2008 08:26:45 +0000 (GMT)
Author: scottp
Date: Fri Feb 22 08:26:44 2008
New Revision: 3302
URL: http://svn.gnome.org/viewvc/banshee?rev=3302&view=rev
Log:
More white space fixes
Added:
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/XmlRequestEventArgs.cs
Modified:
trunk/musicbrainz-sharp/src/MusicBrainz/ChangeLog
trunk/musicbrainz-sharp/src/MusicBrainz/Makefile.am
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz.mdp
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Artist.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Disc.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscWin32.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs
trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Utilities.cs
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/Makefile.am
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/Makefile.am (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/Makefile.am Fri Feb 22 08:26:44 2008
@@ -17,7 +17,8 @@
MusicBrainz/Relation.cs \
MusicBrainz/Release.cs \
MusicBrainz/Track.cs \
- MusicBrainz/Utilities.cs
+ MusicBrainz/Utilities.cs \
+ MusicBrainz/XmlRequestEventArgs.cs
instdir = $(prefix)/lib/musicbrainz-sharp
inst_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz.mdp
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz.mdp (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz.mdp Fri Feb 22 08:26:44 2008
@@ -29,6 +29,7 @@
<File name="MusicBrainz/Track.cs" subtype="Code" buildaction="Compile" />
<File name="MusicBrainz/Utilities.cs" subtype="Code" buildaction="Compile" />
<File name="MusicBrainz/DiscLinux.cs" subtype="Code" buildaction="Compile" />
+ <File name="MusicBrainz/XmlRequestEventArgs.cs" subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Artist.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Artist.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Artist.cs Fri Feb 22 08:26:44 2008
@@ -166,6 +166,8 @@
}
#endregion
+
+ #region Static
public static Artist Get (string mbid)
{
@@ -173,8 +175,6 @@
return new Artist (mbid);
}
- #region Query
-
public static Query<Artist> Query (string name)
{
if (name == null) throw new ArgumentNullException ("name");
@@ -187,11 +187,12 @@
return new Query<Artist> (EXTENSION, QueryLimit, CreateLuceneParameter (luceneQuery));
}
- #endregion
-
public static implicit operator string (Artist artist)
{
return artist.ToString ();
}
+
+ #endregion
+
}
}
\ No newline at end of file
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Disc.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Disc.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Disc.cs Fri Feb 22 08:26:44 2008
@@ -51,8 +51,10 @@
void GenerateId ()
{
StringBuilder input_builder = new StringBuilder (804);
+
input_builder.Append (string.Format ("{0:X2}", FirstTrack));
input_builder.Append (string.Format ("{0:X2}", LastTrack));
+
for (int i = 0; i < track_offsets.Length; i++)
input_builder.Append (string.Format ("{0:X8}", track_offsets [i]));
@@ -60,11 +62,13 @@
string base64 = Convert.ToBase64String (SHA1.Create ()
.ComputeHash (Encoding.ASCII.GetBytes (input_builder.ToString ())));
StringBuilder hash_builder = new StringBuilder (base64.Length);
+
foreach (char c in base64)
- if (c == '+') hash_builder.Append ('.');
- else if (c == '/') hash_builder.Append ('_');
- else if (c == '=') hash_builder.Append ('-');
- else hash_builder.Append (c);
+ if (c == '+') hash_builder.Append ('.');
+ else if (c == '/') hash_builder.Append ('_');
+ else if (c == '=') hash_builder.Append ('-');
+ else hash_builder.Append (c);
+
id = hash_builder.ToString ();
}
@@ -98,7 +102,6 @@
public static Disc GetFromDevice (string device)
{
if (device == null) throw new ArgumentNullException ("device");
-
return Environment.OSVersion.Platform != PlatformID.Unix
? (Disc)new DiscWin32 (device) : new DiscLinux (device);
}
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscLinux.cs Fri Feb 22 08:26:44 2008
@@ -35,7 +35,7 @@
static extern int read_toc_header (int fd, int request, ref cdrom_tochdr header);
static int read_toc_header (int fd, ref cdrom_tochdr header)
{
- return read_toc_header(fd, CDROMREADTOCHDR, ref header);
+ return read_toc_header (fd, CDROMREADTOCHDR, ref header);
}
[DllImport ("libc.so.6", EntryPoint = "ioctl")]
@@ -124,10 +124,9 @@
internal DiscLinux (string device)
{
- int fd = open(device, O_RDONLY | O_NONBLOCK);
+ int fd = open (device, O_RDONLY | O_NONBLOCK);
- if (fd < 0)
- throw new Exception (String.Format ("Cannot open device '{0}'", device));
+ if (fd < 0) throw new Exception (String.Format ("Cannot open device '{0}'", device));
try {
if (ReadTocHeader(fd) < 0) throw new Exception ("Cannot read table of contents");
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscWin32.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscWin32.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/DiscWin32.cs Fri Feb 22 08:26:44 2008
@@ -27,6 +27,8 @@
static extern Int32 mciGetErrorString (Int32 errorCode,
StringBuilder errorText,
Int32 errorTextSize);
+
+ delegate void MciCall (string result);
internal DiscWin32 (string device)
{
@@ -102,7 +104,5 @@
throw new Exception (string.Format ("{0} : {1}", failure_message, mci_error.ToString ()));
} else if (code != null) code (mci_result.ToString ());
}
-
- delegate void MciCall (string result);
}
}
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs Fri Feb 22 08:26:44 2008
@@ -27,13 +27,7 @@
country = reader ["country"];
catalog_number = reader ["catalog-number"];
barcode = reader ["barcode"];
- string format_string = reader ["format"];
- if (format_string != null)
- foreach (ReleaseFormat format in Enum.GetValues (typeof (ReleaseFormat)))
- if (format.ToString () == format_string) {
- this.format = format;
- break;
- }
+ format = Utilities.StringToEnum<ReleaseFormat> (reader ["format"]);
if (reader.ReadToDescendant ("label")) {
label = new Label (reader.ReadSubtree ());
reader.Read (); // FIXME this is a workaround for Mono bug 334752
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs Fri Feb 22 08:26:44 2008
@@ -15,12 +15,12 @@
{
public enum LabelType
{
+ Unspecified,
Distributor,
Holding,
OriginalProduction,
BootlegProduction,
- ReissueProduction,
- Unspecified
+ ReissueProduction
}
public sealed class Label : MusicBrainzEntity
@@ -52,12 +52,7 @@
protected override bool HandleAttributes (XmlReader reader)
{
- string type_string = reader ["type"];
- foreach (LabelType type in Enum.GetValues (typeof (LabelType)) as LabelType [])
- if (Utilities.EnumToString (type) == type_string) {
- this.type = type;
- break;
- }
+ type = Utilities.StringToEnum<LabelType> (reader ["type"]);
return this.type != null;
}
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs Fri Feb 22 08:26:44 2008
@@ -47,15 +47,18 @@
switch (reader.Name) {
case "name":
reader.Read ();
- if (reader.NodeType == XmlNodeType.Text) name = reader.ReadContentAsString ();
+ if (reader.NodeType == XmlNodeType.Text)
+ name = reader.ReadContentAsString ();
break;
case "sort-name":
reader.Read ();
- if (reader.NodeType == XmlNodeType.Text) sort_name = reader.ReadContentAsString ();
+ if (reader.NodeType == XmlNodeType.Text)
+ sort_name = reader.ReadContentAsString ();
break;
case "disambiguation":
reader.Read ();
- if (reader.NodeType == XmlNodeType.Text) disambiguation = reader.ReadContentAsString ();
+ if (reader.NodeType == XmlNodeType.Text)
+ disambiguation = reader.ReadContentAsString ();
break;
case "life-span":
begin_date = reader ["begin"];
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs Fri Feb 22 08:26:44 2008
@@ -104,7 +104,7 @@
protected void HandleLoadMissingData (MusicBrainzItem item)
{
title = item.Title;
- if(artist == null) artist = item.Artist;
+ if (artist == null) artist = item.Artist;
base.HandleLoadMissingData (item);
}
@@ -114,7 +114,8 @@
switch (reader.Name) {
case "title":
reader.Read ();
- if (reader.NodeType == XmlNodeType.Text) title = reader.ReadContentAsString ();
+ if (reader.NodeType == XmlNodeType.Text)
+ title = reader.ReadContentAsString ();
break;
case "artist":
artist = new Artist (reader.ReadSubtree ());
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs Fri Feb 22 08:26:44 2008
@@ -18,7 +18,6 @@
namespace MusicBrainz
{
- public delegate void XmlRequestHandler (string url, bool from_cache);
internal delegate void XmlProcessingDelegate (XmlReader reader);
public abstract class MusicBrainzObject
@@ -297,7 +296,7 @@
}
public static RequestCachePolicy CachePolicy;
- public static event XmlRequestHandler XmlRequest;
+ public static event EventHandler<XmlRequestEventArgs> XmlRequest;
static void XmlProcessingClosure (string url, XmlProcessingDelegate code)
{
Monitor.Enter (server_mutex);
@@ -309,12 +308,15 @@
HttpWebRequest request = WebRequest.Create (url) as HttpWebRequest;
bool cache_implemented = false;
+
try {
request.CachePolicy = CachePolicy;
cache_implemented = true;
} catch (NotImplementedException) {
}
+
HttpWebResponse response = null;
+
try {
response = request.GetResponse () as HttpWebResponse;
} catch (WebException e) {
@@ -337,7 +339,8 @@
bool from_cache = cache_implemented && response.IsFromCache;
- if (XmlRequest != null) XmlRequest (url, from_cache);
+ EventHandler<XmlRequestEventArgs> handler = XmlRequest;
+ if (handler != null) handler (null, new XmlRequestEventArgs (url, from_cache));
if (from_cache) Monitor.Exit (server_mutex);
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs Fri Feb 22 08:26:44 2008
@@ -43,13 +43,15 @@
if (value == offset) return;
// We WeakReference the results from previous offsets just in case.
if (results != null)
- if (!weak_references.ContainsKey (offset)) weak_references.Add (offset, new WeakReference (results));
+ if (!weak_references.ContainsKey (offset))
+ weak_references.Add (offset, new WeakReference (results));
else weak_references [offset].Target = results;
results = null;
offset = value;
if (weak_references.ContainsKey (offset)) {
WeakReference weak_reference = weak_references [offset];
- if (weak_reference.IsAlive) results = weak_reference.Target as List<T>;
+ if (weak_reference.IsAlive)
+ results = weak_reference.Target as List<T>;
}
}
}
@@ -65,7 +67,8 @@
public T this [int i] {
get {
if (i < 0 || i >= Count) throw new IndexOutOfRangeException ();
- if (i <= offset || i >= offset + limit) Offset = i;
+ if (i <= offset || i >= offset + limit)
+ Offset = i;
return ResultsWindow [i - offset];
}
}
@@ -91,8 +94,7 @@
public IEnumerator<T> GetEnumerator ()
{
- for (int i = 0; i < Count; i++)
- yield return this [i];
+ for (int i = 0; i < Count; i++) yield return this [i];
}
IEnumerator IEnumerable.GetEnumerator ()
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs Fri Feb 22 08:26:44 2008
@@ -206,7 +206,8 @@
break;
case "asin":
reader.Read ();
- if (reader.NodeType == XmlNodeType.Text) asin = reader.ReadContentAsString ();
+ if (reader.NodeType == XmlNodeType.Text)
+ asin = reader.ReadContentAsString ();
break;
case "disc-list": {
if (reader.ReadToDescendant ("disc")) {
@@ -226,7 +227,8 @@
break;
case "track-list": {
string offset = reader ["offset"];
- if (offset != null) track_number = int.Parse (offset) + 1;
+ if (offset != null)
+ track_number = int.Parse (offset) + 1;
if (reader.ReadToDescendant ("track")) {
tracks = new List<Track> ();
do tracks.Add (new Track (reader.ReadSubtree (), AllDataLoaded));
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs Fri Feb 22 08:26:44 2008
@@ -127,7 +127,8 @@
switch (reader.Name) {
case "duration":
reader.Read ();
- if (reader.NodeType == XmlNodeType.Text) duration = uint.Parse (reader.ReadContentAsString ());
+ if (reader.NodeType == XmlNodeType.Text)
+ duration = uint.Parse (reader.ReadContentAsString ());
break;
case "release-list":
if(reader.ReadToDescendant ("release")) {
Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Utilities.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Utilities.cs (original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Utilities.cs Fri Feb 22 08:26:44 2008
@@ -19,12 +19,22 @@
StringBuilder builder = new StringBuilder (str.Length);
builder.Append (str [0]);
for (int i = 1; i < str.Length; i++) {
- if (str [i] >= 'A' && str [i] <= 'Z') builder.Append ('-');
+ if (str [i] >= 'A' && str [i] <= 'Z')
+ builder.Append ('-');
builder.Append (str [i]);
}
return builder.ToString ();
}
+ public static T StringToEnum<T> (string name)
+ {
+ if (name != null)
+ foreach (T value in Enum.GetValues (typeof (T)))
+ if (Enum.GetName (typeof (T), value) == name)
+ return value;
+ return default (T);
+ }
+
public static string PercentEncode (string value)
{
StringBuilder builder = new StringBuilder ();
Added: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/XmlRequestEventArgs.cs
==============================================================================
--- (empty file)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/XmlRequestEventArgs.cs Fri Feb 22 08:26:44 2008
@@ -0,0 +1,24 @@
+/***************************************************************************
+ * XmlRequestEventArgs.cs
+ *
+ * Authored by Scott Peterson <lunchtimemama gmail com>
+ *
+ * The author disclaims copyright to this source code.
+ ****************************************************************************/
+
+using System;
+
+namespace MusicBrainz
+{
+ public sealed class XmlRequestEventArgs : EventArgs
+ {
+ public readonly string Uri;
+ public readonly bool FromCache;
+
+ public XmlRequestEventArgs(string uri, bool fromCache)
+ {
+ Uri = uri;
+ FromCache = fromCache;
+ }
+ }
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
