Code cleanup.

README.rst

@@ -1,5 +1,5 @@
 ===================================================
-Midnight Commander virtual filesystem for d64 files
+Midnight Commander virtual filesystem for C64 disks
 ===================================================
 
 This extfs provides an access to disk image files for the Commodore
@@ -10,10 +10,10 @@ made by Commodore.
 Features
 ========
 
-* view, remove, copy files in and out of the image
+* View, remove, copy files in and out of the image,
-* support for read from and write to d64, d71 and d81 images
+* Support for read from and write to d64, d71 and d81 images,
-* gzipped disk images support
+* Gzipped disk images support,
-* onfly characters remapping (see below)
+* On fly characters remapping (see below).
 
 Remarks
 =======
@@ -33,12 +33,12 @@ image. Following rules was applied to represent a single file entry:
 While copying from disk image to filesystem, filenames will be stored as they
 are seen on a listing.
 
-While copying from filesystem to D64 image, filename conversion will be done:
+While copying from filesystem to disk image, filename conversion will be done:
 
 1. Every ``$`` and ``*`` characters will be replaced by question mark (``?``)
 2. Every pipe (``|``) and backslash (``\``) characters will be replaced by
    slash (``/``)
-3. Every tilda (``~``) will be replaced by a space
+3. Every tilde (``~``) will be replaced by a space
 4. ``prg`` extension will be truncated
 
 Representation of a directory can be sometimes confusing - in case when one
@@ -87,6 +87,8 @@ script behaviour:
 Changelog
 =========
 
+* **3.4** Code cleanup. Removed dummy logger class and sys.args based argument
+  parsing.
 * **3.3** Added support for .d71 and .d81 disk images.
 * **3.2** Changed shebang to ``python`` executable instead of ``python3``
 * **3.1** Argparse on Python3 have different behaviour, where if no subcommand

uc1541

@@ -3,22 +3,23 @@
 UC1541 Virtual filesystem
 
 Author: Roman 'gryf' Dobosz <gryf73@gmail.com>
-Date: 2019-09-20
+Date: 2020-06-28
-Version: 3.3
+Version: 3.4
 Licence: BSD
 source: https://bitbucket.org/gryf/uc1541
 mirror: https://github.com/gryf/uc1541
 """
-
+import argparse
-import sys
-import re
-import os
 import gzip
-from subprocess import Popen, PIPE
+import logging
+import os
+import re
+import subprocess
+import sys
 
+
+LOG = logging.getLogger('UC1541')
 if os.getenv('UC1541_DEBUG'):
-    import logging
-    LOG = logging.getLogger('UC1541')
     LOG.setLevel(logging.DEBUG)
     FILE_HANDLER = logging.FileHandler("/tmp/uc1541.log")
     FILE_FORMATTER = logging.Formatter("%(asctime)s %(levelname)-8s "
@@ -26,30 +27,6 @@ if os.getenv('UC1541_DEBUG'):
     FILE_HANDLER.setFormatter(FILE_FORMATTER)
     FILE_HANDLER.setLevel(logging.DEBUG)
     LOG.addHandler(FILE_HANDLER)
-else:
-    class LOG(object):
-        """
-        Dummy logger object. Does nothing.
-        """
-        @classmethod
-        def debug(*args, **kwargs):
-            pass
-
-        @classmethod
-        def info(*args, **kwargs):
-            pass
-
-        @classmethod
-        def warning(*args, **kwargs):
-            pass
-
-        @classmethod
-        def error(*args, **kwargs):
-            pass
-
-        @classmethod
-        def critical(*args, **kwargs):
-            pass
 
 
 SECLEN = 256
@@ -430,11 +407,7 @@ class Uc1541(object):
         """
         LOG.info("Removing file %s", dst)
         dst = self._get_masked_fname(dst)
-
+        return self._call_command('delete', dst=dst)
-        if not self._call_command('delete', dst=dst):
-            return self._show_error()
-
-        return 0
 
     def copyin(self, dst, src):
         """
@@ -442,11 +415,7 @@ class Uc1541(object):
         """
         LOG.info("Copy into D64 %s as %s", src, dst)
         dst = self._correct_fname(dst)
-
+        return self._call_command('write', src=src, dst=dst)
-        if not self._call_command('write', src=src, dst=dst):
-            return self._show_error()
-
-        return 0
 
     def copyout(self, src, dst):
         """
@@ -459,10 +428,7 @@ class Uc1541(object):
 
         src = self._get_masked_fname(src)
 
-        if not self._call_command('read', src=src, dst=dst):
+        return self._call_command('read', src=src, dst=dst)
-            return self._show_error()
-
-        return 0
 
     def mkdir(self, dirname):
         """Not supported"""
@@ -523,8 +489,9 @@ class Uc1541(object):
         uid = os.getuid()
         gid = os.getgid()
 
-        if not self._call_command('list'):
+        res = self._call_command('list')
-            return self._show_error()
+        if res != 0:
+            return res
 
         idx = 0
         for line in self.out.split("\n"):
@@ -593,13 +560,16 @@ class Uc1541(object):
         universal_newlines = True
         if cmd in ['delete', 'write']:
             universal_newlines = False
-        self.out, self.err = Popen(command,
+        (self.out,
-                                   universal_newlines=universal_newlines,
+         self.err) = subprocess.Popen(command,
-                                   stdout=PIPE, stderr=PIPE).communicate()
+                                      universal_newlines=universal_newlines,
+                                      stdout=subprocess.PIPE,
+                                      stderr=subprocess.PIPE).communicate()
 
         if self.err:
             LOG.debug('an err: %s', self.err)
-        return not self.err
+            return self._show_error()
+        return 0
 
 
 CALL_MAP = {'list': lambda a: Uc1541(a.arch).list(),
@@ -612,7 +582,7 @@ CALL_MAP = {'list': lambda a: Uc1541(a.arch).list(),
 
 def parse_args():
     """Use ArgumentParser to check for script arguments and execute."""
-    parser = ArgumentParser()
+    parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers(help='supported commands',
                                        dest='subcommand')
     subparsers.required = True
@@ -659,44 +629,6 @@ def parse_args():
     return args.func(args)
 
 
-def no_parse():
-    """Failsafe argument "parsing". Note, that it blindly takes positional
-    arguments without checking them. In case of wrong arguments it will
-    silently exit"""
-    try:
-        if sys.argv[1] not in ('list', 'copyin', 'copyout', 'rm', 'mkdir',
-                               "run"):
-            sys.exit(2)
-    except IndexError:
-        sys.exit(2)
-
-    class Arg(object):
-        """Mimic argparse object"""
-        dst = None
-        src = None
-        arch = None
-
-    arg = Arg()
-
-    try:
-        arg.arch = sys.argv[2]
-        if sys.argv[1] in ('copyin', 'copyout'):
-            arg.src = sys.argv[3]
-            arg.dst = sys.argv[4]
-        elif sys.argv[1] in ('rm', 'run', 'mkdir'):
-            arg.dst = sys.argv[3]
-    except IndexError:
-        sys.exit(2)
-
-    return CALL_MAP[sys.argv[1]](arg)
-
-
 if __name__ == "__main__":
     LOG.debug("Script params: %s", str(sys.argv))
-    try:
+    sys.exit(parse_args())
-        from argparse import ArgumentParser
-        PARSE_FUNC = parse_args
-    except ImportError:
-        PARSE_FUNC = no_parse
-
-    sys.exit(PARSE_FUNC())