From ad49df108b810dd5fa2e2b27b7fd1de4704b789b Mon Sep 17 00:00:00 2001
From: spoob <spoob@gmx.de>
Date: Wed, 12 Aug 2009 20:01:28 +0200
Subject: moved update service to update.pyload.org
---
module/file_list.py | 14 +++++++-------
pyLoadCore.py | 2 +-
pyLoadGui.py | 15 ---------------
pyLoadUpdater.py | 15 ++++-----------
4 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/module/file_list.py b/module/file_list.py
index 4b3577bfc..d3af2c1b2 100644
--- a/module/file_list.py
+++ b/module/file_list.py
@@ -57,13 +57,13 @@ class File_List(object):
def remove(self, pyfile):
- #pass
-
- if pyfile in self.files:
- self.files.remove(pyfile)
-
- self.data['order'].remove(pyfile.id)
- del self.data[pyfile.id]
+ pass
+ #
+ #if pyfile in self.files:
+ #self.files.remove(pyfile)
+#
+ #self.data['order'].remove(pyfile.id)
+ #del self.data[pyfile.id]
def remove_id(self, pyid):
#also abort download
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 9577def74..c7c5140c2 100644
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -136,7 +136,7 @@ class Core(object):
if not self.config['search_updates']:
return False
- newst_version = urllib2.urlopen("http://pyloadupdate.appspot.com/", "version=" + CURRENT_VERSION).readline()
+ newst_version = urllib2.urlopen("http://update.pyload.org/index.php?do=" + CURRENT_VERSION).readline()
if newst_version == "True":
if not self.config['install_updates']:
self.logger.info("New version available, please run Updater")
diff --git a/pyLoadGui.py b/pyLoadGui.py
index d86ac30f0..806c4437c 100755
--- a/pyLoadGui.py
+++ b/pyLoadGui.py
@@ -63,7 +63,6 @@ class Download_Liste(wx.ListCtrl):
wx.ListCtrl.__init__(self, parent, -1, style=wx.LC_REPORT | wx.LC_VIRTUAL)
# columns
-
self.InsertColumn(0, 'Name', width=300)
self.InsertColumn(1, 'Status', width=120)
self.InsertColumn(2, 'Größe')
@@ -77,12 +76,10 @@ class Download_Liste(wx.ListCtrl):
self.itemIndexMap = []
self.SetItemCount(len(self.itemIndexMap))
-
def reload(self, links, data):
self.itemIndexMap = data['order']
-
self.create_data(links, data)
self.SetItemCount(len(self.itemIndexMap))
@@ -117,10 +114,6 @@ class Download_Liste(wx.ListCtrl):
def OnGetItemAttr(self, item):
return None
-
-
-
-
class _Upper_Panel(wx.Panel):
def __init__(self, parent):
wx.Panel.__init__(self, parent)
@@ -153,7 +146,6 @@ class _Upper_Panel(wx.Panel):
return links
-
class _Lower_Panel(wx.Panel):
def __init__(self, parent):
wx.Panel.__init__(self, parent)
@@ -184,8 +176,6 @@ class _Host_Dialog(wx.Dialog):
self.SetSizer(hbox)
-
-
class Pyload_Main_Gui(wx.Frame):
def __init__(self, parent, id, title="pyLoad"):
@@ -250,7 +240,6 @@ class Pyload_Main_Gui(wx.Frame):
self.Show(True)
-
def exit_button_clicked(self, event):
self.Close()
@@ -276,7 +265,6 @@ class Pyload_Main_Gui(wx.Frame):
self.thread.push_exec("get_links")
-
def disconnect(self, event):
self.thread.socket.close_when_done()
self.SetStatusText('')
@@ -300,7 +288,6 @@ class Pyload_Main_Gui(wx.Frame):
self.thread.push_exec('remove_links', [links])
-
def up_button_clicked(self, event):
links = self.panel_up.get_selected_ids()
@@ -313,8 +300,6 @@ class Pyload_Main_Gui(wx.Frame):
self.thread.push_exec('move_links_down', [links])
-
-
def show_links(self, links):
for link in links:
#wx.MessageDialog(self, str(link), 'info', style=wx.OK).ShowModal()
diff --git a/pyLoadUpdater.py b/pyLoadUpdater.py
index 69575da8a..e6395a080 100644
--- a/pyLoadUpdater.py
+++ b/pyLoadUpdater.py
@@ -20,7 +20,6 @@ import urllib2
#
###
-
## read version from core
import re
import zipfile
@@ -49,7 +48,6 @@ class Unzip:
outfile.flush()
outfile.close()
-
def _createstructure(self, file, dir):
self._makedirs(self._listdirs(file), dir)
@@ -75,7 +73,6 @@ class Unzip:
dirs.sort()
return dirs
-
def main():
print "Updating pyLoad"
@@ -86,28 +83,24 @@ def main():
except:
version = "0.0.0"
-
print "Your version:", version
- req = urllib2.urlopen("http://pyloadupdate.appspot.com/", "version="+version)
+ req = urllib2.urlopen("http://update.pyload.org/index.php?do="+version)
result = req.readline()
if result == "False":
print "pyLoad is up-to-date, nothing to do."
return False
- req = urllib2.urlopen("http://pyloadupdate.appspot.com/")
+ req = urllib2.urlopen("http://update.pyload.org/index.php")
result = req.readline()
print "Newest Version:", result
print "Download new Version"
- urllib.urlretrieve("http://pyloadupdate.appspot.com/download", "lastest_version.zip")
+ urllib.urlretrieve("http://update.pyload.org/index.php?do=download", "lastest_version.zip")
u = Unzip()
u.extract("lastest_version.zip",".")
-
-
-
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
--
cgit v1.2.3