banshee r3812 - in trunk/banshee: . src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data src/Libraries/Migo src/Libraries/Migo/Migo/Migo.Syndication src/Libraries/Migo/Migo/Migo.Syndication/Enumerations
- From: gburt svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3812 - in trunk/banshee: . src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data src/Libraries/Migo src/Libraries/Migo/Migo/Migo.Syndication src/Libraries/Migo/Migo/Migo.Syndication/Enumerations
- Date: Wed, 23 Apr 2008 19:06:53 +0100 (BST)
Author: gburt
Date: Wed Apr 23 18:06:53 2008
New Revision: 3812
URL: http://svn.gnome.org/viewvc/banshee?rev=3812&view=rev
Log:
2008-04-23 Gabriel Burt <gabriel burt gmail com>
* src/Extensions/Banshee.Podcasting/*:
* src/Libraries/Migo/*: Rename FEEDS_DOWNLOAD_STATUS enum to
FeedDownloadStatus. (Props to MD for making this dead easy).
Added:
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FeedDownloadStatus.cs (contents, props changed)
- copied, changed from r3810, /trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_STATUS.cs
Removed:
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_STATUS.cs
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeed.cs
trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastItem.cs
trunk/banshee/src/Libraries/Migo/Makefile.am
trunk/banshee/src/Libraries/Migo/Migo.mdp
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Feed.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedEnclosure.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedsManager.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeed.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeedEnclosure.cs
Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeed.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeed.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeed.cs Wed Apr 23 18:06:53 2008
@@ -84,13 +84,13 @@
}
switch (feed.DownloadStatus) {
- case FEEDS_DOWNLOAD_STATUS.FDS_PENDING:
+ case FeedDownloadStatus.Pending:
ret = PodcastFeedActivity.UpdatePending;
break;
- case FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADING:
+ case FeedDownloadStatus.Downloading:
ret = PodcastFeedActivity.Updating;
break;
- case FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED:
+ case FeedDownloadStatus.DownloadFailed:
ret = PodcastFeedActivity.UpdateFailed;
break;
}
Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastItem.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastItem.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastItem.cs Wed Apr 23 18:06:53 2008
@@ -130,19 +130,19 @@
}
} else {
switch (item.Enclosure.DownloadStatus) {
- case FEEDS_DOWNLOAD_STATUS.FDS_PENDING:
+ case FeedDownloadStatus.Pending:
ret = PodcastItemActivity.DownloadPending;
break;
- case FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADING:
+ case FeedDownloadStatus.Downloading:
ret = PodcastItemActivity.Downloading;
break;
- case FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADED:
+ case FeedDownloadStatus.Downloaded:
ret = PodcastItemActivity.Downloaded;
break;
- case FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED:
+ case FeedDownloadStatus.DownloadFailed:
ret = PodcastItemActivity.DownloadFailed;
break;
- case FEEDS_DOWNLOAD_STATUS.FDS_PAUSED:
+ case FeedDownloadStatus.Paused:
ret = PodcastItemActivity.DownloadPaused;
break;
}
Modified: trunk/banshee/src/Libraries/Migo/Makefile.am
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Makefile.am (original)
+++ trunk/banshee/src/Libraries/Migo/Makefile.am Wed Apr 23 18:06:53 2008
@@ -17,9 +17,9 @@
Migo/Migo.Net/Exceptions/RemoteFileModifiedException.cs \
Migo/Migo.Net/TransferStatusManager.cs \
Migo/Migo.Syndication/Enumerations/FeedDownloadError.cs \
+ Migo/Migo.Syndication/Enumerations/FeedDownloadStatus.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_BACKGROUNDSYNC_ACTION.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_BACKGROUNDSYNC_STATUS.cs \
- Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_STATUS.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_EVENTS_DOWNLOAD_COUNT_FLAGS.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_EVENTS_ITEM_COUNT_FLAGS.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_SYNC_SETTING.cs \
Modified: trunk/banshee/src/Libraries/Migo/Migo.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo.mdp (original)
+++ trunk/banshee/src/Libraries/Migo/Migo.mdp Wed Apr 23 18:06:53 2008
@@ -25,7 +25,7 @@
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_BACKGROUNDSYNC_ACTION.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_BACKGROUNDSYNC_STATUS.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FeedDownloadError.cs" subtype="Code" buildaction="Compile" />
- <File name="Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_STATUS.cs" subtype="Code" buildaction="Compile" />
+ <File name="Migo/Migo.Syndication/Enumerations/FeedDownloadStatus.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_EVENTS_DOWNLOAD_COUNT_FLAGS.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_EVENTS_ITEM_COUNT_FLAGS.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_SYNC_SETTING.cs" subtype="Code" buildaction="Compile" />
Copied: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FeedDownloadStatus.cs (from r3810, /trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_STATUS.cs)
==============================================================================
--- /trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_STATUS.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FeedDownloadStatus.cs Wed Apr 23 18:06:53 2008
@@ -28,13 +28,13 @@
namespace Migo.Syndication
{
- public enum FEEDS_DOWNLOAD_STATUS : int
+ public enum FeedDownloadStatus : int
{
- FDS_NONE = 0,
- FDS_PENDING = 1,
- FDS_DOWNLOADING = 2,
- FDS_DOWNLOADED = 3,
- FDS_DOWNLOAD_FAILED = 4,
- FDS_PAUSED = 5
+ None = 0,
+ Pending = 1,
+ Downloading = 2,
+ Downloaded = 3,
+ DownloadFailed = 4,
+ Paused = 5
};
}
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Feed.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Feed.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Feed.cs Wed Apr 23 18:06:53 2008
@@ -59,7 +59,7 @@
private string copyright;
private string description;
private bool downloadEnclosuresAutomatically;
- private FEEDS_DOWNLOAD_STATUS downloadStatus;
+ private FeedDownloadStatus downloadStatus;
private string downloadUrl;
private string image;
private long interval;
@@ -123,7 +123,7 @@
set { lock (sync) { downloadEnclosuresAutomatically = value; } }
}
- public FEEDS_DOWNLOAD_STATUS DownloadStatus
+ public FeedDownloadStatus DownloadStatus
{
get { lock (sync) { return downloadStatus; } }
}
@@ -369,7 +369,7 @@
this.parent = parent;
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_NONE;
+ downloadStatus = FeedDownloadStatus.None;
inactiveItems = new List<FeedItem> ();
interval = parent.DefaultInterval;
isList = false;
@@ -570,7 +570,7 @@
lock (sync) {
if (SetUpdating ()) {
update = true;
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_PENDING;
+ downloadStatus = FeedDownloadStatus.Pending;
}
}
@@ -597,13 +597,13 @@
wc.Timeout = (30 * 1000); // 30 Seconds
wc.IfModifiedSince = lastDownloadTime.ToUniversalTime ();
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADING;
+ downloadStatus = FeedDownloadStatus.Downloading;
wc.DownloadStringCompleted += OnDownloadStringCompleted;
wc.DownloadStringAsync (new Uri (url));
ret = true;
} catch {
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
+ downloadStatus = FeedDownloadStatus.DownloadFailed;
if (wc != null) {
wc.DownloadStringCompleted -= OnDownloadStringCompleted;
@@ -1154,9 +1154,9 @@
lastDownloadError = error;
if (lastDownloadError == FeedDownloadError.None) {
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADED;
+ downloadStatus = FeedDownloadStatus.Downloaded;
} else {
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
+ downloadStatus = FeedDownloadStatus.DownloadFailed;
}
Commit ();
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedEnclosure.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedEnclosure.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedEnclosure.cs Wed Apr 23 18:06:53 2008
@@ -40,7 +40,7 @@
private bool stopped;
private string downloadMimeType;
- private FEEDS_DOWNLOAD_STATUS downloadStatus;
+ private FeedDownloadStatus downloadStatus;
private string downloadUrl;
private bool active;
private FeedDownloadError lastDownloadError;
@@ -77,7 +77,7 @@
}
}
- public FEEDS_DOWNLOAD_STATUS DownloadStatus
+ public FeedDownloadStatus DownloadStatus
{
get {
lock (sync) {
@@ -90,11 +90,11 @@
downloadStatus = value;
//Console.WriteLine ("Enclosure: DownloadStatus: {0}", downloadStatus);
switch (value) {
- case FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED: goto case FEEDS_DOWNLOAD_STATUS.FDS_NONE;
- case FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADED:
+ case FeedDownloadStatus.DownloadFailed: goto case FeedDownloadStatus.None;
+ case FeedDownloadStatus.Downloaded:
Commit ();
- goto case FEEDS_DOWNLOAD_STATUS.FDS_NONE;
- case FEEDS_DOWNLOAD_STATUS.FDS_NONE:
+ goto case FeedDownloadStatus.None;
+ case FeedDownloadStatus.None:
ResetDownloading ();
break;
}
@@ -184,7 +184,7 @@
url = wrapper.Url;
if (!String.IsNullOrEmpty (localPath)) {
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADED;
+ downloadStatus = FeedDownloadStatus.Downloaded;
}
this.parent = parent;
@@ -255,7 +255,7 @@
}
localPath = String.Empty;
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_NONE;
+ downloadStatus = FeedDownloadStatus.None;
Commit ();
}
@@ -293,12 +293,12 @@
lock (sync) {
if (!downloading &&
- downloadStatus != FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADED) {
+ downloadStatus != FeedDownloadStatus.Downloaded) {
canceled = false;
stopped = false;
ret = downloading = true;
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_PENDING;
+ downloadStatus = FeedDownloadStatus.Pending;
lastDownloadError = FeedDownloadError.None;
}
}
@@ -383,7 +383,7 @@
} catch {}
} catch {
lastDownloadError = FeedDownloadError.DownloadFailed;
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
+ downloadStatus = FeedDownloadStatus.DownloadFailed;
throw;
}
@@ -392,7 +392,7 @@
this.downloadUrl = url;
this.downloadMimeType = mimeType;
- downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADED;
+ downloadStatus = FeedDownloadStatus.Downloaded;
lastDownloadError = FeedDownloadError.None;
Commit ();
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedsManager.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedsManager.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedsManager.cs Wed Apr 23 18:06:53 2008
@@ -712,7 +712,7 @@
downloadHandle.Reset ();
}
- enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_PENDING;
+ enc.DownloadStatus = FeedDownloadStatus.Pending;
parentFeed.IncrementQueuedDownloadCount ();
}
}
@@ -738,7 +738,7 @@
if (enc != null) {
if (e.Error != null || task.Status == TaskStatus.Failed) {
- enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
+ enc.DownloadStatus = FeedDownloadStatus.DownloadFailed;
} else if (!e.Cancelled) {
if (task.Status == TaskStatus.Succeeded) {
try {
@@ -750,7 +750,7 @@
);
} catch {
enc.LastDownloadError = FeedDownloadError.DownloadFailed;
- enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
+ enc.DownloadStatus = FeedDownloadStatus.DownloadFailed;
}
}
}
@@ -840,19 +840,19 @@
//Console.WriteLine ("OnDownloadTaskStatusChangedHandler - new state: {0}", statusInfo.NewStatus);
switch (statusInfo.NewStatus) {
case TaskStatus.Cancelled:
- enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_NONE;
+ enc.DownloadStatus = FeedDownloadStatus.None;
break;
case TaskStatus.Failed:
- enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
+ enc.DownloadStatus = FeedDownloadStatus.DownloadFailed;
break;
case TaskStatus.Paused:
- enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_PAUSED;
+ enc.DownloadStatus = FeedDownloadStatus.Paused;
break;
case TaskStatus.Ready:
- enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_PENDING;
+ enc.DownloadStatus = FeedDownloadStatus.Pending;
break;
case TaskStatus.Running:
- enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADING;
+ enc.DownloadStatus = FeedDownloadStatus.Downloading;
((Feed)enc.Parent.Parent).IncrementActiveDownloadCount ();
break;
case TaskStatus.Stopped: goto case TaskStatus.Cancelled;
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeed.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeed.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeed.cs Wed Apr 23 18:06:53 2008
@@ -50,7 +50,7 @@
string Copyright { get; }
string Description { get; }
bool DownloadEnclosuresAutomatically { get; set; }
- FEEDS_DOWNLOAD_STATUS DownloadStatus { get; }
+ FeedDownloadStatus DownloadStatus { get; }
string DownloadUrl { get; }
string Image { get; }
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeedEnclosure.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeedEnclosure.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeedEnclosure.cs Wed Apr 23 18:06:53 2008
@@ -33,7 +33,7 @@
public interface IFeedEnclosure
{
string DownloadMimeType { get; }
- FEEDS_DOWNLOAD_STATUS DownloadStatus { get; }
+ FeedDownloadStatus DownloadStatus { get; }
string DownloadUrl { get; }
FeedDownloadError LastDownloadError { get; }
long Length { get; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
