[banshee] Windows: Split HardwareManager out into its own folder
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Windows: Split HardwareManager out into its own folder
- Date: Sat, 19 Feb 2011 21:33:05 +0000 (UTC)
commit 3e7a89b5dba8ffbed1b7f2449fbdd35d84049962
Author: Gabriel Burt <gabriel burt gmail com>
Date: Sat Feb 19 15:23:09 2011 -0600
Windows: Split HardwareManager out into its own folder
Moved to Banshee.Windows.Hardware folder (and namespace), and moved the
several classes out into their own files.
.../Banshee.Windows.Hardware/Device.cs | 46 ++++
.../Banshee.Windows.Hardware/HardwareManager.cs | 147 ++++++++++++
.../Banshee.Windows.Hardware/UsbDevice.cs | 53 +++++
.../Banshee.Windows.Hardware/Volume.cs | 94 ++++++++
.../Banshee.Windows/Banshee.Windows.addin.xml | 2 +-
.../Banshee.Windows/Banshee.Windows.csproj | 8 +-
.../Banshee.Windows/HardwareManager.cs | 242 --------------------
7 files changed, 348 insertions(+), 244 deletions(-)
---
diff --git a/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/Device.cs b/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/Device.cs
new file mode 100644
index 0000000..32378f6
--- /dev/null
+++ b/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/Device.cs
@@ -0,0 +1,46 @@
+//
+// Device.cs
+//
+// Author:
+// Gabriel Burt <gabriel burt gmail com>
+//
+// Copyright 2011 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Banshee.Hardware;
+
+namespace Banshee.Windows.Hardware
+{
+ public class Device : IDevice
+ {
+ internal IUsbDevice UsbDevice { get; set; }
+
+ public IUsbDevice ResolveRootUsbDevice () { return UsbDevice; }
+ public IUsbPortInfo ResolveUsbPortInfo () { return null; }
+
+ public string Uuid { get; set; }
+ public string Serial { get; set; }
+ public string Name { get; set; }
+ public string Product { get; set; }
+ public string Vendor { get; set; }
+ public IDeviceMediaCapabilities MediaCapabilities { get; set; }
+ }
+}
diff --git a/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/HardwareManager.cs b/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/HardwareManager.cs
new file mode 100644
index 0000000..a7d139f
--- /dev/null
+++ b/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/HardwareManager.cs
@@ -0,0 +1,147 @@
+//
+// HardwareManager.cs
+//
+// Author:
+// Gabriel Burt <gabriel burt gmail com>
+//
+// Copyright 2011 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+using Banshee.Hardware;
+using System.Management;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+namespace Banshee.Windows.Hardware
+{
+ public class HardwareManager : IHardwareManager
+ {
+ ManagementEventWatcher added_watcher;
+ ManagementEventWatcher removed_watcher;
+
+ public event DeviceAddedHandler DeviceAdded;
+ public event DeviceRemovedHandler DeviceRemoved;
+
+ public HardwareManager ()
+ {
+ // Listen for added/removed disks, with up to three seconds lag
+ added_watcher = new ManagementEventWatcher ("SELECT * FROM __InstanceCreationEvent WITHIN 3 WHERE TargetInstance ISA 'Win32_DiskDrive'");
+ added_watcher.EventArrived += OnDeviceAdded;
+ added_watcher.Start ();
+
+ removed_watcher = new ManagementEventWatcher ("SELECT * FROM __InstanceDeletionEvent WITHIN 3 WHERE TargetInstance ISA 'Win32_DiskDrive'");
+ removed_watcher.EventArrived += OnDeviceRemoved;
+ removed_watcher.Start ();
+ }
+
+ public IEnumerable<IDevice> GetAllDevices ()
+ {
+ return Query ("SELECT * FROM Win32_DiskDrive").Select (o => new Volume (o) as IDevice);
+ }
+
+ private IEnumerable<T> GetAllBlockDevices<T> () where T : IBlockDevice
+ {
+ yield break;
+ }
+
+ public IEnumerable<IBlockDevice> GetAllBlockDevices ()
+ {
+ yield break;
+ }
+
+ public IEnumerable<ICdromDevice> GetAllCdromDevices ()
+ {
+ yield break;
+ }
+
+ public IEnumerable<IDiskDevice> GetAllDiskDevices ()
+ {
+ yield break;
+ }
+
+ public void Dispose ()
+ {
+ added_watcher.EventArrived -= OnDeviceAdded;
+ added_watcher.Stop ();
+ added_watcher.Dispose ();
+ added_watcher = null;
+
+ removed_watcher.EventArrived -= OnDeviceRemoved;
+ removed_watcher.Stop ();
+ removed_watcher.Dispose ();
+ removed_watcher = null;
+ }
+
+ private void OnDeviceAdded (object sender, EventArrivedEventArgs args)
+ {
+ var handler = DeviceAdded;
+ if (handler != null) {
+ var target = (args.NewEvent["TargetInstance"] as ManagementBaseObject);
+ var o = Query ("SELECT * FROM Win32_DiskDrive WHERE PNPDeviceID = '{0}'", target.Str ("PNPDeviceID")).First ();
+ handler (this, new DeviceAddedArgs (new Volume (o)));
+ }
+ }
+
+ private void OnDeviceRemoved (object sender, EventArrivedEventArgs args)
+ {
+ var handler = DeviceRemoved;
+ if (handler != null) {
+ var target = (args.NewEvent["TargetInstance"] as ManagementBaseObject);
+ handler (this, new DeviceRemovedArgs (target.Str ("PNPDeviceID")));
+ }
+ }
+
+ public static IEnumerable<ManagementObject> Query (string q, params object [] args)
+ {
+ if (args != null && args.Length > 0) {
+ // Escape backslashes
+ args = args.Select (a => a.ToString ().Replace ("\\", "\\\\")).ToArray ();
+ q = String.Format (q, args);
+ }
+
+ using (var s = new ManagementObjectSearcher (new ObjectQuery (q))) {
+ foreach (ManagementObject o in s.Get ()) {
+ yield return o;
+ }
+ }
+ }
+ }
+
+ internal static class Extensions
+ {
+ public static string Str (this ManagementBaseObject o, string propName)
+ {
+ var p = o[propName];
+ return p == null ? null : p.ToString ();
+ }
+
+ public static void DumpProperties (this ManagementBaseObject o)
+ {
+ Console.WriteLine ("{0} is a {1}", o, o.ClassPath.ClassName);
+ foreach (var p in o.Properties) {
+ Console.WriteLine (" {0} = {1}", p.Name, p.Value);
+ }
+ }
+ }
+}
diff --git a/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/UsbDevice.cs b/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/UsbDevice.cs
new file mode 100644
index 0000000..a38e19f
--- /dev/null
+++ b/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/UsbDevice.cs
@@ -0,0 +1,53 @@
+//
+// UsbDevice.cs
+//
+// Author:
+// Gabriel Burt <gabriel burt gmail com>
+//
+// Copyright 2011 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Globalization;
+using System.Management;
+using Banshee.Hardware;
+
+namespace Banshee.Windows.Hardware
+{
+ public class UsbDevice : Device, IUsbDevice
+ {
+ // Expects a CIM_USBDevice object
+ // http://msdn.microsoft.com/en-us/library/aa388649%28v=vs.85%29.aspx
+ internal UsbDevice (ManagementObject o)
+ {
+ Uuid = o.Str ("DeviceID");
+ UsbDevice = this;
+
+ // Parse the vendor and product IDs out; best way I could find; patches welcome
+ VendorId = Int32.Parse (Uuid.Substring (Uuid.IndexOf ("VID_") + 4, 4), NumberStyles.HexNumber);
+ ProductId = Int32.Parse (Uuid.Substring (Uuid.IndexOf ("PID_") + 4, 4), NumberStyles.HexNumber);
+ }
+
+ public int ProductId { get; set; }
+ public int VendorId { get; set; }
+ public double Speed { get; set; }
+ public double Version { get; set; }
+ }
+}
diff --git a/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/Volume.cs b/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/Volume.cs
new file mode 100644
index 0000000..5bd62fd
--- /dev/null
+++ b/src/Backends/Banshee.Windows/Banshee.Windows.Hardware/Volume.cs
@@ -0,0 +1,94 @@
+//
+// Volume.cs
+//
+// Author:
+// Gabriel Burt <gabriel burt gmail com>
+//
+// Copyright 2011 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Management;
+using System.Text.RegularExpressions;
+using Banshee.Hardware;
+
+namespace Banshee.Windows.Hardware
+{
+ public class Volume : Device, IVolume
+ {
+ // Regex to grab the alphanumeric code before the ending "&0". Example inputs:
+ // USBSTOR\DISK&VEN_HTC&PROD_ANDROID_PHONE&REV_0100\8&5901EA1&0&HT851N003062&0
+ // USBSTOR\DISK&VEN_KINGSTON&PROD_DATATRAVELER_2.0&REV_1.00\89900000000000006CB02B99&0
+ static Regex regex = new Regex ("[^a-zA-Z0-9]([a-zA-Z0-9]+)&0$", RegexOptions.Compiled);
+
+ // Expects a Win32_DiskDrive object
+ // http://msdn.microsoft.com/en-us/library/aa394132%28v=VS.85%29.aspx
+ internal Volume (ManagementObject o)
+ {
+ if (o.ClassPath.ClassName != "Win32_DiskDrive")
+ throw new ArgumentException (o.ClassPath.ClassName, "o");
+
+ Uuid = o.Str ("PNPDeviceID");
+ Name = o.Str ("Caption");
+
+ // Get USB vendor/product ids from the associated CIM_USBDevice
+ // This way of associating them (via a substring of the PNPDeviceID) is quite a hack; patches welcome
+ var match = regex.Match (Uuid);
+ if (match.Success) {
+ string query = String.Format ("SELECT * FROM CIM_USBDevice WHERE DeviceID LIKE '%{0}'", match.Groups[1].Captures[0].Value);
+ UsbDevice = HardwareManager.Query (query).Select (u => new UsbDevice (u)).FirstOrDefault ();
+ }
+
+ // Get MountPoint and more from the associated LogicalDisk
+ // FIXME this assumes one partition for the device
+ foreach (ManagementObject partition in o.GetRelated ("Win32_DiskPartition")) {
+ foreach (ManagementObject disk in partition.GetRelated ("Win32_LogicalDisk")) {
+ //IsMounted = (bool)ld.GetPropertyValue ("Automount") == true;
+ //IsReadOnly = (ushort) ld.GetPropertyValue ("Access") == 1;
+ MountPoint = disk.Str ("Name") + "/";
+ FileSystem = disk.Str ("FileSystem");
+ Capacity = (ulong) disk.GetPropertyValue ("Size");
+ Available = (long)(ulong)disk.GetPropertyValue ("FreeSpace");
+ return;
+ }
+ }
+ }
+
+ public string DeviceNode { get; set; }
+ public string MountPoint { get; set; }
+ public bool IsMounted { get; set; }
+ public bool IsReadOnly { get; set; }
+ public ulong Capacity { get; set; }
+ public long Available { get; set; }
+ public IBlockDevice Parent { get; set; }
+ public bool ShouldIgnore { get; set; }
+ public string FileSystem { get; set; }
+
+ public bool CanEject { get; set; }
+ public void Eject () {}
+
+ public bool CanMount { get; set; }
+ public void Mount () {}
+
+ public bool CanUnmount { get; set; }
+ public void Unmount () {}
+ }
+}
diff --git a/src/Backends/Banshee.Windows/Banshee.Windows.addin.xml b/src/Backends/Banshee.Windows/Banshee.Windows.addin.xml
index b1c95cd..25b0218 100644
--- a/src/Backends/Banshee.Windows/Banshee.Windows.addin.xml
+++ b/src/Backends/Banshee.Windows/Banshee.Windows.addin.xml
@@ -18,6 +18,6 @@
</Extension>
<Extension path="/Banshee/Platform/HardwareManager">
- <HardwareManager class="Banshee.Windows.HardwareManager" id="Banshee.Windows.HardwareManager"/>
+ <HardwareManager class="Banshee.Windows.Hardware.HardwareManager" id="Banshee.Windows.HardwareManager"/>
</Extension>
</Addin>
\ No newline at end of file
diff --git a/src/Backends/Banshee.Windows/Banshee.Windows.csproj b/src/Backends/Banshee.Windows/Banshee.Windows.csproj
index e4e33c6..55a2d61 100644
--- a/src/Backends/Banshee.Windows/Banshee.Windows.csproj
+++ b/src/Backends/Banshee.Windows/Banshee.Windows.csproj
@@ -83,7 +83,10 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Banshee.Windows\WindowsService.cs" />
- <Compile Include="Banshee.Windows\HardwareManager.cs" />
+ <Compile Include="Banshee.Windows.Hardware\HardwareManager.cs" />
+ <Compile Include="Banshee.Windows.Hardware\Device.cs" />
+ <Compile Include="Banshee.Windows.Hardware\UsbDevice.cs" />
+ <Compile Include="Banshee.Windows.Hardware\Volume.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Banshee.Windows.addin.xml">
@@ -106,4 +109,7 @@
</Properties>
</MonoDevelop>
</ProjectExtensions>
+ <ItemGroup>
+ <Folder Include="Banshee.Windows.Hardware\" />
+ </ItemGroup>
</Project>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
