summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui.py31
-rwxr-xr-xproxy.py2
2 files changed, 32 insertions, 1 deletions
diff --git a/gui.py b/gui.py
index 8c82434..20e8c29 100644
--- a/gui.py
+++ b/gui.py
@@ -4,6 +4,37 @@ import gtk, sys, proxy, time
gtk.gdk.threads_init()
+class Settings(gtk.Window):
+ def __init__(self):
+ super(Settings, self).__init__(gtk.WINDOW_TOPLEVEL)
+
+ self.set_border_width(8)
+ self.set_title("Magicproxy GUI client settings")
+ self.set_resizable(False)
+
+ table = gtk.Table(rows=3, columns=3, homogeneous=True);
+
+ b_quit = gtk.Button("Quit")
+ b_quit.connect("clicked", self.on_quit)
+ label = gtk.Label("Time Slice")
+ self.time_slice = gtk.HScale()
+ self.time_slice.set_range(1,100)
+ self.time_slice.set_increments(1,1)
+ self.time_slice.set_value(proxy.TIME_SLICE)
+
+ table.attach(label,0,1,0,1)
+ table.attach(self.time_slice,2,3,0,1,xoptions=gtk.FILL)
+ table.attach(b_quit,0,3,2,3)
+
+ self.add(table)
+ self.show_all()
+
+ def on_quit(self, widget):
+ print self.time_slice.get_value()
+ proxy.TIME_SLICE = self.time_slice.get_value()
+ self.destroy()
+
+
class ProxyGUI(gtk.Window):
def __init__(self):
super(ProxyGUI, self).__init__(gtk.WINDOW_TOPLEVEL)
diff --git a/proxy.py b/proxy.py
index da30636..b0f31e8 100755
--- a/proxy.py
+++ b/proxy.py
@@ -122,7 +122,7 @@ class MultipleProxyReader(object):
and self.fetch_pos + 1 < self.content_length and not self.channel.is_closed \
and len( filter( (lambda f: f.proxy == fetcher.proxy), self.fetchers) ) < 2:
#Start a new fetcher on this line if this fetchers is X-Bytes before finishing his jobs
- blocksize = min(TIME_SLICE * int(fetcher.speed()), MIN_BLOCKSIZE)
+ blocksize = max(int(TIME_SLICE * fetcher.speed()), MIN_BLOCKSIZE)
fetch_range = self.next_range(blocksize)
print "Start new Fetcher, bs=%s range=%s" % (blocksize,fetch_range)
self.fetchers.append( Fetcher(self, fetcher.proxy, self.url, self.header, fetch_range) )