* Monsoon/MainWindow.cs:

* Monsoon/Model/Download.cs:
* Monsoon/TorrentController.cs: Ensure the correct path is
  saved/restored when persisting torrent data.

* Monsoon/CreateTorrentDialog.cs: Ensure the correct paths are used
  when loading a torrent directly for seeding

svn path=/trunk/monsoon/; revision=137129

Monsoon/ChangeLog

@@ -1,3 +1,13 @@
+2009-06-30  Alan McGovern  <amcgovern@novell.com>
+
+	* MainWindow.cs:
+	* Model/Download.cs:
+	* TorrentController.cs: Ensure the correct path is
+	saved/restored when persisting torrent data.
+
+	* CreateTorrentDialog.cs: Ensure the correct paths are used
+	when loading a torrent directly for seeding
+
 2009-06-30  Alan McGovern  <amcgovern@novell.com>
 
 	* TorrentController.cs: Restore the old save path so that

Monsoon/CreateTorrentDialog.cs

@@ -247,16 +247,22 @@ private void BeginCreateCb(IAsyncResult result)
 				System.IO.File.WriteAllBytes(p, dict.Encode());
 				if(startSeedingCheckBox.Active)
 				{
-					Torrent t = Torrent.Load(savePathChooser.Filename);
+					Torrent t = Torrent.Load(p);
 					BitField bf = new BitField(t.Pieces.Count);
 					bf.Not();
 					MonoTorrent.Client.FastResume fresume = new MonoTorrent.Client.FastResume (t.InfoHash, bf, new List<MonoTorrent.Client.Peer>());
 					torrentController.FastResume.Add(fresume);
-					torrentController.addTorrent(t, System.IO.Path.GetDirectoryName (SavePath), startSeedingCheckBox.Active);
+					string savePath;
+					if (newTorrentLocationButton.Action == FileChooserAction.SelectFolder) {
+						savePath = SavePath.Substring (0, SavePath.LastIndexOf ('/'));
+					} else {
+						savePath = System.IO.Path.GetDirectoryName (SavePath);
+					}
+					torrentController.addTorrent(t, savePath, startSeedingCheckBox.Active);
 				}
 				logger.Debug("Torrent file created");
 			}catch(Exception e){
-				logger.Error("Failed to create torrent - " + e.Message);
+				logger.Error("Failed to create torrent - " + e.ToString ());
 			}
 		}
 

Monsoon/MainWindow.cs

@@ -894,7 +894,7 @@ public void StoreTorrentSettings ()
 				TorrentStorage torrentToStore = new TorrentStorage();
 				torrentToStore.TorrentPath = manager.Torrent.TorrentPath;
 				torrentToStore.Priority = download.Priority;
-				torrentToStore.SavePath = manager.SavePath;
+				torrentToStore.SavePath = download.SavePath;
 				torrentToStore.Settings = manager.Settings;
 				torrentToStore.State = download.State;
 				torrentToStore.UploadedData = download.TotalUploaded;

Monsoon/Model/Download.cs

@@ -78,7 +78,7 @@ public class Download
 		}
 
 		public string SavePath {
-			get { return manager.SavePath; }
+			get; private set;
 		}
 
 		public int Seeds {
@@ -105,16 +105,17 @@ public class Download
 			get { return manager.Monitor.UploadSpeed; }
 		}
 
-		public Download (TorrentManager manager)
+		public Download (string savePath, TorrentManager manager)
 		{
 			this.manager = manager;
 			this.swarmSpeed = new SpeedMonitor (30);
+			SavePath = savePath;
 
 			GLib.Timeout.Add (1000, delegate {
 				swarmSpeed.Tick ();
 				return true;
 			});
-
+			
 			manager.PieceHashed += delegate (object sender, PieceHashedEventArgs e) {
 				hashProgress = (double) e.PieceIndex / manager.Torrent.Pieces.Count;
 			};

Monsoon/TorrentController.cs

@@ -243,7 +243,7 @@ public Download addTorrent(Torrent torrent, bool startTorrent, bool removeOrigin
 			TorrentSettings settings = savedSettings ?? defaultTorrentSettings.Clone ();
 			FastResume resume = this.fastResume.Find(delegate (FastResume f) { return f.Infohash == torrent.InfoHash; });
 
-			manager = new Download(new TorrentManager (torrent, savePath, settings));
+			manager = new Download(savePath, new TorrentManager (torrent, savePath, settings));
 			if (resume != null)
 				manager.Manager.LoadFastResume (resume);