Added Python3 compatibility

README.rst

@@ -8,10 +8,11 @@ This is Midnight Commander extfs plugin for browsing Android device through
 Rquirements
 ===========
 
-* Python 2.7
+* Python 2.7 or 3.x (tested on 3.5.4)
 * ``adb`` installed and in ``$PATH`` or provided via the config file
 * An Android device or emulator preferably rooted
-* Busybox installed and available in the path on the device
+* ``busybox`` (``toolbox``, ``toybox``) installed and available in the path on
+  the device
 
 Make sure, that issuing from command line:
 
@@ -70,6 +71,8 @@ You can configure behaviour of this plugin using ``.ini`` file located under
    suppress_colors = false
    root =
    adb_command = adb
+   adb_connect =
+
 
 where:
 
@@ -80,11 +83,16 @@ where:
   everything (slow!)
 * ``suppress_colors`` this option will make ``busybox`` not to display colors,
   helpful, if ``busybox ls`` is configured to display colors by default. Does
-  not affect ``toolbox``.
+  not affect ``toolbox`` or ``toybox``.
 * ``root`` root directory to read. Everything outside of that directory will be
   omitted. That would be the fastest way to access certain location on the
   device. Note, that ``dirs_to_skip`` still apply inside this directory.
-* ``adb_command`` = path to ``adb`` command.
+* ``adb_command`` absolute or relative path to ``adb`` command. `~/` or
+  environment variables are allowed.
+* ``adb_connect`` specifies if connection to specific device needs to be
+  performed before accessing shell. It is useful for *adb over network*
+  feature. Typical value here is a device IP address with optional port, which
+  defaults to 5555.
 
 Limitations
 ===========

adbfs

@@ -5,22 +5,35 @@ adbfs Virtual filesystem for Midnight Commander
 * Copyright (c) 2016, Roman Dobosz,
 * Published under 3-clause BSD-style license (see LICENSE file)
 """
-
+try:
-import ConfigParser
+    import ConfigParser as configparser
+except ImportError:
+    import configparser
 import argparse
 from datetime import datetime
-import errno
 import json
 import os
 import re
 import subprocess
 import sys
 
-__version__ = 0.10
+__version__ = 0.11
 
 XDG_CONFIG_HOME = os.getenv('XDG_CONFIG_HOME', os.path.expanduser('~/.config'))
 
 
+def check_output(command_list, stderr=None):
+    """
+    For some reason, in py3 it was decided that command output should be bytes
+    instead of string. This little function will check if we have string or
+    bytes and in case of bytes it will convert it to string.
+    """
+    result = subprocess.check_output(command_list, stderr=stderr)
+    if not isinstance(result, str):
+        result = result.decode('utf-8')
+    return result
+
+
 class NoBoxFoundException(OSError):
     """
     Exception raised in case of not found either toolbox or busybox on remote
@@ -44,6 +57,16 @@ class Conf(object):
              'toolbox': {'ls': 'toolbox ls -anl',
                          'rls':  'toolbox ls -Ranl {}',
                          'file_re': r'^(?P<perms>[-bcdlps][-rwxsStT]{9})\s+'
+                                    r'(?P<uid>\d+)\s+'
+                                    r'(?P<gid>\d+)\s+'
+                                    r'(?P<size>\d+)?\s'
+                                    r'(?P<date>\d{4}-\d{2}-\d{2}\s'
+                                    r'\d{2}:\d{2})\s'
+                                    r'(?P<name>.*)'},
+             'toybox': {'ls': 'toybox ls -anl',
+                        'rls':  'toybox ls -Ranl {}',
+                        'file_re': r'^(?P<perms>[-bcdlps][-rwxsStT]{9})\s+'
+                                   r'(?P<links>\d+)\s+'
                                    r'(?P<uid>\d+)\s+'
                                    r'(?P<gid>\d+)\s+'
                                    r'(?P<size>\d+)?\s'
@@ -58,8 +81,10 @@ class Conf(object):
         self.root = None
         self.suppress_colors = False
         self.adb_command = 'adb'
+        self.adb_connect = ''
 
         self.read()
+        self.connect()
         self.get_the_box()
 
     def get_the_box(self):
@@ -67,8 +92,7 @@ class Conf(object):
         cmd = [self.adb_command] + 'shell which'.split()
         try:
             with open(os.devnull, 'w') as fnull:
-                result = subprocess.check_output(cmd + ['busybox'],
+                result = check_output(cmd + ['busybox'], stderr=fnull)
-                                                 stderr=fnull)
             if 'busybox' in result:
                 self.box = Conf.boxes['busybox']
                 if self.suppress_colors:
@@ -82,8 +106,18 @@ class Conf(object):
 
         try:
             with open(os.devnull, 'w') as fnull:
-                result = subprocess.check_output(cmd + ['toolbox'],
+                result = check_output(cmd + ['toybox'], stderr=fnull)
-                                                 stderr=fnull)
+
+            if 'toybox' in result:
+                self.box = Conf.boxes['toybox']
+                Adb.file_re = re.compile(self.box['file_re'])
+                return
+        except subprocess.CalledProcessError:
+            pass
+
+        try:
+            with open(os.devnull, 'w') as fnull:
+                result = check_output(cmd + ['toolbox'], stderr=fnull)
 
             if 'toolbox' in result:
                 self.box = Conf.boxes['toolbox']
@@ -92,8 +126,56 @@ class Conf(object):
         except subprocess.CalledProcessError:
             pass
 
-        raise NoBoxFoundException(errno.ENOENT,
+        sys.stderr.write('There is no toolbox or busybox available.\n')
-                                  'There is no toolbox or busybox available')
+        sys.exit(1)
+
+    def get_attached_devices(self):
+        """Return a list of attached devices"""
+        cmd = [self.adb_command, 'devices']
+        devices = []
+
+        try:
+            with open(os.devnull, 'w') as fnull:
+                result = check_output(cmd, stderr=fnull)
+        except subprocess.CalledProcessError:
+            result = ''
+
+        for line in result.split('\n'):
+            if line.startswith('*'):
+                continue
+            if line.strip() == 'List of devices attached':
+                continue
+            if line.strip() == '':
+                continue
+            identifier, _ = line.split()
+            devices.append(identifier)
+
+        return devices
+
+    def connect(self):
+        """
+        If adb_connect is non empty string, perform connecting to specified
+        device over network using an address (or hostname).
+        """
+        if not self.adb_connect:
+            return
+
+        devices = self.get_attached_devices()
+
+        for device in devices:
+            if self.adb_connect in device:
+                return  # already connected, no need to reconnect
+
+        cmd = [self.adb_command, 'connect', self.adb_connect]
+        with open(os.devnull, 'w') as fnull:
+            result = check_output(cmd, stderr=fnull)
+        if result.split()[0] == 'connected':
+            subprocess.call([self.adb_command, 'wait-for-device'])
+            return
+
+        sys.stderr.write('Unable to connect to `%s\'. Is adb over network '
+                         'enabled on device?\n' % self.adb_connect)
+        sys.exit(2)
 
     def read(self):
         """
@@ -107,18 +189,19 @@ class Conf(object):
         if not os.path.exists(conf_fname):
             return
 
-        cfg = ConfigParser.SafeConfigParser()
+        cfg = configparser.SafeConfigParser()
         cfg_map = {'debug': (cfg.getboolean, 'debug'),
                    'dirs_to_skip': (cfg.get, 'dirs_to_skip'),
                    'suppress_colors': (cfg.get, 'suppress_colors'),
                    'root': (cfg.get, 'root'),
-                   'adb_command': (cfg.get, 'adb')}
+                   'adb_command': (cfg.get, 'adb_command'),
+                   'adb_connect': (cfg.get, 'adb_connect')}
         cfg.read(conf_fname)
 
         for key, (function, attr) in cfg_map.items():
             try:
                 setattr(self, attr, function('adbfs', key))
-            except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
+            except (configparser.NoSectionError, configparser.NoOptionError):
                 pass
 
         if self.dirs_to_skip and isinstance(self.dirs_to_skip, str):
@@ -259,7 +342,7 @@ class Adb(object):
         cmd = [self.conf.adb_command] + 'shell su -c whoami'.split()
         try:
             with open(os.devnull, 'w') as fnull:
-                result = subprocess.check_output(cmd, stderr=fnull)
+                result = check_output(cmd, stderr=fnull)
 
         except subprocess.CalledProcessError:
             return
@@ -313,9 +396,9 @@ class Adb(object):
 
         try:
             if self.conf.debug:
-                print 'executing', ' '.join(command)
+                print('executing', ' '.join(command))
 
-            lines = subprocess.check_output(command)
+            lines = check_output(command)
         except subprocess.CalledProcessError:
             sys.stderr.write('Cannot read directory. Is device connected?\n')
             return 1
@@ -375,9 +458,9 @@ class Adb(object):
 
         try:
             if self.conf.debug:
-                print 'executing', ' '.join(command)
+                print('executing', ' '.join(command))
 
-            lines = subprocess.check_output(command)
+            lines = check_output(command)
         except subprocess.CalledProcessError:
             sys.stderr.write('Cannot read directory. Is device connected?\n')
             return 1
@@ -485,7 +568,7 @@ class Adb(object):
 
         cmd = [self.conf.adb_command, 'shell', 'rm', dst]
         try:
-            err = subprocess.check_output(cmd)
+            err = check_output(cmd)
         except subprocess.CalledProcessError:
             sys.stderr.write('Error executing adb shell')
             return 1
@@ -503,7 +586,7 @@ class Adb(object):
 
         cmd = [self.conf.adb_command, 'shell', 'rm', '-r', dst]
         try:
-            err = subprocess.check_output(cmd)
+            err = check_output(cmd)
         except subprocess.CalledProcessError:
             sys.stderr.write('Error executing adb shell')
             return 1
@@ -524,7 +607,7 @@ class Adb(object):
 
         cmd = [self.conf.adb_command, 'shell', 'mkdir', dst]
         try:
-            err = subprocess.check_output(cmd)
+            err = check_output(cmd)
         except subprocess.CalledProcessError:
             sys.stderr.write('Error executing adb shell')
             return 1