capuchin r54 - trunk/src/libcapuchin

[sebp svn gnome org]

Author: sebp
Date: Fri Mar  7 18:54:49 2008
New Revision: 54
URL: http://svn.gnome.org/viewvc/capuchin?rev=54&view=rev

Log:
Extracted IDownloadManager interface

Added:
   trunk/src/libcapuchin/IDownloadManager.cs
Modified:
   trunk/src/libcapuchin/DownloadManager.cs
   trunk/src/libcapuchin/Makefile.am
   trunk/src/libcapuchin/libcapuchin.mdp

Modified: trunk/src/libcapuchin/DownloadManager.cs
==============================================================================
--- trunk/src/libcapuchin/DownloadManager.cs	(original)
+++ trunk/src/libcapuchin/DownloadManager.cs	Fri Mar  7 18:54:49 2008
@@ -3,27 +3,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
-using NDesk.DBus;
-using org.freedesktop.DBus;
 using Capuchin.Logging;
 using Capuchin.Xml;
 
 namespace Capuchin
 {
-    public delegate void DownloadManagerStatusHandler(int id, double progress, int speed);
-    public delegate void DownloadManagerFinishedHandler(int id);
-    
-    [Interface("org.gnome.Capuchin.DownloadManager")]
-    public interface IDownloadManager
-    {
-        event DownloadManagerStatusHandler DownloadStatus;
-        event DownloadManagerFinishedHandler DownloadFinished;
-        int DownloadFile(string download_url, string download_dest);
-        void PauseDownload(int id);
-        void AbortDownload(int id);
-        void ResumeDownload(int id);
-    }
-    
     /// <summary>Class that manages downloads</summary>
     public class DownloadManager : IDownloadManager
     {
@@ -52,7 +36,7 @@
         /// <param name="download_dest">Directory where to save the file</param>
         /// <param name="checksumField">Checksum instance of file or null</param>
         /// <returns>
-        /// An <see cref="Nsm.Downloaders.AbstractDownloader" /> instance to
+        /// An <see cref="Capuchin.Downloaders.AbstractDownloader" /> instance to
         /// download the given file
         /// </returns>
         internal int DownloadFile (string download_url, string download_dest, string signature, checksum checksumField)
@@ -75,7 +59,7 @@
         }
         
         /// <summary>Pause download</summary>
-        /// <param name="id">Download id as returned by <see cref="Nsm.DownloadManager.DownloadFile" /></param>
+        /// <param name="id">Download id as returned by <see cref="Capuchin.DownloadManager.DownloadFile" /></param>
         public virtual void PauseDownload(int id)
         {
             Log.Info("Paused download with id '{0}'", id);
@@ -84,7 +68,7 @@
         }
         
         /// <summary>Abort download</summary>
-        /// <param name="id">Download id as returned by <see cref="Nsm.DownloadManager.DownloadFile" /></param>
+        /// <param name="id">Download id as returned by <see cref="Capuchin.DownloadManager.DownloadFile" /></param>
         public virtual void AbortDownload(int id)
         {
             Log.Info("Aborted download with id '{0}'", id);
@@ -95,7 +79,7 @@
         }
         
         /// <summary>Resume download</summary>
-        /// <param name="id">Download id as returned by <see cref="Nsm.DownloadManager.DownloadFile" /></param>
+        /// <param name="id">Download id as returned by <see cref="Capuchin.DownloadManager.DownloadFile" /></param>
         public virtual void ResumeDownload(int id)
         {
             // Get file info
@@ -143,7 +127,7 @@
             this.OnDownloadFinished(id);
         }
         
-        /// <summary>Returns the appropriate <see cref="Nsm.Downloaders.AbstractDownloader" /></summary>
+        /// <summary>Returns the appropriate <see cref="Capuchin.Downloaders.AbstractDownloader" /></summary>
         internal Downloaders.AbstractDownloader GetDownloader(int id, Download dl)
         {
             Uri uri = new Uri(dl.Url);

Added: trunk/src/libcapuchin/IDownloadManager.cs
==============================================================================
--- (empty file)
+++ trunk/src/libcapuchin/IDownloadManager.cs	Fri Mar  7 18:54:49 2008
@@ -0,0 +1,20 @@
+using System;
+using NDesk.DBus;
+
+namespace Capuchin
+{
+    public delegate void DownloadManagerStatusHandler(int id, double progress, int speed);
+    public delegate void DownloadManagerFinishedHandler(int id);
+    
+    [Interface("org.gnome.Capuchin.DownloadManager")]
+    public interface IDownloadManager
+    {
+        event DownloadManagerStatusHandler DownloadStatus;
+        event DownloadManagerFinishedHandler DownloadFinished;
+        int DownloadFile(string download_url, string download_dest);
+        void PauseDownload(int id);
+        void AbortDownload(int id);
+        void ResumeDownload(int id);
+    }
+    
+}

Modified: trunk/src/libcapuchin/Makefile.am
==============================================================================
--- trunk/src/libcapuchin/Makefile.am	(original)
+++ trunk/src/libcapuchin/Makefile.am	Fri Mar  7 18:54:49 2008
@@ -30,7 +30,8 @@
 	Download.cs \
 	DownloadManager.cs \
 	IAppObject.cs \
-	IAppObjectManager.cs
+	IAppObjectManager.cs \
+	IDownloadManager.cs	
 
 REFERENCES =  \
 	-r:System \

Modified: trunk/src/libcapuchin/libcapuchin.mdp
==============================================================================
--- trunk/src/libcapuchin/libcapuchin.mdp	(original)
+++ trunk/src/libcapuchin/libcapuchin.mdp	Fri Mar  7 18:54:49 2008
@@ -44,6 +44,7 @@
     <File name="Xml/changelog.cs" subtype="Code" buildaction="Compile" />
     <File name="Xml/checksum.cs" subtype="Code" buildaction="Compile" />
     <File name="Xml/author.cs" subtype="Code" buildaction="Compile" />
+    <File name="IDownloadManager.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />