Improve package_io and usage to better handle exceptional cases,

such as a JSON file not being parsable

Author: wbond

package_control/package_disabler.py

@@ -32,10 +32,13 @@ def get_version(self, package):
             The string version
         """
 
-        metadata_json = read_package_file(package, 'package-metadata.json')
-        if metadata_json:
-            metadata = json.loads(metadata_json)
-            return metadata.get('version', 'unknown version')
+        if package_file_exists(package, 'package-metadata.json'):
+            metadata_json = read_package_file(package, 'package-metadata.json')
+            if metadata_json:
+                try:
+                    return json.loads(metadata_json).get('version', 'unknown version')
+                except (ValueError):
+                    pass
 
         return 'unknown version'
 

package_control/package_io.py

@@ -25,12 +25,13 @@ def read_package_file(package, relative_path, binary=False):
         A unicode or byte string (depending on value if binary param) or False on error
     """
 
+    if relative_path is None:
+        return False
+
     package_dir = _get_package_dir(package)
 
-    if os.path.exists(package_dir):
-        result = _read_regular_file(package, relative_path, binary)
-        if result is not False:
-            return result
+    if os.path.exists(package_dir) and _regular_file_exists(package, relative_path):
+        return _read_regular_file(package, relative_path, binary)
 
     if int(sublime.version()) >= 3000:
         result = _read_zip_file(package, relative_path, binary)
@@ -80,12 +81,9 @@ def _get_package_dir(package):
 def _read_regular_file(package, relative_path, binary=False):
     package_dir = _get_package_dir(package)
     file_path = os.path.join(package_dir, relative_path)
-    try:
-        with open_compat(file_path, ('rb' if binary else 'r')) as f:
-            return read_compat(f)
 
-    except (FileNotFoundError):
-        return False
+    with open_compat(file_path, ('rb' if binary else 'r')) as f:
+        return read_compat(f)
 
 
 def _read_zip_file(package, relative_path, binary=False):

package_control/package_manager.py

@@ -160,13 +160,19 @@ def get_metadata(self, package, is_dependency=False):
         if is_dependency:
             metadata_filename = 'dependency-metadata.json'
 
-        try:
+        if package_file_exists(package, metadata_filename):
             metadata_json = read_package_file(package, metadata_filename)
             if metadata_json:
-                return json.loads(metadata_json)
-
-        except (IOError, ValueError):
-            pass
+                try:
+                    return json.loads(metadata_json)
+                except (ValueError):
+                    console_write(
+                        u'''
+                        An error occurred while trying to parse the package
+                        metadata for %s.
+                        ''',
+                        package
+                    )
 
         return {}
 
@@ -182,19 +188,19 @@ def get_dependencies(self, package):
             A list of dependency names
         """
 
-        try:
-            if not package_file_exists(package, 'dependencies.json'):
-                raise ValueError()
-
+        if package_file_exists(package, 'dependencies.json'):
             dep_info_json = read_package_file(package, 'dependencies.json')
-            if not dep_info_json:
-                raise ValueError()
-
-            dep_info = json.loads(dep_info_json)
-            return self.select_dependencies(dep_info)
-
-        except (IOError, ValueError):
-            pass
+            if dep_info_json:
+                try:
+                    return self.select_dependencies(json.loads(dep_info_json))
+                except (ValueError):
+                    console_write(
+                        u'''
+                        An error occurred while trying to parse the
+                        dependencies.json for %s.
+                        ''',
+                        package
+                    )
 
         metadata = self.get_metadata(package)
         if metadata:
@@ -1022,7 +1028,17 @@ def install_package(self, package_name, is_dependency=False):
             if not is_dependency and not have_installed_dependencies:
                 try:
                     dep_info_json = package_zip.read(dependencies_path)
-                    dep_info = json.loads(dep_info_json.decode('utf-8'))
+                    try:
+                        dep_info = json.loads(dep_info_json.decode('utf-8'))
+                    except (ValueError):
+                        console_write(
+                            u'''
+                            An error occurred while trying to parse the
+                            dependencies.json for %s.
+                            ''',
+                            package_name
+                        )
+                        return False
 
                     dependencies = self.select_dependencies(dep_info)
                     if not self.install_dependencies(dependencies):