nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency list and pep8 fixes.

Browse Source
This commit is contained in:
James Valleroy 2015-03-24 21:57:19 -04:00 committed by Sunil Mohan Adapa
parent 40bbad4484
commit ed4e6eddc1
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
INSTALL
View File

@ -6,8 +6,9 @@
$ sudo apt-get install libjs-jquery libjs-modernizr \ $ sudo apt-get install libjs-jquery libjs-modernizr \
libjs-bootstrap make pandoc python3 python3-cherrypy3 \ libjs-bootstrap make pandoc python3 python3-cherrypy3 \
python3-coverage python3-django python3-bootstrapform \ python3-coverage python3-dbus python3-django python3-bootstrapform \
python3-gi python3-setuptools python3-yaml gir1.2-packagekitglib-1.0 python3-gi python3-networkmanager python3-setuptools python3-yaml \
gir1.2-packagekitglib-1.0
2. Install Plinth: 2. Install Plinth:

17
plinth/modules/networks/networks.py
View File

@ -117,14 +117,17 @@ def edit(request, conn_id):
form_data['ipv4_address'] = settings['ipv4']['addresses'][0][0] form_data['ipv4_address'] = settings['ipv4']['addresses'][0][0]
if settings['connection']['type'] == '802-11-wireless': if settings['connection']['type'] == '802-11-wireless':
form_data['ssid'] = settings['802-11-wireless']['ssid'] settings_wifi = settings['802-11-wireless']
form_data['mode'] = settings['802-11-wireless']['mode'] form_data['ssid'] = settings_wifi['ssid']
form_data['mode'] = settings_wifi['mode']
try: try:
if (settings['802-11-wireless']['security'] == '802-11-wireless-security' if settings_wifi['security'] == '802-11-wireless-security':
and settings['802-11-wireless-security']['key-mgmt'] == 'wpa-psk'): wifi_sec = settings['802-11-wireless-security']
form_data['auth_mode'] = 'wpa' if wifi_sec['key-mgmt'] == 'wpa-psk':
secrets = conn.GetSecrets() form_data['auth_mode'] = 'wpa'
form_data['passphrase'] = secrets['802-11-wireless-security']['psk'] secret = conn.GetSecrets()
psk = secret['802-11-wireless-security']['psk']
form_data['passphrase'] = psk
else: else:
form_data['auth_mode'] = 'open' form_data['auth_mode'] = 'open'
except KeyError: except KeyError:

3
plinth/modules/networks/urls.py
View File

@ -32,7 +32,8 @@ urlpatterns = patterns(
url(r'^sys/networks/(?P<conn_id>[\w.@+-]+)/deactivate/$', url(r'^sys/networks/(?P<conn_id>[\w.@+-]+)/deactivate/$',
'deactivate', name='deactivate'), 'deactivate', name='deactivate'),
url(r'^sys/networks/scan/$', 'scan', name='scan'), url(r'^sys/networks/scan/$', 'scan', name='scan'),
url(r'^sys/networks/connect/(?P<connect_path>[\w.@+-]+)/$', 'connect', name='connect'), url(r'^sys/networks/connect/(?P<connect_path>[\w.@+-]+)/$',
'connect', name='connect'),
url(r'^sys/networks/add/$', 'add', name='add'), url(r'^sys/networks/add/$', 'add', name='add'),
url(r'^sys/networks/add/ethernet/$', 'add_ethernet', name='add_ethernet'), url(r'^sys/networks/add/ethernet/$', 'add_ethernet', name='add_ethernet'),
url(r'^sys/networks/add/wifi/$', 'add_wifi', name='add_wifi'), url(r'^sys/networks/add/wifi/$', 'add_wifi', name='add_wifi'),

6
plinth/network.py
View File

@ -35,6 +35,7 @@ CONNECTION_TYPE_NAMES = {
class ConnectionNotFound(Exception): class ConnectionNotFound(Exception):
def __init__(self, msg): def __init__(self, msg):
self.msg = msg self.msg = msg
def __str__(self): def __str__(self):
return self.msg return self.msg
@ -42,6 +43,7 @@ class ConnectionNotFound(Exception):
class DeviceNotFound(Exception): class DeviceNotFound(Exception):
def __init__(self, msg): def __init__(self, msg):
self.msg = msg self.msg = msg
def __str__(self): def __str__(self):
return self.msg return self.msg
@ -179,8 +181,8 @@ def activate_connection(name):
}.get(ctype, ctype) }.get(ctype, ctype)
for dev in NetworkManager.NetworkManager.GetDevices(): for dev in NetworkManager.NetworkManager.GetDevices():
if (dev.DeviceType == dtype if (dev.DeviceType == dtype and
and dev.State == NetworkManager.NM_DEVICE_STATE_DISCONNECTED): dev.State == NetworkManager.NM_DEVICE_STATE_DISCONNECTED):
break break
else: else:
raise DeviceNotFound( raise DeviceNotFound(