made install_from_bytes separate

pymobiledevice3/services/installation_proxy.py

@@ -100,13 +100,13 @@ def send_cmd_for_bundle_identifier(self, bundle_identifier: str, cmd: str = 'Arc
         self.service.send_plist(cmd)
         self._watch_completion(handler, *args)
 
-    def install(self, package: Union[str, bytes], options: Optional[dict] = None, handler: Callable = None, *args) -> None:
+    def install(self, package: str, options: Optional[dict] = None, handler: Callable = None, *args) -> None:
         """ install given ipa/ipcc from device path """
-        self.install_package(package, 'Install', options, handler, args)
+        self.install_from_local(package, 'Install', options, handler, args)
 
-    def upgrade(self, ipa_path: Union[str, bytes], options: Optional[dict] = None, handler: Callable = None, *args) -> None:
+    def upgrade(self, ipa_path: str, options: Optional[dict] = None, handler: Callable = None, *args) -> None:
         """ upgrade given ipa from device path """
-        self.install_package(ipa_path, 'Upgrade', options, handler, args)
+        self.install_from_local(ipa_path, 'Upgrade', options, handler, args)
 
     def restore(self, bundle_identifier: str, options: Optional[dict] = None, handler: Callable = None, *args) -> None:
         """ no longer supported on newer iOS versions """
@@ -117,20 +117,14 @@ def uninstall(self, bundle_identifier: str, options: Optional[dict] = None, hand
         """ uninstall given bundle_identifier """
         self.send_cmd_for_bundle_identifier(bundle_identifier, 'Uninstall', options, handler, args)
 
-    def install_package(self, package: Union[str, bytes], cmd: str = 'Install', options: Optional[dict] = None,
-                        handler: Callable = None, *args) -> None:
-        """ upload given ipa/ipcc onto device and install it """
+    def install_from_bytes(self, package_bytes: bytes, cmd: str = 'Install', options: Optional[dict] = None,
+                           handler: Callable = None, *args) -> None:
+        """ upload given ipa/ipcc bytes object onto device and install it """
+        ipcc_mode = classify_zip_file(package_bytes) == 'ipcc'
+
         if options is None:
             options = {}
 
-        if isinstance(package, str):
-            self.install_from_local(package, cmd, options, handler, *args)
-        elif isinstance(package, bytes):
-            self.install_from_bytes(package, cmd, options, handler, *args)
-
-    def install_from_bytes(self, package_bytes: bytes, cmd: str, options: Optional[dict], handler: Callable, *args) -> None:
-        ipcc_mode = classify_zip_file(package_bytes) == 'ipcc'
-
         if ipcc_mode:
             options['PackageType'] = 'CarrierBundle'
 
@@ -144,11 +138,17 @@ def install_from_bytes(self, package_bytes: bytes, cmd: str, options: Optional[d
         self.send_package(cmd, options, handler, ipcc_mode, *args)
 
     @str_to_path('package_path')
-    def install_from_local(self, package_path: Path, cmd: str, options: Optional[dict], handler: Callable, *args) -> None:
+    def install_from_local(self, package_path: Path, cmd: str = 'Install', options: Optional[dict] = None,
+                           handler: Callable = None, *args) -> None:
+        """ upload given ipa/ipcc onto device and install it """
         ipcc_mode = package_path.suffix == '.ipcc'
 
+        if options is None:
+            options = {}
+
         if ipcc_mode:
             options['PackageType'] = 'CarrierBundle'
+
         else:
             if package_path.is_dir():
                 # treat as app, convert into an ipa