andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

String config value can be optionnal AND have a choices list

Browse Source 
Integer value can be optionnal
This commit is contained in:
Alexandre Petitjean 2013-07-31 10:05:20 +02:00
parent 786d7c1ae0
commit 97848bc1a2
4 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mopidy/backends/spotify/session_manager.py
View File

@ -36,7 +36,6 @@ class SpotifySessionManager(process.BaseThread, PyspotifySessionManager):
full_proxy = ''
if config['proxy']['hostname']:
full_proxy = config['proxy']['hostname']
# Add proxy port and scheme only if available
if config['proxy']['port']:
full_proxy += ':' + str(config['proxy']['port'])
if config['proxy']['scheme']:

4
mopidy/config/__init__.py
View File

@ -27,9 +27,9 @@ _audio_schema['output'] = String()
_proxy_schema = ConfigSchema('proxy')
_proxy_schema['scheme'] = String(optional=True,
choices=['', 'https', 'socks4', 'socks5'])
choices=['http', 'https', 'socks4', 'socks5'])
_proxy_schema['hostname'] = Hostname(optional=True)
_proxy_schema['port'] = Port()
_proxy_schema['port'] = Port(optional=True)
_proxy_schema['username'] = String(optional=True)
_proxy_schema['password'] = Secret(optional=True)

2
mopidy/config/default.conf
View File

@ -15,6 +15,6 @@ output = autoaudiosink
[proxy]
scheme =
hostname =
port = http
port =
username =
password =

26
mopidy/config/types.py
View File

@ -71,9 +71,9 @@ class String(ConfigValue):
def deserialize(self, value):
value = decode(value).strip()
validators.validate_required(value, self._required)
validators.validate_choice(value, self._choices)
if not value:
return None
validators.validate_choice(value, self._choices)
return value
def serialize(self, value, display=False):
@ -111,12 +111,16 @@ class Secret(ConfigValue):
class Integer(ConfigValue):
"""Integer value."""
def __init__(self, minimum=None, maximum=None, choices=None):
def __init__(self, minimum=None, maximum=None, choices=None, optional=False):
self._required = not optional
self._minimum = minimum
self._maximum = maximum
self._choices = choices
def deserialize(self, value):
validators.validate_required(value, self._required)
if not value:
return None
value = int(value)
validators.validate_choice(value, self._choices)
validators.validate_minimum(value, self._minimum)
@ -222,23 +226,9 @@ class Port(Integer):
allocate a port for us.
"""
# TODO: consider probing if port is free or not?
def __init__(self, choices=None):
def __init__(self, choices=None, optional=False):
super(Port, self).__init__(
minimum=0, maximum=2 ** 16 - 1, choices=choices)
def deserialize(self, value):
try:
value = int(value)
except ValueError:
try:
value = socket.getservbyname(value, 'tcp')
except socket.error:
raise ValueError('must be a valid port number')
validators.validate_choice(value, self._choices)
validators.validate_minimum(value, self._minimum)
validators.validate_maximum(value, self._maximum)
return value
minimum=0, maximum=2 ** 16 - 1, choices=choices, optional=optional)
class Path(ConfigValue):