Commit 0afbc0c2 authored by Aarni Koskela's avatar Aarni Koskela
Browse files

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

parent 89352a2f

extensions-builtin/ScuNET/scripts/scunet_model.py

+2 −2
Original line number Diff line number Diff line
@@ -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

extensions-builtin/SwinIR/scripts/swinir_model.py

+2 −2
Original line number Diff line number Diff line
@@ -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,

modules/esrgan_model.py

+2 −2
Original line number Diff line number Diff line
@@ -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,

modules/gfpgan_model.py

+1 −1
Original line number Diff line number Diff line
@@ -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)

modules/modelloader.py

+1 −1
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE