Ensure pip is installed

bip/t3dn_bip/__init__.py

@@ -1,3 +1,3 @@
 '''Load image previews in parallel and in any resolution. Supports BIP files.'''
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'

bip/t3dn_bip/ops.py

@@ -1,5 +1,5 @@
 import bpy
-from .utils import support_pillow, install_pillow
+from .utils import install_pillow
 
 
 class InstallPillow:
@@ -10,19 +10,16 @@ class InstallPillow:
     -   Make sure to set bl_idname, it must be unique.
     '''
     bl_label = 'Install Pillow'
-    bl_description = 'Install the Python Imaging Library'
+    bl_description = '.\n'.join((
+        'Install the Python Imaging Library',
+        'This could take a few minutes',
+    ))
     bl_options = {'REGISTER', 'INTERNAL'}
 
     def execute(self: bpy.types.Operator, context: bpy.types.Context) -> set:
-        if support_pillow():
-            self.report({'INFO'}, 'Pillow is already installed')
-            return {'CANCELLED'}
-        else:
-            install_pillow()
-
-        if support_pillow():
+        if install_pillow():
             self.report({'INFO'}, 'Pillow was installed successfully')
-            return {'FINISHED'}
         else:
             self.report({'WARNING'}, 'Pillow failed to install')
-            return {'CANCELLED'}
+
+        return {'FINISHED'}

bip/t3dn_bip/utils.py

@@ -24,21 +24,33 @@ def support_pillow() -> bool:
     return bool(Image)
 
 
-def install_pillow():
+def install_pillow() -> bool:
     '''Install Pillow and import the Image module.'''
-    args = [sys.executable, '-m', 'pip', 'install', '--user', 'Pillow']
+    command = [sys.executable, '-m', 'ensurepip']
+    options = ['--user', '--upgrade', '--default-pip']
 
-    if not subprocess.call(args=args, timeout=60):
-        path = Path(USER_SITE).joinpath('PIL', '__init__.py')
+    if subprocess.call(args=command + options, timeout=60 * 10):
+        return False
 
-        spec = importlib.util.spec_from_file_location('PIL', path)
-        module = importlib.util.module_from_spec(spec)
+    command = [sys.executable, '-m', 'pip']
+    options = ['install', '--user', '--upgrade', 'Pillow']
 
-        sys.modules[module.__name__] = module
-        spec.loader.exec_module(module)
+    if subprocess.call(args=command + options, timeout=60 * 10):
+        return False
 
-        global Image
-        from PIL import Image
+    name = 'PIL'
+    path = Path(USER_SITE).joinpath(name, '__init__.py')
+
+    spec = importlib.util.spec_from_file_location(name, path)
+    module = importlib.util.module_from_spec(spec)
+
+    sys.modules[module.__name__] = module
+    spec.loader.exec_module(module)
+
+    global Image
+    from PIL import Image
+
+    return True
 
 
 def can_load(filepath: str) -> bool:

bip_converter/t3dn_bip_converter/__init__.py

@@ -1,3 +1,3 @@
 '''Convert between BIP files and various image formats.'''
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'