From 62c52e874082ddaf51ee365d9bfc02f70efbeb4a Mon Sep 17 00:00:00 2001
From: Mark Stahler <markstahler@gmail.com>
Date: Sun, 9 Mar 2008 16:16:16 +0000
Subject: [PATCH] fixed icon path, added gtk download list button

---
 deluge/plugins/blocklist/blocklist/core.py    |  15 ++++++-
 .../blocklist/blocklist/data/blocklist16.png  | Bin 0 -> 705 bytes
 .../blocklist/data/blocklist_download24.png   | Bin 0 -> 926 bytes
 .../blocklist/data/blocklist_import24.png     | Bin 0 -> 1240 bytes
 deluge/plugins/blocklist/blocklist/gtkui.py   |  37 +++++++++++++-----
 .../blocklist/blocklist/torrentblocklist.py   |  10 +++--
 deluge/plugins/blocklist/setup.py             |   2 +-
 7 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 deluge/plugins/blocklist/blocklist/data/blocklist16.png
 create mode 100644 deluge/plugins/blocklist/blocklist/data/blocklist_download24.png
 create mode 100644 deluge/plugins/blocklist/blocklist/data/blocklist_import24.png

diff --git a/deluge/plugins/blocklist/blocklist/core.py b/deluge/plugins/blocklist/blocklist/core.py
index f68bddeb0..d1757b9c3 100644
--- a/deluge/plugins/blocklist/blocklist/core.py
+++ b/deluge/plugins/blocklist/blocklist/core.py
@@ -33,12 +33,14 @@
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
 
+import deluge.component
 from torrentblocklist import TorrentBlockList
 from deluge.log import LOG as log
 from deluge.plugins.corepluginbase import CorePluginBase
 
 class Core(CorePluginBase):    
     def enable(self):
+        deluge.component.get("Core").session.set_max_connections(0)
         self.blocklist = TorrentBlockList(self.plugin)
         self.plugin.register_hook("post_session_load", self._post_session_load)           
         log.debug('Blocklist: Plugin enabled..')
@@ -57,7 +59,7 @@ class Core(CorePluginBase):
     ## Hooks for core ##
     def _post_session_load(self):
         log.info('Blocklist: Session load hook caught')
-        if self.blocklist.load_on_start == True or self.blocklist.load_on_start == 'True':
+        if self.blocklist.load_on_start == True:
             # Wait until an idle time to load block list
             import gobject
             gobject.idle_add(self.blocklist.import_list)
@@ -86,6 +88,17 @@ class Core(CorePluginBase):
     def export_import_list(self):
         log.debug('Blocklist: Import started from GTK UI')
         self.blocklist.import_list()
+        
+    def export_download_list(self):
+        log.debug('Blocklist: Download started from GTK UI')
+        force_check = True
+        self.blocklist.check_update(force_check)
+        # Initialize download attempt
+        self.blocklist.attempt = 0
+        
+        if self.blocklist.fetch == True:
+            self.blocklist.download()
+
     
     def export_set_options(self, settings):
         log.debug("Blocklist: Set Options")
diff --git a/deluge/plugins/blocklist/blocklist/data/blocklist16.png b/deluge/plugins/blocklist/blocklist/data/blocklist16.png
new file mode 100644
index 0000000000000000000000000000000000000000..58240de7db77f74943870bc06dea91cdac51a288
GIT binary patch
literal 705
zcmV;y0zUnTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iO7{
z5+o(klahu200KctL_t(IjfIm>NRx3G$3MS!@4Kn*Og61hHX9lR)uD`{WEh0)U?H(6
ziomeKbrI?&-Xk)S4tDF>#i)xH=}@*6v@N1qt1zg!4dqpwv+2hEzFkr_o%X=*^nAV_
ze$NAsVEbyeSS(#a2$4u6UIW@jKx`3IIy*Z@T`t!xtJNwelSx9M(2CdVy{Kv0WI1T4
z5|(;;dd3F_2d~Y|%}McioKz}>EXziqD;kYHs(?49?RNVmkH_N<27^Q*5yIi{hjcof
zFBA#@t^eNE0;kj2rzi?OpN~Kw@IupOM%vq3bBdynOeO)$+X@^GM{6t=!(h-Edw9z2
zpXwjK-gi_r8jaX(wG0m(ySJra;AYp|j>DGynM?+wV&Jsv2Ij_YetwA~gg|7{^j~%K
z0!P*|a#`MT*)0vrh8({lI)z*wy_7(REc@CQIPYAfrPoH`R~Vq7nm}F-|G=`V27TVd
zmF@=gQXIXMrJg8<%wgu=erHK8RE%6Mpsv}(!9DNjIPON0ilo1dur&Ld32&YgZ30!*
zsoSu#O-nTIHlgl4i)yQ<u4x+2gFJUeVIrU+*MJcJ5lAGE3{8LnK${KPT1;FxW1^6Q
zVzH917(o&MB`D0Vw}u8_VOC%@EEAoD>`nkO)dZ_4Z83|EiQ>|FtFZy@-_DYp)`^+O
zPE0Wd1gi<skDsm#G&l03L;a)(R>^4a-cSBxNcT<pdH&`z&wz#UUvIibwUz_tPSU%>
nEaaDd{p*azE8x#YZms?T-dxR4E|Q|j00000NkvXXu0mjf{RTZi

literal 0
HcmV?d00001

diff --git a/deluge/plugins/blocklist/blocklist/data/blocklist_download24.png b/deluge/plugins/blocklist/blocklist/data/blocklist_download24.png
new file mode 100644
index 0000000000000000000000000000000000000000..de73891d94fa6846e38c487df74228a144a21850
GIT binary patch
literal 926
zcmV;P17ZA$P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY07w7;07w8v$!k6U00TZrL_t(Y$GwzGY*bYk$A90wciOR?
zw)4P=lp3Wz025(lXjB3#dDI;-rWz_}XfTl&ZQ@pZB*tpP!WTZMh6Ta0FpaqAN<%c#
zF^!p43Ybzz?1ZK>JUUG6JZ|sjqBFzHw6~om>VNZ{ob#Rk|9hPS|1revptrZ@X*Kl3
zyglz<Evadlx5Sao?(R3vxH|P7?TIH6adjL=R|Cg!G#;PU-lIKn0Lx9lw(U?b7-DAT
zCaPN8FI%IaC2K$sLZLO-wjEkl06;`g)e=%gD+m{i77U7m$eqeBD*)iAQ$}K$7MA5H
zcF)db$>wr}^w5g?D+;Ki`NmmzJRW9eQ}lgvoLnx4X_|EIdx82oAK6@nOeVAF{>lQX
zD2mtP;qxy(!?tbC{xZa5Y>Jk3Yw-vC1Ok3`J=IP+ora1WjFkl(R24z6ZJU$*15C!I
z0GNzj<D*aeXl!gmkfQIZGH~)23Vpjf)U>pt6tXQx6&Wb14u}vAhY9){IlSLjW)}jG
zJHD&yfs+qVXlZHYVAo3k9PFZKP18g~7ACHmChzNfer$MnSf1^8X3^P}&0Bc=weI|w
zO7X8r&E8&Ae^&t&4Zii}J8ayziQ(TP)Yf`=VEuz2!u|uDOed!Dk7|Li^hH-r(NY3N
zCY=dg`tuS4-+xE*+Gcj`+zld3Tp2Iv%Tiy4B8E|RRw*DrJz#EoavMhAA+kBeG%ZHY
zM+vV9190EHt;-I@wW%0}Y1~{&zys8R@ZsrE#{NojeP#}T4foU$jgI1LXyCo~-&NBz
zT}2GTNG7Hehh0kKlN-Lr<YFwv&L=i8`11v7EQ5)Oai{-ue`4s@NJrn7Utb1tZb<-H
z;8vj|B{*WVb+w)f1?u;<Z-3PI;inPO*Dn)H{id}wHCIPR&hL#zqvJqoQ8!&sl7Y(O
zhrT`GZ}RSG-~Nbk=Iq$ti5tnm$nhhu!rXj5;xsT@EqRH6O5356pWIdF-La$X;R^#l
z{?VGeogR#Q_4bP}Cx8Rkz<jmD1qi^_mrosNYVhvay7~T#LnBvqCzEqS=Z<x}0#bFP
zZZH7qYOLgj_3J)}j9isuGX3$nW6%97<o^r)0sUv1@7nFC$N&HU07*qoM6N<$f?x)_
A3;+NC

literal 0
HcmV?d00001

diff --git a/deluge/plugins/blocklist/blocklist/data/blocklist_import24.png b/deluge/plugins/blocklist/blocklist/data/blocklist_import24.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed2c75b222ac9b4c4c16bd87ff7a1c1166874d75
GIT binary patch
literal 1240
zcmV;}1Sk86P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9I01Gc}XlNt6Hp1Z7D?
zK~zY`#g*%eRaF?qe{1c1&YZb87j+!P{1BlM_#Y&Fi!3q<D$Dv%5fKu^`~iVPfgv$Q
z_BkjjVM0sN!0wP(f*^!C+0cy6t#RhenRDixeOb4+59g>;qd0wt7Cf+7d-MF(^Rn0b
z!hgKfoj!PXZ*(e-qfH@%ei7*rL8I_msVoGM*FN#<Rt*qPLr=3aj`Z$G#}66jb^z>t
z;sqL+qkruhbQF`MDaAq?!yg?cilSUAu7Ql$piT~cY!5B>jITeu|6KgWd$4bP--fok
z@7dnbziEqZ?;hajhwsqS(@S~m6v>hhYiOi~&U<$Ou;=-~wxqGRrB<tN`R?SA2Zr`W
zLx?c=X;1+AI>7kw`eV-yuG{tKlU;WW^y>C}oKmsL7oTC$8cCXfc$~9H@BnD7h!)PX
zu749zT;!2GuM%mMtw<1QRWC%+m0tOgMtzA=F{bEE6A%Jkgj(Iu-O&afoVBgGdV*O(
zyrH9aBgM#rx(U!X>#rJlQb9#UL<HvrYfbB=Bltj)S#smhk;1kB&gNJbSem)Wu3Zn4
z=NX7vT#*13k2jVU2iE8U#s<82iY7w@>WviZ0uqF3-O$+{H;n*m48{ejmCNXmQZ*fT
zr7x^VV7;8Hl;`oP9Up|;c)ZQ=qNvtW)^Fa*`pw&@)^n87B$>el)k+{37jP6Qm&?u=
z^~(x?apC95>6yBZI`9FE4H%OVM3ZGXrOrM|U41lii}&E1!;8k4ylEZ;Q6(m(t~IQv
z?^gn%!nao^rX#OQv~SpfZXdwrIYAV$RwPRcG-?YJqlna6RPgwqvAMyzKp-YHFuzbK
zY$H9h0<ix`GVOerow$01FTXhrrC#zp!;7L+)J%<!Ff~3xsV%0Fc|-zkS%SFK$K=dZ
z2<T%^4dYh;0IXAoe>!^sYYfij<ax71S_eddQcx@w$Zf#;fDamzXE?8*(8=$A%+ymC
z4K4Tl8$hDy0~a8O!k7$in<ertAOQ+-jPu}~$2-$ZU=0+yn4e#iG|R^id|o|wTfqL|
z+QOU1>dK48q=w*|0BbD*=tyH-z<R+rj~7jF236?b(%7{mb@9G`HamT*4k)4zj82vl
zp!KI1f)_*-j)+33r+N8A6TIQKvAN7yd*a~n%IQ@B+KR=uX39&Aay4ru@Sqe*X-aDb
zsO6gA0{~NV^)NA8tJqk-d@HY80`?Ej)xB4bpZ{$x38E13#8K3`@rqwBPZ2`1Ra_b?
z*9q?aw}&g$RRaJH9<Q9v#k~^Hhy>zd;YQ=LA-<6yck<wY<F(P-`9!zbF9AJgMzX2<
zwzt2O<%W&@Yh$f7N=J-NE^=kMnq`J#hfY>L0}9P~g<B1v0Ccw0H8$(M80eO*f0mO?
z-Cd=4zM6&k#Z(<V+j!=y^Nka&sVFUZAlwNMmW@-XXCXg3ntk2dp)MPf?VMdmrhmAY
zym(>4i~<cHStj#uhrVhhDzpxB{Xo7Y+mi5qt-k;u@x7l0X>_*$0000<MNUMnLSTZq
C0!x4Z

literal 0
HcmV?d00001

diff --git a/deluge/plugins/blocklist/blocklist/gtkui.py b/deluge/plugins/blocklist/blocklist/gtkui.py
index d52cab641..3e1fc214e 100644
--- a/deluge/plugins/blocklist/blocklist/gtkui.py
+++ b/deluge/plugins/blocklist/blocklist/gtkui.py
@@ -33,9 +33,9 @@
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
 
-import pkg_resources    # remove possibly, double check
+import os
+import pkg_resources    # access plugin egg
 from deluge.log import LOG as log
-import deluge.common # for pixmap
 import deluge.component    # for systray
 import ui
 import gtk, gobject
@@ -71,6 +71,10 @@ class GtkUI(ui.UI):
     def disable(self):
         deluge.component.get("StatusBar").remove_item(self.blocklist_status)
         self.plugin.deregister_hook("on_apply_prefs", self.apply_prefs)
+        
+    def get_pixmap(self, fname):
+        """Returns a pixmap file included with plugin"""
+        return pkg_resources.resource_filename("blocklist", os.path.join("data", fname))
                 
     def add_status_icon(self, ip_count):
         try:
@@ -78,7 +82,7 @@ class GtkUI(ui.UI):
         except:
             pass
         # self, image=None, stock=None, text=None, callback=None
-        self.blocklist_status = deluge.component.get("StatusBar").add_item(deluge.common.get_pixmap("blocklist16.png"), None, str(ip_count) + " Blocked IP Ranges ", None)
+        self.blocklist_status = deluge.component.get("StatusBar").add_item(self.get_pixmap("blocklist16.png"), None, str(ip_count) + " Blocked IP Ranges ", None)
         
     def get_ip_count(self):
         ui.client.block_list_count_ips(self.add_status_icon)
@@ -89,6 +93,11 @@ class GtkUI(ui.UI):
         log.debug('Blocklist: Import button')
         gobject.timeout_add(20000, self.get_ip_count)
         
+    def download_list(self, widget, data=None):
+        self.apply_prefs()
+        ui.client.block_list_download_list(None)
+        log.debug('Blocklist: Download button')
+        
     def unload_interface(self):
         self.plugin.remove_preferences_page("Blocklist")
         
@@ -113,7 +122,7 @@ class GtkUI(ui.UI):
         alignment = gtk.Alignment(0.5, 0.5, 1, 1)
         alignment.set_padding(8, 5, 5, 5)
                 
-        table = gtk.Table(7, 2, False)
+        table = gtk.Table(8, 2, False)
         table.set_col_spacings(8)
         table.set_row_spacings(10)
 
@@ -198,22 +207,30 @@ class GtkUI(ui.UI):
         hbox2.pack_start(self.try_times)
         
         table.attach(hbox2, 0, 2, 4, 5)
-        
+
         # sixth row        
         self.load_on_start = gtk.CheckButton('Import blocklist on daemon startup')
         table.attach(self.load_on_start, 0, 2, 5, 6)
         
-        # DO I NEED THIS STILL I DONT KNOW THINK ABOUT IT AND ASK MYSELF AGAIN LATER K THX BYE
+        # download new list button
+        download_button = gtk.Button("_Download Blocklist", None, True)
+        download_button.connect("clicked", self.download_list, None)
         
-#        # import button (Check and possibly download)
+        pixbuf = gtk.gdk.pixbuf_new_from_file(self.get_pixmap("blocklist_download24.png"))
+        image = gtk.image_new_from_pixbuf(pixbuf)
+        download_button.set_image(image)
+        table.attach(download_button, 0, 2, 6, 7)
+        
+        # import button (Check and possibly download)
         import_button = gtk.Button("_Import Blocklist", None, True)
         import_button.connect("clicked", self.start_import, None)
         
-        pixbuf = gtk.gdk.pixbuf_new_from_file(deluge.common.get_pixmap("blocklist_import24.png"))
+        pixbuf = gtk.gdk.pixbuf_new_from_file(self.get_pixmap("blocklist_import24.png"))
         image = gtk.image_new_from_pixbuf(pixbuf)
         import_button.set_image(image)
         
-        table.attach(import_button, 0, 2, 6, 7)
+        table.attach(import_button, 0, 2, 7, 8)
+        
         
         # finish frame
         frame.set_label_widget(label)
@@ -247,7 +264,7 @@ class GtkUI(ui.UI):
                          }
         ui.client.block_list_set_options(None, settings_dict)
         # Needs to go in another thread or wait until window is closed
-        gobject.idle_add(self.call_critical_setting)
+        #gobject.idle_add(self.call_critical_setting)
     
     def call_critical_setting(self):
         ui.client.block_list_critical_setting(None)        # This checks to see if url or listtype changed, if so download & import
diff --git a/deluge/plugins/blocklist/blocklist/torrentblocklist.py b/deluge/plugins/blocklist/blocklist/torrentblocklist.py
index 31532d1e7..757e7acda 100644
--- a/deluge/plugins/blocklist/blocklist/torrentblocklist.py
+++ b/deluge/plugins/blocklist/blocklist/torrentblocklist.py
@@ -49,7 +49,7 @@ from text import TextReader, GZMuleReader, PGZip
 
 BLOCKLIST_PREFS = {
         "url": "http://www.bluetack.co.uk/config/pipfilter.dat.gz",
-        "load_on_start": "True",
+        "load_on_start": True,
         "check_after_days": 2,
         "listtype": "gzmule",
         "timeout": 180,
@@ -118,7 +118,6 @@ class TorrentBlockList:
     def __init__(self, coreplugin):       
         self.plugin = coreplugin    # reference from plugin core
         log.info('Blocklist: TorrentBlockList instantiated')
-        deluge.component.get("Core").session.set_max_connections(0)
         self.config = deluge.configmanager.ConfigManager("blocklist.conf", BLOCKLIST_PREFS)
         self.curr = 0
         self.load_options()
@@ -167,7 +166,7 @@ class TorrentBlockList:
         # Load newly set options to core plugin
         self.load_options()
         
-    def check_update(self):
+    def check_update(self, force_check=False):
         log.info('Blocklist: Checking for updates')  
         
         try:
@@ -193,7 +192,7 @@ class TorrentBlockList:
             check_newer = False
                 
         # If the program decides it is time to get a new list
-        if check_newer == True:
+        if check_newer == True or force_check == True:
             log.debug('Blocklist: Attempting check')
     
             j = 0    # counter for loop
@@ -300,6 +299,9 @@ class TorrentBlockList:
             # CHECKSUM 
             
             log.info('Blocklist: List downloaded sucessfully')
+            break
+        
+        # Download completed
                
                 
     def import_list(self):
diff --git a/deluge/plugins/blocklist/setup.py b/deluge/plugins/blocklist/setup.py
index 4d5f9dbfa..bebce4d0f 100644
--- a/deluge/plugins/blocklist/setup.py
+++ b/deluge/plugins/blocklist/setup.py
@@ -44,7 +44,7 @@ setup(
     description=__doc__,
     author=__author__,
     packages=["blocklist"],
-    package_data = {"blocklist": ["glade/*.glade"]},
+    package_data = {"blocklist": ["data/*"]},
     entry_points="""
     [deluge.plugin.core]
     Blocklist = blocklist:CorePlugin