Merge lp:~mandel/ubuntuone-windows-installer/add_create_update_build into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Changes required to make the selfupda as expected, specially ensuring that the async calls can modify objects that have been created in a diff branch.

[Vincenzo Di Somma (vds)]

Looks good, build and tests are passing.

review: Approve

[John Lenton (chipaca)]

review: Approve

=== modified file 'README.txt'
--- README.txt	2010-07-19 10:19:22 +0000
+++ README.txt	2010-08-24 15:18:39 +0000
@@ -39,6 +39,18 @@
 	2.6 bootstrapper
 	
 	Crates a boot strapper that will allow to install a bundle with UbuntuOne that includes Tomboy and Gtk sharp if needed.
+	
+	2.7 create_update
+	
+	Creates the msi that will be used to update the application, updates the rss used to notify updates an uploads the data to the server.
+	
+	Bare in mind that to be able to execute create_update you have to have the rights to update the data in canonicals S3. In order to do that 
+	you have to set the following enviroment valirables in your windows machine:
+	
+	AWS_ACCESS_KEY_ID: The account Id
+	AWS_SECRET_ACCESS_KEY: The secret required to use the account.
+	
+	In order to run the script you will need to have boto () to be able to use S3.
 
 In order to execute the build script execute at the root of the project
 
 
=== added file 'lib/DotUpdater/DotUpdater.pdb'
 Binary files lib/DotUpdater/DotUpdater.pdb	1970-01-01 00:00:00 +0000 and lib/DotUpdater/DotUpdater.pdb	2010-08-24 15:18:39 +0000 differ
=== modified file 'main.build'
--- main.build	2010-08-18 09:39:49 +0000
+++ main.build	2010-08-24 15:18:39 +0000
@@ -4,11 +4,19 @@
 	<property name="enviroment" value="debug" />
 	<!-- property that allows to pass where to place the build results -->
 	<property name="build_results" value="install/build_results" />
+	<!-- property thas allows to pass the location used to build the api docs. -->
 	<property name="docs_api" value="docs/api" />
+	<!-- property that allows to point to the location in which sandcastle was installed -->
 	<property name="sandcastle_path" value="C:\Program Files\Sandcastle" />
+	<!-- property that allows to point to the location in which the html workshop was installer -->
 	<property name="html_help_compiler_path" value="C:\Program Files\HTML Help Workshop" />
 	<!-- property that allows to pass the number for the current build. -->
 	<property name="build" value="0" />
+	<!-- property that allows to point to the location in which python was installer -->
+	<property name="python_path" value="C:\Python26" />
+	<!-- property that allows to pass the location to be used to update the package. -->
+	<property name="upload_path" value="http://s3.amazonaws.com/u1wintest/UbuntuOne.msi" />
+	
 	<target name="clean" 
 	        description="Removes all the different results of the last comilation if they exist">
 		<!-- delete all the different results from the previous build -->
@@ -206,7 +214,7 @@
 	
 	<target name="installer"
 	        description="Compiles the solution and create a merge installer that allows to install the solution and other related apps."
-			depends="build">
+			depends="tests">
 		
 		<mkdir dir="${build_results}" />
 		
@@ -279,6 +287,30 @@
               commandline="/Output:setup.exe /Template:dotNetInstaller.exe /Configuration:InstallerProject.xml /Embed+" />
 	</target>
 	
+	<target name="create_update"
+			description="Creates the msi that will be used to update the application, updates the rss used to notify updates an uploads the data to the server."
+			depends="installer">
+			
+			<echo message="Creating update for version ${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}"/>
+			
+			<!-- call the utils script that was created using python to allows the update and rss generation -->
+			
+			<echo message='Executing: python upload_new_update.py ../install/UbuntuOne.msi ${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision} "${upload_path}"'/>
+			
+            <!-- copy the installer, otherwhise the script has issues when uploading, windows is funny -->
+            <copy file="install/UbuntuOne.msi"
+			  tofile="utils/UbuntuOne.msi" /> 
+              
+			<exec basedir="${python_path}"
+              managed="false"
+              workingdir="utils"
+              program="python.exe"
+              commandline='upload_new_update.py UbuntuOne.msi ${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision} "${upload_path}"' />
+              
+            <!-- delete the copied file -->
+            <delete file="utils/UbuntuOne.msi" />
+			
+	</target>
 	<target name="documentation"
 			description="Generates the documentation using the xml documents."
 			depends="build">
 
=== modified file 'src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs	2010-08-05 08:15:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Update/DownloadingView.xaml.cs	2010-08-24 15:18:39 +0000
@@ -16,6 +16,7 @@
 // 
 // Authors: Manuel de la Peña <[e-mail]>
 using System;
+using Canonical.UbuntuOne.Common.Threading;
 using Canonical.UbuntuOne.Common.Update;
 using StaticResources = Canonical.UbuntuOne.Client.Views.Resources.Resources;
 namespace Canonical.UbuntuOne.Client.Views.Update
@@ -25,6 +26,13 @@
     /// </summary>
     public partial class DownloadingView : IDownloadingView
     {
+        #region Variables
+
+        private IDispatcher _dispatcher;
+        private readonly object _dispatcherLock = new object();
+
+        #endregion
+
         /// <summary>
         /// Initializes a new instance of the DownloadingView class.
         /// </summary>
@@ -35,6 +43,26 @@
         }
 
         /// <summary>
+        /// Gets the dispatcher that can be used to call actions on the object from a 
+        /// different thread.
+        /// </summary>
+        public IDispatcher ViewDispatcher
+        {
+            get
+            {
+                if(_dispatcher == null)
+                {
+                    lock (_dispatcherLock)
+                    {
+                        _dispatcher = new WpfDispatcher(Dispatcher);
+                    }
+                }
+                return _dispatcher;
+            }
+            set { _dispatcher = value; }
+        }
+
+        /// <summary>
         /// Gets and sets if the close button is enabled.
         /// </summary>
         public bool CloseButtonIsEnabled
 
=== modified file 'src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs	2010-08-05 08:15:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Update/UpdatingView.xaml.cs	2010-08-24 15:18:39 +0000
@@ -16,6 +16,7 @@
 // 
 // Authors: Manuel de la Peña <[e-mail]>
 using System;
+using Canonical.UbuntuOne.Common.Threading;
 using Canonical.UbuntuOne.Common.Update;
 
 namespace Canonical.UbuntuOne.Client.Views.Update
@@ -25,6 +26,36 @@
     /// </summary>
     public partial class UpdatingView : IUpdatingView
     {
+        #region Variables
+
+        private IDispatcher _dispatcher;
+        private readonly object _dispatcherLock = new object();
+
+        #endregion
+
+        #region DI Properties
+
+        /// <summary>
+        /// Gets and sets a dispatcher that can be used by the view in a multithreaded env.
+        /// </summary>
+        public IDispatcher ViewDispatcher
+        {
+            get
+            {
+               if(_dispatcher == null)
+               {
+                   lock (_dispatcherLock)
+                   {
+                       _dispatcher = new WpfDispatcher(Dispatcher);
+                   }
+               }
+                return _dispatcher;
+            }
+            set { _dispatcher = value; }
+        }
+
+        #endregion
+
         /// <summary>
         /// Initializes a new instance of the UpdatingView class.
         /// </summary>
@@ -51,7 +82,7 @@
         /// </summary>
         public string UpdatingText
         {
-            get { return (String) MessageLabel.Content; }
+            get { return (String)MessageLabel.Content; }
             set { MessageLabel.Content = value; }
         }
     }
 
=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj'
--- src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj	2010-08-05 08:15:00 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj	2010-08-24 15:18:39 +0000
@@ -44,6 +44,7 @@
     <Compile Include="ProcessManagementExceptionFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SyncDaemonExceptionFixture.cs" />
+    <Compile Include="TestDispatcher.cs" />
     <Compile Include="Update\DownloadingPresenterFixture.cs" />
     <Compile Include="Update\SelfUpdateExceptionFixture.cs" />
     <Compile Include="Update\UpdaterFixture.cs" />
@@ -82,6 +83,9 @@
       <HintPath>..\..\lib\Spring.Net\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
 
=== added file 'src/Canonical.UbuntuOne.Common.Tests/TestDispatcher.cs'
--- src/Canonical.UbuntuOne.Common.Tests/TestDispatcher.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/TestDispatcher.cs	2010-08-24 15:18:39 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using Canonical.UbuntuOne.Common.Threading;
+
+namespace Canonical.UbuntuOne.Common.Tests
+{
+    /// <summary>
+    /// Dummy implementation of the IDispatcher that is used for test puposes.
+    /// </summary>
+    internal class TestDispatcher : IDispatcher
+    {
+        #region Implementation of IDispatcher
+
+        /// <summary>
+        /// Dispatches the specified action to the thread.
+        /// </summary>
+        /// <param name="actionToInvoke">The action to invoke.</param>
+        public void Dispatch(Action actionToInvoke)
+        {
+            actionToInvoke();
+        }
+
+        #endregion
+
+        #region Implementation of IDispatcher
+
+        /// <summary>
+        /// Dispatches the specified action to the thread.
+        /// </summary>
+        /// <param name="actionToInvoke">The action to invoke.</param>
+        public TResult Dispatch<TResult>(Func<TResult> actionToInvoke)
+        {
+            return actionToInvoke();
+        }
+
+        #endregion
+
+        #region Implementation of IDispatcher
+
+        /// <summary>
+        /// Checks whether the thread invoking the method .
+        /// </summary>
+        /// <returns></returns>
+        public bool DispatchRequired()
+        {
+            return false;
+        }
+
+        #endregion
+    }
+}
 
=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Update/DownloadingPresenterFixture.cs'
--- src/Canonical.UbuntuOne.Common.Tests/Update/DownloadingPresenterFixture.cs	2010-07-29 16:38:26 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Update/DownloadingPresenterFixture.cs	2010-08-24 15:18:39 +0000
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2010 Canonical Ltd.
  * 
  * This file is part of UbuntuOne on Windows.
@@ -18,6 +18,7 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System;
+using Canonical.UbuntuOne.Common.Threading;
 using Canonical.UbuntuOne.Common.Update;
 using Microsoft.ApplicationBlocks.Updater;
 using NUnit.Framework;
@@ -31,6 +32,7 @@
 
         private MockRepository _mocks;
         private IDownloadingView _view;
+        private IDispatcher _dispatcher;
         private DownloadingPresenter _presenter;
 
         #endregion
@@ -42,6 +44,7 @@
         {
             _mocks = new MockRepository();
             _view = _mocks.DynamicMock<IDownloadingView>();
+            _dispatcher = new TestDispatcher();
             _presenter = new DownloadingPresenter
             {
                 View = _view
@@ -78,6 +81,9 @@
             {
                 SetupResult.For(_view.IsShown)
                     .Return(true);
+                SetupResult.For(_view.ViewDispatcher)
+                    .Return(_dispatcher);
+
                 _view.DownloadingMessage = UpdateResources.DownloadInProgress;
                 _view.Progress = (progress * DownloadingPresenter.MaximumValue) / total;
             }
@@ -98,6 +104,8 @@
                     .Return(false);
                 Expect.Call(() => _view.Show())
                     .Repeat.Once();
+                SetupResult.For(_view.ViewDispatcher)
+                    .Return(_dispatcher);
                 _view.DownloadingMessage = UpdateResources.DownloadInProgress;
                 _view.Progress = (progress * DownloadingPresenter.MaximumValue) / total;
             }
@@ -112,6 +120,8 @@
         {
             using (_mocks.Record())
             {
+                SetupResult.For(_view.ViewDispatcher)
+                    .Return(_dispatcher);
                 _view.DownloadingMessage = UpdateResources.DownloadError;
                 _view.CloseButtonIsEnabled = true;
                 _view.Progress = DownloadingPresenter.MinimumValue;
@@ -127,6 +137,8 @@
         {
             using (_mocks.Record())
             {
+                SetupResult.For(_view.ViewDispatcher)
+                    .Return(_dispatcher);
                 _view.DownloadingMessage = UpdateResources.DownloadCompleted;
                 _view.Progress = DownloadingPresenter.MaximumValue;
                 _view.Close();
 
=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-08-16 12:46:11 +0000
+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-08-24 15:18:39 +0000
@@ -59,6 +59,8 @@
     <Compile Include="Container\UnsatisfiedDependencyException.cs" />
     <Compile Include="IAuthentication.cs" />
     <Compile Include="OperationContracts\IEventNotifier.cs" />
+    <Compile Include="Threading\IDispatcher.cs" />
+    <Compile Include="Threading\WpfDispatcher.cs" />
     <Compile Include="Utils\ApplicationWrapper.cs" />
     <Compile Include="Utils\Explorer.cs" />
     <Compile Include="Utils\ExplorerException.cs" />
 
=== added directory 'src/Canonical.UbuntuOne.Common/Threading'
=== added file 'src/Canonical.UbuntuOne.Common/Threading/IDispatcher.cs'
--- src/Canonical.UbuntuOne.Common/Threading/IDispatcher.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Threading/IDispatcher.cs	2010-08-24 15:18:39 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+
+namespace Canonical.UbuntuOne.Common.Threading
+{
+    /// <summary>
+    /// Provides a wrapper around the process of dispatching actions onto 
+    /// different threads, primarily for unit testing.
+    /// </summary>
+    public interface IDispatcher
+    {
+        /// <summary>
+        /// Dispatches the specified action to the thread.
+        /// </summary>
+        /// <param name="actionToInvoke">The action to invoke.</param>
+        void Dispatch(Action actionToInvoke);
+
+        /// <summary>
+        /// Dispatches the specified action to the thread.
+        /// </summary>
+        /// <param name="actionToInvoke">The action to invoke.</param>
+        TResult Dispatch<TResult>(Func<TResult> actionToInvoke);
+
+        /// <summary>
+        /// Checks whether the thread invoking the method .
+        /// </summary>
+        /// <returns></returns>
+        bool DispatchRequired();
+    }
+}
 
=== added file 'src/Canonical.UbuntuOne.Common/Threading/WpfDispatcher.cs'
--- src/Canonical.UbuntuOne.Common/Threading/WpfDispatcher.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Threading/WpfDispatcher.cs	2010-08-24 15:18:39 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+
+using System;
+using System.Windows.Threading;
+
+namespace Canonical.UbuntuOne.Common.Threading
+{
+    /// <summary>
+    /// This dispatcher is used at runtime by both Windows Forms and WPF. The WPF Dispatcher 
+    /// class works within Windows Forms, so this appears to be safe.
+    /// </summary>
+    public class WpfDispatcher : IDispatcher
+    {
+        private readonly Dispatcher _dispatcher;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WpfDispatcher"/> class.
+        /// </summary>
+        public WpfDispatcher()
+            : this(Dispatcher.CurrentDispatcher) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WpfDispatcher"/> class.
+        /// </summary>
+        /// <param name="dispatcher">The dispatcher.</param>
+        public WpfDispatcher(Dispatcher dispatcher)
+        {
+            _dispatcher = dispatcher;
+        }
+
+        /// <summary>
+        /// Dispatches the specified action to the thread.
+        /// </summary>
+        /// <param name="actionToInvoke">The action to invoke.</param>
+        public void Dispatch(Action actionToInvoke)
+        {
+            if (!DispatchRequired())
+            {
+                actionToInvoke();
+            }
+            else
+            {
+                _dispatcher.Invoke(DispatcherPriority.Normal, actionToInvoke);
+            }
+        }
+
+        /// <summary>
+        /// Dispatches the specified action to the thread.
+        /// </summary>
+        /// <typeparam name="TResult"></typeparam>
+        /// <param name="actionToInvoke">The action to invoke.</param>
+        /// <returns></returns>
+        public TResult Dispatch<TResult>(Func<TResult> actionToInvoke)
+        {
+            if (_dispatcher.CheckAccess())
+            {
+                return actionToInvoke();
+            }
+            return (TResult)_dispatcher.Invoke(DispatcherPriority.Normal, actionToInvoke);
+        }
+
+        /// <summary>
+        /// Checks whether the thread invoking the method.
+        /// </summary>
+        /// <returns></returns>
+        public bool DispatchRequired()
+        {
+            return !_dispatcher.CheckAccess();
+        }
+    }
+}
 
=== modified file 'src/Canonical.UbuntuOne.Common/Update/DotUpdaterWrapper.cs'
--- src/Canonical.UbuntuOne.Common/Update/DotUpdaterWrapper.cs	2010-07-21 10:07:22 +0000
+++ src/Canonical.UbuntuOne.Common/Update/DotUpdaterWrapper.cs	2010-08-24 15:18:39 +0000
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2010 Canonical Ltd.
  * 
  * This file is part of UbuntuOne on Windows.
@@ -39,12 +39,55 @@
 
         #endregion
 
+        #region Helpers
+
+        /// <summary>
+        /// Helper used to propagate the event from the wrapped object.
+        /// </summary>
+        /// <param name="sender">The sender of the event.</param>
+        /// <param name="args">The aruments about the completed task.</param>
+        private void DownloadCompletedHandler(object sender, TaskEventArgs args)
+        {
+            if(OnDownloadCompleted != null)
+            {
+                OnDownloadCompleted(sender, args);
+            }
+        }
+
+        /// <summary>
+        /// Helper used to propagate the event from the wrapped object.
+        /// </summary>
+        /// <param name="sender">The sender of the event.</param>
+        /// <param name="args">The arguments with the completed information.</param>
+        private void DownloadProgressHandler(object sender, DownloadTaskProgressEventArgs args)
+        {
+            if(OnDownloadProgress != null)
+            {
+                OnDownloadProgress(sender, args);
+            }
+        }
+
+        /// <summary>
+        /// Helper used to propagate the event from the wrapped object.
+        /// </summary>
+        /// <param name="sender">The sender of the event.</param>
+        /// <param name="args">The arguments with the error information.</param>
+        private void DownloadErrorHandler(object sender, DownloadTaskErrorEventArgs args)
+        {
+            if(OnDownloadError != null)
+            {
+                OnDownloadError(sender, args);
+            }
+        }
+
+        #endregion
+
         public DotUpdaterWrapper(Logger logger, string rss)
         {
             _updater = new DotUpdater.Updater(logger, rss);
-            OnDownloadCompleted = _updater.OnDownloadCompleted;
-            OnDownloadProgress = _updater.OnDownloadProgress;
-            OnDownloadError = _updater.OnDownloadError;
+            _updater.OnDownloadCompleted += DownloadCompletedHandler;
+            _updater.OnDownloadProgress += DownloadProgressHandler;
+            _updater.OnDownloadError += DownloadErrorHandler;
         }
 
         public UpdaterTask CheckForUpdates()
 
=== modified file 'src/Canonical.UbuntuOne.Common/Update/DownloadingPresenter.cs'
--- src/Canonical.UbuntuOne.Common/Update/DownloadingPresenter.cs	2010-08-05 08:01:59 +0000
+++ src/Canonical.UbuntuOne.Common/Update/DownloadingPresenter.cs	2010-08-24 15:18:39 +0000
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2010 Canonical Ltd.
  * 
  * This file is part of UbuntuOne on Windows.
@@ -75,10 +75,18 @@
         /// <param name="args">The arguments that provide information regarding the changes in the download.</param>
         public void DownloadProgressHandler(object sender, DownloadTaskProgressEventArgs args)
         {
-            if(!View.IsShown)
-                View.Show();
-            View.DownloadingMessage = UpdateResources.DownloadInProgress;
-            View.Progress = (args.BytesTransferred * MaximumValue) / args.BytesTotal;
+            if (!View.IsShown)
+            {
+                // dispatch to the correct thread to show the view
+                View.ViewDispatcher.Dispatch(() => View.Show());
+            }
+            // dispatch to the correct thread to set the data
+            View.ViewDispatcher.Dispatch(
+                () =>
+                    {
+                        View.DownloadingMessage = UpdateResources.DownloadInProgress;
+                        View.Progress = (args.BytesTransferred * MaximumValue) / args.BytesTotal;
+                    });
         }
 
         /// <summary>
@@ -88,9 +96,13 @@
         /// <param name="args">The arguments that provide information regarding the error.</param>
         public void DownloadErrorHandler(object sender, DownloadTaskErrorEventArgs args)
         {
-            View.DownloadingMessage = UpdateResources.DownloadError;
-            View.Progress = MinimumValue;
-            View.CloseButtonIsEnabled = true;
+            View.ViewDispatcher.Dispatch(
+                () =>
+                    {
+                        View.DownloadingMessage = UpdateResources.DownloadError;
+                        View.Progress = MinimumValue;
+                        View.CloseButtonIsEnabled = true;
+                    });
         }
 
         /// <summary>
@@ -100,11 +112,15 @@
         /// <param name="e">The arguments that provide more information about the comleted task.</param>
         public void DownloadUpdateCompleted(object sender, TaskEventArgs e)
         {
-            View.DownloadingMessage = UpdateResources.DownloadCompleted;   
-            View.Progress = MaximumValue;
+            View.ViewDispatcher.Dispatch(
+                () =>
+                    {
+                        View.DownloadingMessage = UpdateResources.DownloadCompleted;
+                        View.Progress = MaximumValue;
+                    });
             // let the user know
             Thread.Sleep(100);
-            View.Close();
+            View.ViewDispatcher.Dispatch(() => View.Close());
         }
     }
 }
 
=== modified file 'src/Canonical.UbuntuOne.Common/Update/IDownloadingView.cs'
--- src/Canonical.UbuntuOne.Common/Update/IDownloadingView.cs	2010-07-29 16:33:39 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IDownloadingView.cs	2010-08-24 15:18:39 +0000
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2010 Canonical Ltd.
  * 
  * This file is part of UbuntuOne on Windows.
@@ -17,6 +17,8 @@
  * 
  * Authors: Manuel de la Peña <[e-mail]>
  */
+using Canonical.UbuntuOne.Common.Threading;
+
 namespace Canonical.UbuntuOne.Common.Update
 {
     /// <summary>
@@ -25,6 +27,12 @@
     public interface IDownloadingView
     {
         /// <summary>
+        /// Gets the dispatcher that can be used to call actions on the object from a 
+        /// different thread.
+        /// </summary>
+        IDispatcher ViewDispatcher { get; }
+
+        /// <summary>
         /// Gets and sets if the close button is enabled.
         /// </summary>
         bool CloseButtonIsEnabled { get; set; }
 
=== modified file 'src/Canonical.UbuntuOne.Common/Update/IUpdatingPresenter.cs'
--- src/Canonical.UbuntuOne.Common/Update/IUpdatingPresenter.cs	2010-08-05 07:13:28 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IUpdatingPresenter.cs	2010-08-24 15:18:39 +0000
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2010 Canonical Ltd.
  * 
  * This file is part of UbuntuOne on Windows.
 
=== modified file 'src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs'
--- src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs	2010-08-05 08:15:00 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IUpdatingView.cs	2010-08-24 15:18:39 +0000
@@ -1,20 +1,24 @@
-// Copyright 2010 Canonical Ltd.
-// 
-// This file is part of UbuntuOne on Windows.
-// 
-// UbuntuOne on Windows is free software: you can redistribute it and/or modify		
-// it under the terms of the GNU Lesser General Public License version 		
-// as published by the Free Software Foundation.		
-//		
-// Ubuntu One on Windows is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
-// GNU Lesser General Public License for more details.	
-//
-// You should have received a copy of the GNU Lesser General Public License	
-// along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
-// 
-// Authors: Manuel de la Peña <[e-mail]>
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+
+using Canonical.UbuntuOne.Common.Threading;
 
 namespace Canonical.UbuntuOne.Common.Update
 {
@@ -25,6 +29,12 @@
     public interface IUpdatingView
     {
         /// <summary>
+        /// Gets the dispatcher that can be used to call actions on the object from a 
+        /// different thread.
+        /// </summary>
+        IDispatcher ViewDispatcher { get; }
+
+        /// <summary>
         /// Gets and sets if the view is visible
         /// </summary>
         bool IsShown { get; }
 
=== modified file 'src/Canonical.UbuntuOne.Common/Update/Updater.cs'
--- src/Canonical.UbuntuOne.Common/Update/Updater.cs	2010-08-05 07:13:28 +0000
+++ src/Canonical.UbuntuOne.Common/Update/Updater.cs	2010-08-24 15:18:39 +0000
@@ -154,7 +154,7 @@
         private void DownloadErrorHandler(object sender, DownloadTaskErrorEventArgs args)
         {
             Logger.Error(args.Exception.Message);
-            throw new SelfUpdateException(UpdateResources.DownloadError, args.Exception);
+            //throw new SelfUpdateException(UpdateResources.DownloadError, args.Exception);
         }
 
         /// <summary>
@@ -240,7 +240,6 @@
                     try
                     {
                         _downloadingUpdate = true;
-                        DotUpdater.BeginDownload(_task);
                         // provide the handler for the progress of the download as well as the 
                         // error and finish
                         DotUpdater.OnDownloadProgress += DownloadingPresenter.DownloadProgressHandler;
@@ -252,6 +251,7 @@
                         // one for the updater that will handle the error.
                         DotUpdater.OnDownloadError += DownloadingPresenter.DownloadErrorHandler;
                         DotUpdater.OnDownloadError += DownloadErrorHandler;
+                        DotUpdater.BeginDownload(_task);
                     }
                     catch (UpdaterException e)
                     {
 
=== modified file 'src/Canonical.UbuntuOne.Common/objects.xml'
--- src/Canonical.UbuntuOne.Common/objects.xml	2010-08-02 14:31:39 +0000
+++ src/Canonical.UbuntuOne.Common/objects.xml	2010-08-24 15:18:39 +0000
@@ -29,7 +29,7 @@
           type="Canonical.UbuntuOne.Common.Update.Updater, Canonical.UbuntuOne.Common"
           autowire="autodetect">
     <property name="RSSFeed"
-              value="http://path/to/rss.feed"/> <!-- Provide a way to set this through config ????-->
+              value="http://s3.amazonaws.com/u1wintest/rss"/> <!-- Provide a way to set this through config ????-->
   </object>
 
   <!-- ######################################################################################## -->
 
=== modified file 'src/UbuntuOneClient/objects.xml'
--- src/UbuntuOneClient/objects.xml	2010-07-30 16:32:54 +0000
+++ src/UbuntuOneClient/objects.xml	2010-08-24 15:18:39 +0000
@@ -5,7 +5,7 @@
           type="Canonical.UbuntuOne.Common.Update.Updater, Canonical.UbuntuOne.Common" 
           autowire="autodetect">
     <property name="RSSFeed"
-              value="http://path/to/rss.feed"/>
+              value="http://s3.amazonaws.com/u1wintest/rss"/>
   </object>
 
   <object id="Application"
 
=== modified file 'utils/rss_templates.py'
--- utils/rss_templates.py	2010-07-29 12:20:01 +0000
+++ utils/rss_templates.py	2010-08-24 15:18:39 +0000
@@ -7,8 +7,8 @@
  - version
  - enclosure url
  - enclosure lenght
- - sha
- 
+ - md5
+ - uuid
 """
 
 from string import Template
@@ -21,16 +21,16 @@
     <generator>WiX Toolset's ClickThrough for Isolated Applications</generator>
     <lastBuildDate>$lastBuildDate</lastBuildDate>
     <ttl>1440</ttl>
-    <as:application type="application/vnd.ms-msi">7bb74cea-a4a3-4904-9706-8f4dc764b368</as:application>
+    <as:application type="application/vnd.ms-msi">bd2e11b5-5e83-45e4-88cd-4f7c414d71c7</as:application>
     <item>
-      <guid isPermaLink="false">urn:msi:7bb74cea-a4a3-4904-9706-8f4dc764b368/$version</guid>
+      <guid isPermaLink="false">urn:msi:bd2e11b5-5e83-45e4-88cd-4f7c414d71c7/$version</guid>
       <pubDate>$pubDate</pubDate>
       <title>Ubuntu One Windows Client</title>
       <description>Ubuntu One Windows Client</description>
-      <as:application type="application/vnd.ms-msi">58cdea62-96b2-482b-b046-d884583c8ccd</as:application>
+      <as:application type="application/vnd.ms-msi">$uuid</as:application>
       <as:version>$version</as:version>
       <enclosure url="$url" length="$lenght" type="application/octet-stream" />
-      <as:digest algorithm="sha256">$sha</as:digest>
+      <as:digest algorithm="md5">$md5</as:digest>
     </item>
   </channel>
 </rss>
 
=== modified file 'utils/upload_new_update.py'
--- utils/upload_new_update.py	2010-07-29 12:20:01 +0000
+++ utils/upload_new_update.py	2010-08-24 15:18:39 +0000
@@ -3,10 +3,12 @@
 
 """This utilities release an Ubuntu One windows update."""
 
+import base64
+import hashlib
 import os
+import sys
 import time
-import hashlib
-import sys
+from uuid import uuid1
 
 import boto
 from boto.s3.key import Key
@@ -20,18 +22,16 @@
 RSS_FILE_NAME = 'rss'
 
 
-def upload_package(bucket, filename):
+def upload_package(bucket, filename, rss_params):
     """Upload the package"""
-    try:
-        print 'Removing %s...' % filename
-        bucket.delete_key(filename)
-    except S3ResponseError:
-        print 'No previous upload.'
-    print 'Uploading %s...' % filename
     k = Key(bucket)
-    k.key = filename
+    path = filename.split('\\')
+    name = path[len(path) -1]
+    keyname = rss_params['version'] + '/' + name
+    k.key = keyname
+    print 'Uploading %s...' % name
     k.set_contents_from_filename(filename)
-    bucket.set_acl('public-read', filename)
+    bucket.set_acl('public-read', keyname)
     print "Uploaded!"
 
 
@@ -40,8 +40,10 @@
     now = time.strftime('%d %b %Y %H:%M:%S %Z')
     rss_params['lastBuildDate'] = rss_params['pubDate'] = now
     fd = open(filename,'r')
-    rss_params['sha'] = hashlib.sha1(fd.read()).hexdigest()
+    md5_hash = hashlib.md5(fd.read()).digest()
+    rss_params['md5'] = base64.urlsafe_b64encode(md5_hash)
     rss_params['lenght'] = os.path.getsize(filename)
+    rss_params['url'] = rss_params['url']
     try:
         print 'Removing rss...'
         bucket.delete_key(RSS_FILE_NAME)
@@ -64,7 +66,7 @@
     conn = boto.connect_s3()
     print 'Connected!'
     bucket = conn.get_bucket(BUCKET)
-    upload_package(bucket, filename)
+    upload_package(bucket, filename, rss_params)
     upload_rss(bucket, filename, rss_params)
 
 
@@ -80,4 +82,5 @@
     rss_params = {}
     rss_params['version'] =  argv[2]
     rss_params['url'] = argv[3]
+    rss_params['uuid'] = str(uuid1())
     sys.exit(main(filename=argv[1], rss_params=rss_params))