mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-04 15:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1.3-stable' of deluge-torrent.org:deluge into 1.3-stable

Browse source
This commit is contained in:
Damien Churchill 2012-01-09 22:34:59 +00:00
commit 2e0e0fb6b5
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
deluge/ui/web/json_api.py
View file

@ -354,7 +354,7 @@ class EventQueue(object):
:type listener_id: string :type listener_id: string
:param event: The event name :param event: The event name
:type event: string :type event: string
""" """
if event not in self.__events: if event not in self.__events:
def on_event(*args): def on_event(*args):
@ -375,7 +375,7 @@ class EventQueue(object):
:param listener_id: A unique id for the listener :param listener_id: A unique id for the listener
:type listener_id: string :type listener_id: string
""" """
# Check to see if we have anything to return immediately # Check to see if we have anything to return immediately
if listener_id in self.__queue: if listener_id in self.__queue:
@ -409,7 +409,7 @@ class EventQueue(object):
:type listener_id: string :type listener_id: string
:param event: The event name :param event: The event name
:type event: string :type event: string
""" """
self.__events[event].remove(listener_id) self.__events[event].remove(listener_id)
if not self.__events[event]: if not self.__events[event]:
client.deregister_event_handler(event, self.__handlers[event]) client.deregister_event_handler(event, self.__handlers[event])
@ -735,11 +735,11 @@ class WebApi(JSONComponent):
@export @export
def get_host_status(self, host_id): def get_host_status(self, host_id):
""" """
Returns the current status for the specified host. Returns the current status for the specified host.
:param host_id: the hash id of the host :param host_id: the hash id of the host
:type host_id: string :type host_id: string
""" """
def response(status, info=None): def response(status, info=None):
return host_id, host, port, status, info return host_id, host, port, status, info
@ -747,6 +747,8 @@ class WebApi(JSONComponent):
try: try:
host_id, host, port, user, password = self.get_host(host_id) host_id, host, port, user, password = self.get_host(host_id)
except TypeError, e: except TypeError, e:
host = None
port = None
return response(_("Offline")) return response(_("Offline"))
def on_connect(connected, c, host_id): def on_connect(connected, c, host_id):
@ -784,8 +786,8 @@ class WebApi(JSONComponent):
@export @export
def start_daemon(self, port): def start_daemon(self, port):
""" """
Starts a local daemon. Starts a local daemon.
""" """
client.start_daemon(port, get_config_dir()) client.start_daemon(port, get_config_dir())
@export @export
@ -947,7 +949,7 @@ class WebApi(JSONComponent):
:param event: The event name :param event: The event name
:type event: string :type event: string
""" """
self.event_queue.add_listener(__request__.session_id, event) self.event_queue.add_listener(__request__.session_id, event)
@export @export
@ -957,12 +959,12 @@ class WebApi(JSONComponent):
:param event: The event name :param event: The event name
:type event: string :type event: string
""" """
self.event_queue.remove_listener(__request__.session_id, event) self.event_queue.remove_listener(__request__.session_id, event)
@export @export
def get_events(self): def get_events(self):
""" """
Retrieve the pending events for the session. Retrieve the pending events for the session.
""" """
return self.event_queue.get_events(__request__.session_id) return self.event_queue.get_events(__request__.session_id)

14
setup.py Normal file → Executable file
View file

@ -17,9 +17,9 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, write to: # along with this program. If not, write to:
# The Free Software Foundation, Inc., # The Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor # 51 Franklin Street, Fifth Floor
# Boston, MA 02110-1301, USA. # Boston, MA 02110-1301, USA.
# #
try: try:
@ -450,6 +450,14 @@ class clean_plugins(cmd.Command):
os.remove(os.path.join(path, fpath)) os.remove(os.path.join(path, fpath))
os.removedirs(path) os.removedirs(path)
ROOT_EGG_INFO_DIR_PATH = "deluge*.egg-info"
for path in glob.glob(ROOT_EGG_INFO_DIR_PATH):
print("Deleting %s" % path)
for fpath in os.listdir(path):
os.remove(os.path.join(path, fpath))
os.removedirs(path)
class clean(_clean): class clean(_clean):
sub_commands = _clean.sub_commands + [('clean_plugins', None)] sub_commands = _clean.sub_commands + [('clean_plugins', None)]