gryf/mc_adbfs
1
0
Fork 0
mirror of https://github.com/gryf/mc_adbfs.git synced 2026-03-27 13:53:35 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: gryf:0.14
Branches Tags
gryf:master
gryf:0.15 gryf:0.14 gryf:0.13 gryf:0.12 gryf:0.11 gryf:0.10 gryf:0.9 gryf:0.8 gryf:0.7
...
compare: gryf:b1a6219d210fb13793e925dfa6df51a390ce97f6
Branches Tags
gryf:master
gryf:0.15 gryf:0.14 gryf:0.13 gryf:0.12 gryf:0.11 gryf:0.10 gryf:0.9 gryf:0.8 gryf:0.7

8 Commits
0.14 ... b1a6219d21

Author SHA1 Message Date
gryf
b1a6219d21 Removed deprecated encoding argument from json.loads. 2020-12-07 19:08:29 +01:00
gryf
d16f0f06b8 Merge branch 'thp-various-fixes' 2020-06-09 19:55:21 +02:00
gryf
c2f07f5516 Merge branch 'various-fixes' of https://github.com/thp/mc_adbfs into thp-various-fixes 2020-06-09 19:55:06 +02:00
gryf
e9b196eaf8 Change SafeConfigParser to ConfigParser 2020-05-21 10:10:43 +02:00
gryf
039c078a35 Fix missing attribute on conf object 2020-04-26 13:48:21 +02:00
Thomas Perl
b088c45d3f Fix quoting for 'adb shell' 2019-05-09 11:58:29 +02:00
Thomas Perl
c5559f7d41 Python 3's ConfigParser is already the safe one 2019-05-09 11:38:21 +02:00
Thomas Perl
9ffa1a13af Default to Python 3 2019-05-09 11:38:00 +02:00
2 changed files with 4 additions and 2 deletions
Expand all files Collapse all files

1
README.rst
View File

@@ -76,6 +76,7 @@ You can configure behaviour of this plugin using ``.ini`` file located under
root = root =
adb_command = adb adb_command = adb
adb_connect = adb_connect =
try_su = false
where: where:

5
adbfs
View File

@@ -80,6 +80,7 @@ class Conf(object):
self.suppress_colors = False self.suppress_colors = False
self.adb_command = 'adb' self.adb_command = 'adb'
self.adb_connect = '' self.adb_connect = ''
self.try_su = False
self.read() self.read()
self.connect() self.connect()
@@ -187,7 +188,7 @@ class Conf(object):
if not os.path.exists(conf_fname): if not os.path.exists(conf_fname):
return return
cfg = configparser.SafeConfigParser() cfg = configparser.ConfigParser()
cfg_map = {'debug': (cfg.getboolean, 'debug'), cfg_map = {'debug': (cfg.getboolean, 'debug'),
'dirs_to_skip': (cfg.get, 'dirs_to_skip'), 'dirs_to_skip': (cfg.get, 'dirs_to_skip'),
'suppress_colors': (cfg.get, 'suppress_colors'), 'suppress_colors': (cfg.get, 'suppress_colors'),
@@ -204,7 +205,7 @@ class Conf(object):
pass pass
if self.dirs_to_skip and isinstance(self.dirs_to_skip, str): if self.dirs_to_skip and isinstance(self.dirs_to_skip, str):
self.dirs_to_skip = json.loads(self.dirs_to_skip, encoding='ascii') self.dirs_to_skip = json.loads(self.dirs_to_skip)
self.dirs_to_skip = [x.encode('utf-8') for x in self.dirs_to_skip] self.dirs_to_skip = [x.encode('utf-8') for x in self.dirs_to_skip]
else: else:
self.dirs_to_skip = [] self.dirs_to_skip = []