Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactored _hsdic2list method. It it much easier to understand now. (fixes #199)

Browse Source
This commit is contained in:
Micah Lee 2015-11-20 14:20:29 -08:00
parent ce79633eec
commit 8f8e38b11d
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
onionshare/hs.py
View File

@ -218,10 +218,32 @@ class HS(object):
self.cleanup_filenames = []
def _hsdic2list(self, dic):
"""Convert what we get from get_conf_map to what we need for set_options"""
return [
pair for pairs in [
[('HiddenServiceDir', vals[0]), ('HiddenServicePort', vals[1])]
for vals in zip(dic.get('HiddenServiceDir', []), dic.get('HiddenServicePort', []))
] for pair in pairs
"""
Convert what we get from get_conf_map to what we need for set_options.
For example, if input looks like this:
{
'HiddenServicePort': [
'80 127.0.0.1:47906',
'80 127.0.0.1:33302'
],
'HiddenServiceDir': [
'/tmp/onionshare/tmplTfZZu',
'/tmp/onionshare/tmpchDai3'
]
}
Output will look like this:
[
('HiddenServiceDir', '/tmp/onionshare/tmplTfZZu'),
('HiddenServicePort', '80 127.0.0.1:47906'),
('HiddenServiceDir', '/tmp/onionshare/tmpchDai3'),
('HiddenServicePort', '80 127.0.0.1:33302')
]
"""
l = []
for i in range(len(dic['HiddenServiceDir'])):
l.append(('HiddenServiceDir', dic['HiddenServiceDir'][i]))
l.append(('HiddenServicePort', dic['HiddenServicePort'][i]))
return l