Fix up `if "http" in ...:` to be more sensible startswiths

5 files changed, 8 insertions, 8 deletions

diff --git a/extensions-builtin/ScuNET/scripts/scunet_model.py b/extensions-builtin/ScuNET/scripts/scunet_model.py
index 2785b551..64f50829 100644
--- a/extensions-builtin/ScuNET/scripts/scunet_model.py
+++ b/extensions-builtin/ScuNET/scripts/scunet_model.py
@@ -27,7 +27,7 @@ class UpscalerScuNET(modules.upscaler.Upscaler):
         scalers = []
         add_model2 = True
         for file in model_paths:
-            if "http" in file:
+            if file.startswith("http"):
                 name = self.model_name
             else:
                 name = modelloader.friendly_name(file)
@@ -118,7 +118,7 @@ class UpscalerScuNET(modules.upscaler.Upscaler):
 
     def load_model(self, path: str):
         device = devices.get_device_for('scunet')
-        if "http" in path:
+        if path.startswith("http"):
             filename = load_file_from_url(self.model_url, model_dir=self.model_download_path, file_name=f"{self.name}.pth")
         else:
             filename = path
diff --git a/extensions-builtin/SwinIR/scripts/swinir_model.py b/extensions-builtin/SwinIR/scripts/swinir_model.py
index a5b0e2eb..4551761d 100644
--- a/extensions-builtin/SwinIR/scripts/swinir_model.py
+++ b/extensions-builtin/SwinIR/scripts/swinir_model.py
@@ -27,7 +27,7 @@ class UpscalerSwinIR(Upscaler):
         scalers = []
         model_files = self.find_models(ext_filter=[".pt", ".pth"])
         for model in model_files:
-            if "http" in model:
+            if model.startswith("http"):
                 name = self.model_name
             else:
                 name = modelloader.friendly_name(model)
@@ -48,7 +48,7 @@ class UpscalerSwinIR(Upscaler):
         return img
 
     def load_model(self, path, scale=4):
-        if "http" in path:
+        if path.startswith("http"):
             filename = modelloader.load_file_from_url(
                 url=path,
                 model_dir=self.model_download_path,
diff --git a/modules/esrgan_model.py b/modules/esrgan_model.py
index f1a98c07..0666a2c2 100644
--- a/modules/esrgan_model.py
+++ b/modules/esrgan_model.py
@@ -133,7 +133,7 @@ class UpscalerESRGAN(Upscaler):
             scaler_data = UpscalerData(self.model_name, self.model_url, self, 4)

             scalers.append(scaler_data)

         for file in model_paths:

-            if "http" in file:

+            if file.startswith("http"):

                 name = self.model_name

             else:

                 name = modelloader.friendly_name(file)

@@ -150,7 +150,7 @@ class UpscalerESRGAN(Upscaler):
         return img

 

     def load_model(self, path: str):

-        if "http" in path:

+        if path.startswith("http"):

             filename = modelloader.load_file_from_url(

                 url=self.model_url,

                 model_dir=self.model_download_path,

diff --git a/modules/gfpgan_model.py b/modules/gfpgan_model.py
index e239a09d..804fb53d 100644
--- a/modules/gfpgan_model.py
+++ b/modules/gfpgan_model.py
@@ -25,7 +25,7 @@ def gfpgann():
         return None

 

     models = modelloader.load_models(model_path, model_url, user_path, ext_filter="GFPGAN")

-    if len(models) == 1 and "http" in models[0]:

+    if len(models) == 1 and models[0].startswith("http"):

         model_file = models[0]

     elif len(models) != 0:

         latest_file = max(models, key=os.path.getctime)

diff --git a/modules/modelloader.py b/modules/modelloader.py
index a69c8a4f..b2f0bb71 100644
--- a/modules/modelloader.py
+++ b/modules/modelloader.py
@@ -82,7 +82,7 @@ def load_models(model_path: str, model_url: str = None, command_path: str = None
 
 
 def friendly_name(file: str):
-    if "http" in file:
+    if file.startswith("http"):
         file = urlparse(file).path
 
     file = os.path.basename(file)