Attachment 214035 Details for Bug 386548

fix for loading torrents while running

torrentLoad.patch (text/plain), 7.67 KB, created by Alan McGovern on 2008-05-09 17:51:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan McGovern

Created: 2008-05-09 17:51:03 UTC

Size: 7.67 KB

patch

obsolete

>Index: Monsoon/MainWindow.cs
>===================================================================
>--- Monsoon/MainWindow.cs	(revision 102873)
>+++ Monsoon/MainWindow.cs	(working copy)
>@@ -349,6 +349,18 @@
> 			}
> 		}
> 		
>+		public void LoadTorrent (string path)
>+		{
>+			try
>+			{
>+				torrentController.addTorrent (path, true, true); 
>+			}
>+			catch (Exception ex)
>+			{
>+				logger.Error ("Torrent was not loaded: {0}", ex);
>+			}
>+		}
>+		
> 		private void RestoreInterfaceSettings ()
> 		{
> 			InterfaceSettings settings = interfaceSettings.Settings;
>@@ -756,8 +768,9 @@
> 			}
> 			
> 		
>-			foreach (WaitHandle h in this.torrentController.Engine.StopAll())
>-				h.WaitOne (TimeSpan.FromSeconds(10), false);	
>+			foreach (TorrentManager manager in this.torrentController.Torrents)
>+				if (manager.State != TorrentState.Stopped)
>+					manager.Stop ().WaitOne (TimeSpan.FromSeconds(1), true);
> 
> //			List<WaitHandle> handles = new List<WaitHandle> ();
> //			foreach (TorrentManager manager in torrents.Keys){
>@@ -943,7 +956,11 @@
> 				logger.Debug ("Open torrent dialog response recieved");
> 				foreach (String fileName in fileChooser.Filenames) {
> 					try {
>-						torrentController.addTorrent(fileName);
>+						string newPath = System.IO.Path.Combine(Preferences.TorrentStorageLocation, System.IO.Path.GetFileName(fileName));
>+						Console.Error.WriteLine("Copying: {0} to {1}", fileName, newPath);
>+						if (System.IO.File.Exists (newPath))
>+							System.IO.File.Delete (newPath);
>+						System.IO.File.Copy(fileName, newPath ,true); 
> 					} catch (Exception ex) {
> 						MessageDialog errorDialog = new MessageDialog(this, DialogFlags.DestroyWithParent, MessageType.Error, ButtonsType.Close, ex.Message);
> 						errorDialog.Run();
>Index: Monsoon/Main.cs
>===================================================================
>--- Monsoon/Main.cs	(revision 102873)
>+++ Monsoon/Main.cs	(working copy)
>@@ -81,7 +81,7 @@
> 					GLib.Timeout.Add (1000, delegate {
> 						try
> 						{
>-							mainWindow.TorrentController.addTorrent(arg);
>+							mainWindow.TorrentController.addTorrent (arg, true, true);
> 						}
> 						catch (Exception ex)
> 						{
>@@ -120,12 +120,41 @@
> 			Console.WriteLine(_("Starting Monsoon"));
> 			
> 			Application.Init("monsoon", ref args);
>+			Monsoon.GconfPreferencesSettingsController sets = new GconfPreferencesSettingsController();
>+			sets.Load ();
>+
>+			try
>+			{
>+				mainWindow = new MainWindow (settingsStorage, engineSettings.Settings,
>+				                             portController, isFirstRun);
>+			}
>+			catch(Exception ex)
>+			{
>+				logger.Info("Existing instance detected");
>+				if (args.Length > 0 && File.Exists(args[0]))
>+				{
>+					logger.Info ("Informing existing instance of new torrent");
>+					string oldPath = args[0];
>+					string newPath = Path.Combine(sets.Settings.TorrentStorageLocation, Path.GetFileName(args[0]));
>+					logger.Info ("Copying: {0} to {1}", oldPath, newPath);
>+					
>+					if (File.Exists (newPath))
>+						File.Delete (newPath);
>+					
>+					File.Copy(oldPath, newPath ,true);
>+				}
>+				else
>+				{
>+					logger.Info ("No new torrents detected");
>+				}
>+				Environment.Exit (0);
>+			}
> 			
>-			mainWindow = new MainWindow (settingsStorage, engineSettings.Settings,
>-									portController, isFirstRun);
>-			
>+			if (File.Exists(sets.Settings.TorrentStorageLocation))
>+				StartLocalFileWatcher (mainWindow, sets.Settings.TorrentStorageLocation);
>+			else
>+				StartLocalFileWatcher (mainWindow, Defines.TorrentFolder);
> 			GLib.ExceptionManager.UnhandledException += new GLib.UnhandledExceptionHandler(OnUnhandledException);
>-			
> 			Application.Run();
> 
> 			try {
>@@ -138,6 +167,20 @@
> 			mainWindow.Stop ();
> 			mainWindow.Destroy ();
> 		}
>+		
>+		private static void StartLocalFileWatcher (MainWindow window, string path)
>+		{
>+			FileSystemWatcher watcher = new FileSystemWatcher(path, "*.torrent");
>+			
>+			watcher.Created += delegate (object o, System.IO.FileSystemEventArgs  e) {
>+				logger.Info ("Loading: {0}", e.FullPath);
>+				GLib.Timeout.Add (250, delegate {
>+					window.LoadTorrent (e.FullPath);
>+					return false;
>+				});
>+			};
>+			watcher.EnableRaisingEvents = true;
>+		}
> 
> 		public static void SetProcessName(string name)
> 		{
>Index: Monsoon/TorrentController.cs
>===================================================================
>--- Monsoon/TorrentController.cs	(revision 102873)
>+++ Monsoon/TorrentController.cs	(working copy)
>@@ -53,6 +53,10 @@
> 		private Dictionary<TorrentManager, long> torrentPreviousUpload;
> 		private Dictionary<TorrentManager, long> torrentPreviousDownload;
> 		private MainWindow mainWindow;
>+		public MainWindow MainWindow
>+		{
>+			get { return mainWindow; }
>+		}
> 		
> 		private List<TorrentManager> torrentsDownloading;
> 		private List<TorrentManager> torrentsSeeding;
>@@ -197,7 +201,8 @@
> 			if (!isUrl && moveToStorage && (prefSettings.TorrentStorageLocation != Directory.GetParent(torrentPath).ToString()) ) {
> 				newPath = Path.Combine(prefSettings.TorrentStorageLocation, Path.GetFileName(torrentPath));
> 				logger.Debug("Copying torrent to " + newPath);	
>-				File.Copy(torrentPath, newPath, true);
>+				// The files should already be in the TorrentStorageLocation
>+				//File.Copy(torrentPath, newPath, true);
> 				
> 				if (removeOriginal) {
> 					logger.Info("Deleting original torrent " + torrentPath);
>@@ -462,9 +467,24 @@
> 		{
> 			if(!prefSettings.ImportEnabled)
> 				return;
>-				
>-			logger.Info("New torrent detected, adding " + args.TorrentPath);
>-			addTorrent(args.TorrentPath, prefSettings.StartNewTorrents, true, prefSettings.RemoveOnImport, null);
>+			
>+			GLib.Timeout.Add (250, delegate {
>+				string newPath = Path.Combine(MainWindow.Preferences.TorrentStorageLocation, Path.GetFileName(args.TorrentPath));
>+				logger.Info ("Copying: {0} to {1}", args.TorrentPath, newPath);
>+				try
>+				{
>+					if (File.Exists (newPath))
>+						File.Delete (newPath);
>+					
>+					File.Copy(args.TorrentPath, newPath ,true);
>+				}
>+				catch (Exception ex)
>+				{
>+					
>+				}
>+				return false;
>+			});
>+			//addTorrent(args.TorrentPath, prefSettings.StartNewTorrents, true, prefSettings.RemoveOnImport, null);
> 		}
> 		
> 		public void LoadStoredTorrents()
>Index: Monsoon/gtk-gui/Monsoon.MainWindow.cs
>===================================================================
>--- Monsoon/gtk-gui/Monsoon.MainWindow.cs	(revision 102873)
>+++ Monsoon/gtk-gui/Monsoon.MainWindow.cs	(working copy)
>@@ -328,7 +328,7 @@
>             this.detailNotebook = new Gtk.Notebook();
>             this.detailNotebook.CanFocus = true;
>             this.detailNotebook.Name = "detailNotebook";
>-            this.detailNotebook.CurrentPage = 1;
>+            this.detailNotebook.CurrentPage = 4;
>             // Container child detailNotebook.Gtk.Notebook+NotebookChild
>             this.scrolledwindow1 = new Gtk.ScrolledWindow();
>             this.scrolledwindow1.CanFocus = true;
>Index: Monsoon/TorrentTreeView.cs
>===================================================================
>--- Monsoon/TorrentTreeView.cs	(revision 102873)
>+++ Monsoon/TorrentTreeView.cs	(working copy)
>@@ -130,7 +130,20 @@
> 				Uri uri = new Uri(s.TrimEnd());
> 				if(uri.IsFile){
> 					logger.Info("URI dropped " + uri);
>-						torrentController.addTorrent(uri.LocalPath);
>+					string newPath = System.IO.Path.Combine(torrentController.MainWindow.Preferences.TorrentStorageLocation,
>+					                                        System.IO.Path.GetFileName(uri.LocalPath));
>+					Console.Error.WriteLine("Copying: {0} to {1}", uri.LocalPath, newPath);
>+
>+					try
>+					{
>+						if (System.IO.File.Exists (newPath))
>+							System.IO.File.Delete (newPath);
>+						System.IO.File.Copy(uri.LocalPath, newPath ,true); 
>+					}
>+					catch (Exception ex)
>+					{
>+						logger.Error ("Could not load DND torrent: {0}", ex);
>+					}
> 				}
> 			}		
> 		}

Actions: View

Attachments on bug 386548: 213343 | 213870 | 213940 | 214035