Changeset 2357

Timestamp:

12/01/07 06:45:43 (13 months ago)

Author:

markybob

Message:

tweak full hd warning - disable it in libtorrent

Files:

• tags/deluge-0.5.7.1/ChangeLog (modified) (1 diff)
• tags/deluge-0.5.7.1/libtorrent/src/peer_connection.cpp (modified) (1 diff)
• tags/deluge-0.5.7.1/src/core.py (modified) (2 diffs)
• trunk/ChangeLog (modified) (1 diff)
• trunk/libtorrent/src/peer_connection.cpp (modified) (1 diff)
• trunk/src/core.py (modified) (2 diffs)

tags/deluge-0.5.7.1/ChangeLog

@@ -1 +1 @@
 Deluge 0.5.7.1 (31 November 2007)
-  * Increase tracker timeout
+  * Tweak full hd warning so that it only displays itself once per torrent that
+  it has to pause.
   * Fixed crash and corruption of persistent.state while adding a duplicate 
   torrent.  Also caused yet another invalid handle error.
+  * Increase tracker timeout
 
 Deluge 0.5.7 (26 November 2007)

tags/deluge-0.5.7.1/libtorrent/src/peer_connection.cpp

@@ -1400 +1400 @@
                         if (t->alerts().should_post(alert::fatal))
                         {
-                                std::string err = "torrent paused: disk write error, " + j.str;
-                                t->alerts().post_alert(file_error_alert(t->get_handle(), err));
+                if (j.str != "write failed: No space left on device"){
+                                std::string err = "torrent paused: disk write error, " + j.str;
+                                t->alerts().post_alert(file_error_alert(t->get_handle(), err));
+                }
                         }
                         t->pause();

tags/deluge-0.5.7.1/src/core.py

@@ -545 +545 @@
                         self.resume(unique_ID)
                     else:
+                        self.pause(unique_ID)
+                        self.unique_IDs[unique_ID].user_paused = True
                         nice_need = common.fsize(total_needed)
                         nice_free = common.fsize(avail)
@@ -551 +553 @@
                         gtk.gdk.threads_enter()
                         dialogs.show_popup_warning(None, _("There is not enough \
-free disk space to complete your download.") + "\n" + _("Space Needed:") + " " \
-+ nice_need + "\n" + _("Available Space:") + " " + nice_free)
+free disk space to complete your download.") + "\n" + "This torrents will be \
+paused" + "\n" + _("Space Needed:") + " " + nice_need + "\n" + _("Available \
+Space:") + " " + nice_free)
                         gtk.gdk.threads_leave()
                         print "Not enough free space to resume this torrent!"

trunk/ChangeLog

@@ -1 +1 @@
 Deluge 0.5.7.1 (31 November 2007)
-  * Increase tracker timeout
+  * Tweak full hd warning so that it only displays itself once per torrent that
+  it has to pause.
   * Fixed crash and corruption of persistent.state while adding a duplicate 
   torrent.  Also caused yet another invalid handle error.
+  * Increase tracker timeout
 
 Deluge 0.5.7 (26 November 2007)

trunk/libtorrent/src/peer_connection.cpp

@@ -1400 +1400 @@
                         if (t->alerts().should_post(alert::fatal))
                         {
-                                std::string err = "torrent paused: disk write error, " + j.str;
-                                t->alerts().post_alert(file_error_alert(t->get_handle(), err));
+                if (j.str != "write failed: No space left on device"){
+                                std::string err = "torrent paused: disk write error, " + j.str;
+                                t->alerts().post_alert(file_error_alert(t->get_handle(), err));
+                }
                         }
                         t->pause();

trunk/src/core.py

@@ -545 +545 @@
                         self.resume(unique_ID)
                     else:
+                        self.pause(unique_ID)
+                        self.unique_IDs[unique_ID].user_paused = True
                         nice_need = common.fsize(total_needed)
                         nice_free = common.fsize(avail)
@@ -551 +553 @@
                         gtk.gdk.threads_enter()
                         dialogs.show_popup_warning(None, _("There is not enough \
-free disk space to complete your download.") + "\n" + _("Space Needed:") + " " \
-+ nice_need + "\n" + _("Available Space:") + " " + nice_free)
+free disk space to complete your download.") + "\n" + "This torrents will be \
+paused" + "\n" + _("Space Needed:") + " " + nice_need + "\n" + _("Available \
+Space:") + " " + nice_free)
                         gtk.gdk.threads_leave()
                         print "Not enough free space to resume this torrent!"