Changeset 2322

Timestamp:

11/26/07 02:20:40 (14 months ago)

Author:

markybob

Message:

tweak last

Files:

• tags/deluge-0.5.6.96/src/deluge_core.cpp (modified) (2 diffs)
• trunk/src/deluge_core.cpp (modified) (2 diffs)

tags/deluge-0.5.6.96/src/deluge_core.cpp

@@ -253 +253 @@
         storage_mode = storage_mode_sparse;
     }
-    torrent_handle h = M_ses->add_torrent(t, save_path, resume_data, storage_mode);
-    //    h.set_max_connections(60); // at some point we should use this
-    h.set_max_uploads(-1);
-    h.set_ratio(preferred_ratio);
-    h.resolve_countries(true);
-    new_torrent.handle = h;
-
-    new_torrent.unique_ID = M_unique_counter;
-    M_unique_counter++;
-
-    M_torrents->push_back(new_torrent);
-
-    return (new_torrent.unique_ID);
+    try{
+        torrent_handle h = M_ses->add_torrent(t, save_path, resume_data, storage_mode);
+        //    h.set_max_connections(60); // at some point we should use this
+        h.set_max_uploads(-1);
+        h.set_ratio(preferred_ratio);
+        h.resolve_countries(true);
+        new_torrent.handle = h;
+        new_torrent.unique_ID = M_unique_counter;
+        M_unique_counter++;
+        M_torrents->push_back(new_torrent);
+        return (new_torrent.unique_ID);
+    }
+    catch (invalid_encoding&)
+    {
+    printf("invalid encoding...bad torrent\n");
+    }
+    catch (invalid_handle&)
+    {
+    printf("invalid handle.  something bad happened in libtorrent\n");
+    }
+    catch (...) {}
 }
 
@@ -1810 +1818 @@
       }
     }
+  catch (invalid_handle&)
+  {
+  printf("invalid handle.  something bad happened in libtorrent\n");
+  }
   catch (...) {}
   Py_INCREF(Py_None); return Py_None;

trunk/src/deluge_core.cpp

@@ -253 +253 @@
         storage_mode = storage_mode_sparse;
     }
-    torrent_handle h = M_ses->add_torrent(t, save_path, resume_data, storage_mode);
-    //    h.set_max_connections(60); // at some point we should use this
-    h.set_max_uploads(-1);
-    h.set_ratio(preferred_ratio);
-    h.resolve_countries(true);
-    new_torrent.handle = h;
-
-    new_torrent.unique_ID = M_unique_counter;
-    M_unique_counter++;
-
-    M_torrents->push_back(new_torrent);
-
-    return (new_torrent.unique_ID);
+    try{
+        torrent_handle h = M_ses->add_torrent(t, save_path, resume_data, storage_mode);
+        //    h.set_max_connections(60); // at some point we should use this
+        h.set_max_uploads(-1);
+        h.set_ratio(preferred_ratio);
+        h.resolve_countries(true);
+        new_torrent.handle = h;
+        new_torrent.unique_ID = M_unique_counter;
+        M_unique_counter++;
+        M_torrents->push_back(new_torrent);
+        return (new_torrent.unique_ID);
+    }
+    catch (invalid_encoding&)
+    {
+    printf("invalid encoding...bad torrent\n");
+    }
+    catch (invalid_handle&)
+    {
+    printf("invalid handle.  something bad happened in libtorrent\n");
+    }
+    catch (...) {}
 }
 
@@ -1810 +1818 @@
       }
     }
+  catch (invalid_handle&)
+  {
+  printf("invalid handle.  something bad happened in libtorrent\n");
+  }
   catch (...) {}
   Py_INCREF(Py_None); return Py_None;