[banshee] Dap.MassStorage: split RockBox logic into its own class

[AndrÃs Aragoneses <aaragoneses src gnome org>]

commit 6fc78098cb4964f03216b146da870ea4bef2f019
Author: Andres G. Aragoneses <knocte gmail com>
Date:   Thu Jan 19 00:55:05 2012 +0000

    Dap.MassStorage: split RockBox logic into its own class
    
    RockBox device logic was mixed in MassStorageDevice class
    instead of being a derived class like other kind of devices.
    Refactoring to separate things out, no change of behaviour
    intended.
    
    Signed-off-by: Alexander Kojevnikov <alexk gnome org>

 po/POTFILES.in                                     |    1 +
 .../Banshee.Dap.MassStorage.csproj                 |    1 +
 .../Banshee.Dap.MassStorage/DeviceMapper.cs        |    6 +
 .../Banshee.Dap.MassStorage/MassStorageDevice.cs   |   43 +++----
 .../Banshee.Dap.MassStorage/RockBoxDevice.cs       |  127 ++++++++++++++++++++
 src/Dap/Banshee.Dap.MassStorage/Makefile.am        |    1 +
 6 files changed, 154 insertions(+), 25 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d90f694..bd5da61 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -182,6 +182,7 @@ src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs
 src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
 src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
 src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
+src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs
 src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs
 src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
 src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.csproj b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.csproj
index c13e829..d3126e1 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.csproj
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.csproj
@@ -73,6 +73,7 @@
     <Compile Include="Banshee.Dap.MassStorage\WebOSDevice.cs" />
     <Compile Include="Banshee.Dap.MassStorage\MaemoDevice.cs" />
     <Compile Include="Banshee.Dap.MassStorage\NookDevice.cs" />
+    <Compile Include="Banshee.Dap.MassStorage\RockBoxDevice.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Banshee.Dap.MassStorage.addin.xml">
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DeviceMapper.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DeviceMapper.cs
index 4008a0f..7fa1c77 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DeviceMapper.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DeviceMapper.cs
@@ -27,6 +27,7 @@
 //
 
 using System;
+using System.IO;
 using Mono.Addins;
 
 using Banshee.Hardware;
@@ -65,6 +66,11 @@ namespace Banshee.Dap.MassStorage
                 }
             }
 
+            string path_rockbox = System.IO.Path.Combine (source.Volume.MountPoint, ".rockbox/config.cfg");
+            if (File.Exists (path_rockbox) ) {
+                return new RockBoxDevice (source);
+            }
+
             return new MassStorageDevice (source);
         }
     }
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
index 78ce92e..5117d42 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
@@ -76,35 +76,12 @@ namespace Banshee.Dap.MassStorage
         public virtual bool LoadDeviceConfiguration ()
         {
             string path = IsAudioPlayerPath;
-            string path_rockbox = System.IO.Path.Combine (source.Volume.MountPoint, ".rockbox/config.cfg");
 
-            if (!File.Exists (path) && !File.Exists (path_rockbox) ) {
+            if (!File.Exists (path)) {
                 return false;
             }
 
-            if (File.Exists (path_rockbox) ) {
-                Hyena.Log.DebugFormat ("Found RockBox Device");
-                name = Catalog.GetString ("Rockbox Device");
-                audio_folders = new string [] {"Music/","Videos/"};
-                video_folders = new string [] {"Videos/"};
-                folder_depth = 2;
-                playback_mime_types = new string [] {"application/ogg","audio/x-ms-wma","audio/mpeg","audio/mp4","audio/flac","audio/aac","audio/mp4","audio/x-wav"};
-                playlist_formats = new string [] {"audio/x-mpegurl"};
-                playlist_path = "Playlists/";
-                cover_art_file_name = "cover.jpg";
-                cover_art_file_type = "jpeg";
-                cover_art_size = 320;
-
-            } else {
-                LoadConfig ();
-            }
-
-            return true;
-        }
-
-        protected void LoadConfig ()
-        {
-            var config = new Dictionary<string, string[]> ();
+            IDictionary<string, string[]> config = null;
 
             if (File.Exists (IsAudioPlayerPath)) {
 
@@ -119,6 +96,22 @@ namespace Banshee.Dap.MassStorage
                 }
             }
 
+            LoadConfig (config);
+
+            return true;
+        }
+
+        protected void LoadConfig ()
+        {
+            LoadConfig (null);
+        }
+
+        private void LoadConfig (IDictionary<string, string[]> config)
+        {
+            if (config == null) {
+                config = new Dictionary<string, string[]> ();
+            }
+
             name = GetPreferredValue ("name", config, DefaultName);
             cover_art_file_type = GetPreferredValue ("cover_art_file_type", config, DefaultCoverArtFileType);
             cover_art_file_name = GetPreferredValue ("cover_art_file_name", config, DefaultCoverArtFileName);
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs
new file mode 100644
index 0000000..f5a7a68
--- /dev/null
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs
@@ -0,0 +1,127 @@
+//
+// RockBoxDevice.cs
+//
+// Authors:
+//   Jack Deslippe <jdeslip gmail com>
+//   AndrÃs G. Aragoneses <knocte gmail com>
+//
+// Copyright (C) 2008 Jack Deslippe
+// Copyright (C) 2012 Andres G. Aragoneses
+// 
+// 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 Mono.Unix;
+
+namespace Banshee.Dap.MassStorage
+{
+    public class RockBoxDevice : MassStorageDevice
+    {
+        public RockBoxDevice (MassStorageSource source) : base (source)
+        {
+        }
+
+        private static string name = Catalog.GetString ("Rockbox Device");
+
+        private static string[] playback_mime_types = new string [] {
+            "application/ogg",
+            "audio/x-ms-wma",
+            "audio/mpeg",
+            "audio/mp4",
+            "audio/flac",
+            "audio/aac",
+            "audio/mp4",
+            "audio/x-wav"
+        };
+
+        private static string[] audio_folders = new string [] {
+            "Music/",
+            "Videos/"
+        };
+
+        private static string[] video_folders = new string [] {
+            "Videos/"
+        };
+
+        private static string[] playlist_formats = new string [] {
+            "audio/x-mpegurl"
+        };
+
+        private static string playlists_path = "Playlists/";
+
+        private static int folder_depth = 2;
+
+        private static string cover_art_file_name = "cover.jpg";
+
+        private static string cover_art_file_type = "jpeg";
+
+        private static int cover_art_size = 320;
+
+        public override bool LoadDeviceConfiguration ()
+        {
+            Hyena.Log.DebugFormat ("Found RockBox Device");
+
+            LoadConfig ();
+
+            return true;
+        }
+
+        protected override string DefaultName {
+            get { return name; }
+        }
+
+        protected override string [] DefaultAudioFolders {
+            get { return audio_folders; }
+        }
+
+        protected override string [] DefaultVideoFolders {
+            get { return video_folders; }
+        }
+
+        protected override string [] DefaultPlaylistFormats {
+            get { return playlist_formats; }
+        }
+
+        protected override string DefaultPlaylistPath {
+            get { return playlists_path; }
+        }
+
+        protected override string [] DefaultPlaybackMimeTypes {
+            get { return playback_mime_types; }
+        }
+
+        protected override int DefaultFolderDepth {
+            get { return folder_depth; }
+        }
+
+        protected override string DefaultCoverArtFileName {
+            get { return cover_art_file_name; }
+        }
+
+        protected override string DefaultCoverArtFileType {
+            get { return cover_art_file_type; }
+        }
+
+        protected override int DefaultCoverArtSize {
+            get { return cover_art_size; }
+        }
+    }
+}
+
diff --git a/src/Dap/Banshee.Dap.MassStorage/Makefile.am b/src/Dap/Banshee.Dap.MassStorage/Makefile.am
index c0e8495..24e6490 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Makefile.am
+++ b/src/Dap/Banshee.Dap.MassStorage/Makefile.am
@@ -13,6 +13,7 @@ SOURCES =  \
 	Banshee.Dap.MassStorage/MassStorageDevice.cs \
 	Banshee.Dap.MassStorage/MassStorageSource.cs \
 	Banshee.Dap.MassStorage/NookDevice.cs \
+	Banshee.Dap.MassStorage/RockBoxDevice.cs \
 	Banshee.Dap.MassStorage/WebOSDevice.cs
 
 RESOURCES = Banshee.Dap.MassStorage.addin.xml