mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-02 22:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #1505: Add libtorrent info to --version output

Browse source
This commit is contained in:
Calum Lind 2011-07-09 14:00:29 +01:00
commit eb309813ea
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
deluge/main.py
View file

@ -48,6 +48,11 @@ import deluge.common
import deluge.configmanager import deluge.configmanager
import deluge.error import deluge.error
try:
from deluge._libtorrent import lt
lt_version = "\nlibtorrent: %s" % lt.version
except ImportError:
lt_version = ""
def start_ui(): def start_ui():
"""Entry point for ui script""" """Entry point for ui script"""
@ -55,7 +60,7 @@ def start_ui():
# Setup the argument parser # Setup the argument parser
parser = OptionParser(usage="%prog [options] [actions]", parser = OptionParser(usage="%prog [options] [actions]",
version=deluge.common.get_version()) version= "%prog: " + deluge.common.get_version() + lt_version)
parser.add_option("-u", "--ui", dest="ui", parser.add_option("-u", "--ui", dest="ui",
help="""The UI that you wish to launch. The UI choices are:\n help="""The UI that you wish to launch. The UI choices are:\n
@ -130,7 +135,7 @@ def start_daemon():
# Setup the argument parser # Setup the argument parser
parser = OptionParser(usage="%prog [options] [actions]", parser = OptionParser(usage="%prog [options] [actions]",
version=deluge.common.get_version()) version= "%prog: " + deluge.common.get_version() + lt_version)
parser.add_option("-p", "--port", dest="port", parser.add_option("-p", "--port", dest="port",
help="Port daemon will listen on", action="store", type="int") help="Port daemon will listen on", action="store", type="int")
parser.add_option("-i", "--interface", dest="interface", parser.add_option("-i", "--interface", dest="interface",

8
deluge/ui/ui.py
View file

@ -39,6 +39,12 @@ import deluge.configmanager
import deluge.log import deluge.log
import os import os
try:
from deluge._libtorrent import lt
lt_version = "\nlibtorrent: %s" % lt.version
except ImportError:
lt_version = ""
DEFAULT_PREFS = { DEFAULT_PREFS = {
"default_ui": "gtk" "default_ui": "gtk"
} }
@ -54,7 +60,7 @@ class _UI(object):
usage="%prog [options] [actions]", usage="%prog [options] [actions]",
self.__parser = OptionParser(version=deluge.common.get_version()) self.__parser = OptionParser(version="%prog: " + deluge.common.get_version() + lt_version)
group = OptionGroup(self.__parser, "Common Options") group = OptionGroup(self.__parser, "Common Options")
group.add_option("-c", "--config", dest="config", group.add_option("-c", "--config", dest="config",