From f8eede78ca2f265314e9875750240d98c6c5f2a5 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sun, 10 Aug 2014 14:24:41 +0100
Subject: [PATCH] [AutoAdd] Add Skip Hash Check option

---
 .../AutoAdd/deluge/plugins/autoadd/core.py    |   5 +-
 .../autoadd/data/autoadd_options.glade        | 152 ++++++++----------
 .../AutoAdd/deluge/plugins/autoadd/gtkui.py   |   5 +-
 deluge/plugins/AutoAdd/setup.py               |   2 +-
 4 files changed, 71 insertions(+), 93 deletions(-)

diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
index 7d69cc533..2849f66f8 100644
--- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
+++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
@@ -59,7 +59,8 @@ OPTIONS_AVAILABLE = {  # option: builtin
     "label": False,
     "add_paused": True,
     "queue_to_top": False,
-    "owner": "localclient"
+    "owner": True,
+    "seed_mode": True
 }
 
 MAX_NUM_ATTEMPTS = 10
@@ -222,7 +223,7 @@ class Core(CorePluginBase):
         # without them is valid, and applies all its settings.
         for option, value in watchdir.iteritems():
             if OPTIONS_AVAILABLE.get(option):
-                if watchdir.get(option+'_toggle', True) or option == "owner":
+                if watchdir.get(option+'_toggle', True) or option in ["owner", "seed_mode"]:
                     opts[option] = value
 
         # Check for .magnet files containing multiple magnet links and
diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade
index bf042d38e..0a38c60c4 100644
--- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade
+++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade
@@ -25,7 +25,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_opts_cancel"/>
               </widget>
@@ -42,7 +41,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_opts_add"/>
               </widget>
@@ -59,7 +57,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_opts_apply"/>
               </widget>
@@ -155,7 +152,6 @@ it will be added to the session.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_enabled_toggle_toggled"/>
@@ -189,42 +185,7 @@ it will be added to the session.</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFrame" id="OwnerFrame">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <widget class="GtkComboBox" id="OwnerCombobox">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="tooltip" translatable="yes">The user selected here will be the owner of the torrent.</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Owner&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
+                      <placeholder/>
                     </child>
                     <child>
                       <widget class="GtkFrame" id="frame1">
@@ -253,7 +214,6 @@ it will be added to the session.</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip" translatable="yes">Once the torrent is added to the session,
 the .torrent will be deleted.</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
                                         <signal name="toggled" handler="on_toggle_toggled"/>
                                       </widget>
@@ -276,7 +236,6 @@ the .torrent will be deleted.</property>
                                             <property name="tooltip" translatable="yes">Once the torrent is added to the session,
 an extension will be appended to the .torrent
 and it will remain in the same directory.</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">True</property>
                                             <property name="group">isnt_append_extension</property>
                                             <signal name="toggled" handler="on_toggle_toggled"/>
@@ -326,7 +285,6 @@ and it will remain in the same directory.</property>
                                             <property name="tooltip" translatable="yes">Once the torrent is added to the session,
 the .torrent will copied to the chosen directory
 and deleted from the watch folder.</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">True</property>
                                             <property name="group">isnt_append_extension</property>
                                             <signal name="toggled" handler="on_toggle_toggled"/>
@@ -380,7 +338,6 @@ and deleted from the watch folder.</property>
                                             <property name="has_tooltip">True</property>
                                             <property name="tooltip" translatable="yes">Once the torrent is deleted from the session,
 also delete the .torrent file used to add it.</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">True</property>
                                           </widget>
                                           <packing>
@@ -443,7 +400,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip" translatable="yes">This folder will be where the torrent data is downloaded to.</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
@@ -537,7 +493,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
@@ -586,7 +541,6 @@ also delete the .torrent file used to add it.</property>
                                         <property name="sensitive">False</property>
                                         <property name="can_focus">False</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
@@ -646,7 +600,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
@@ -661,15 +614,6 @@ also delete the .torrent file used to add it.</property>
                                   <widget class="GtkComboBoxEntry" id="label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <child internal-child="entry">
-                                      <widget class="GtkEntry" id="comboboxentry-entry2">
-                                        <property name="can_focus">False</property>
-                                        <property name="primary_icon_activatable">False</property>
-                                        <property name="secondary_icon_activatable">False</property>
-                                        <property name="primary_icon_sensitive">True</property>
-                                        <property name="secondary_icon_sensitive">True</property>
-                                      </widget>
-                                    </child>
                                   </widget>
                                   <packing>
                                     <property name="expand">True</property>
@@ -717,8 +661,45 @@ also delete the .torrent file used to add it.</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="border_width">6</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <placeholder/>
+                      <widget class="GtkFrame" id="OwnerFrame">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkComboBox" id="OwnerCombobox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip" translatable="yes">The user selected here will be the owner of the torrent.</property>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Owner&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkFrame" id="frame5">
@@ -746,7 +727,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
@@ -764,7 +744,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
@@ -782,7 +761,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
@@ -908,7 +886,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
@@ -961,8 +938,8 @@ also delete the .torrent file used to add it.</property>
                               <widget class="GtkTable" id="table2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="n_rows">5</property>
-                                <property name="n_columns">4</property>
+                                <property name="n_rows">6</property>
+                                <property name="n_columns">3</property>
                                 <property name="column_spacing">2</property>
                                 <property name="row_spacing">4</property>
                                 <child>
@@ -975,7 +952,6 @@ also delete the .torrent file used to add it.</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                         <signal name="toggled" handler="on_toggle_toggled"/>
@@ -1001,7 +977,6 @@ also delete the .torrent file used to add it.</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                       </widget>
@@ -1018,7 +993,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
@@ -1035,7 +1009,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
@@ -1054,7 +1027,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
@@ -1096,11 +1068,11 @@ also delete the .torrent file used to add it.</property>
                                     <property name="homogeneous">True</property>
                                     <child>
                                       <widget class="GtkRadioButton" id="auto_managed">
-                                        <property name="label" translatable="no">gtk-yes</property>
+                                        <property name="label">gtk-yes</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_stock">True</property>
                                         <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
                                       </widget>
@@ -1112,11 +1084,11 @@ also delete the .torrent file used to add it.</property>
                                     </child>
                                     <child>
                                       <widget class="GtkRadioButton" id="isnt_auto_managed">
-                                        <property name="label" translatable="no">gtk-no</property>
+                                        <property name="label">gtk-no</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_stock">True</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">auto_managed</property>
                                       </widget>
@@ -1141,7 +1113,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
@@ -1161,7 +1132,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
                                   </widget>
@@ -1173,11 +1143,11 @@ also delete the .torrent file used to add it.</property>
                                     <property name="homogeneous">True</property>
                                     <child>
                                       <widget class="GtkRadioButton" id="add_paused">
-                                        <property name="label" translatable="no">gtk-yes</property>
+                                        <property name="label">gtk-yes</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_stock">True</property>
                                         <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
                                       </widget>
@@ -1189,11 +1159,11 @@ also delete the .torrent file used to add it.</property>
                                     </child>
                                     <child>
                                       <widget class="GtkRadioButton" id="isnt_add_paused">
-                                        <property name="label" translatable="no">gtk-no</property>
+                                        <property name="label">gtk-no</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_stock">True</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">add_paused</property>
                                       </widget>
@@ -1215,7 +1185,6 @@ also delete the .torrent file used to add it.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="draw_indicator">True</property>
                                     <signal name="toggled" handler="on_toggle_toggled"/>
                                   </widget>
@@ -1235,7 +1204,6 @@ also delete the .torrent file used to add it.</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
                                       </widget>
@@ -1251,7 +1219,6 @@ also delete the .torrent file used to add it.</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">queue_to_top</property>
                                       </widget>
@@ -1270,13 +1237,20 @@ also delete the .torrent file used to add it.</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
+                                  <widget class="GtkCheckButton" id="seed_mode">
+                                    <property name="label" translatable="yes">Skip File Hash Check</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <placeholder/>
diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py
index 4891a3841..5116b35a6 100644
--- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py
+++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py
@@ -85,6 +85,9 @@ class OptionsDialog():
         self.glade.get_widget('delete_copy_torrent_toggle').set_active(
             options.get('delete_copy_torrent_toggle', False)
         )
+        self.glade.get_widget('seed_mode').set_active(
+            options.get('seed_mode', False)
+        )
         self.accounts.clear()
         self.labels.clear()
         combobox = self.glade.get_widget('OwnerCombobox')
@@ -319,7 +322,7 @@ class OptionsDialog():
 
         for key in ['append_extension_toggle', 'download_location_toggle',
                     'label_toggle', 'copy_torrent_toggle',
-                    'delete_copy_torrent_toggle']:
+                    'delete_copy_torrent_toggle', 'seed_mode']:
             options[key] = self.glade.get_widget(key).get_active()
 
         for id in self.spin_ids:
diff --git a/deluge/plugins/AutoAdd/setup.py b/deluge/plugins/AutoAdd/setup.py
index beb407391..8a5ffb63c 100644
--- a/deluge/plugins/AutoAdd/setup.py
+++ b/deluge/plugins/AutoAdd/setup.py
@@ -18,7 +18,7 @@ from setuptools import setup, find_packages
 __plugin_name__ = "AutoAdd"
 __author__ = "Chase Sterling, Pedro Algarvio"
 __author_email__ = "chase.sterling@gmail.com, pedro@algarvio.me"
-__version__ = "1.04"
+__version__ = "1.05"
 __url__ = "http://dev.deluge-torrent.org/wiki/Plugins/AutoAdd"
 __license__ = "GPLv3"
 __description__ = "Monitors folders for .torrent files."