1 files changed, 6 insertions, 17 deletions

diff --git a/modules/styles.py b/modules/styles.py
index 990d5623..34e1b5e1 100644
--- a/modules/styles.py
+++ b/modules/styles.py
@@ -1,18 +1,9 @@
-# We need this so Python doesn't complain about the unknown StableDiffusionProcessing-typehint at runtime

-from __future__ import annotations

-

 import csv

 import os

 import os.path

 import typing

-import collections.abc as abc

-import tempfile

 import shutil

 

-if typing.TYPE_CHECKING:

-    # Only import this when code is being type-checked, it doesn't have any effect at runtime

-    from .processing import StableDiffusionProcessing

-

 

 class PromptStyle(typing.NamedTuple):

     name: str

@@ -52,7 +43,7 @@ class StyleDatabase:
             return

 

         with open(self.path, "r", encoding="utf-8-sig", newline='') as file:

-            reader = csv.DictReader(file)

+            reader = csv.DictReader(file, skipinitialspace=True)

             for row in reader:

                 # Support loading old CSV format with "name, text"-columns

                 prompt = row["prompt"] if "prompt" in row else row["text"]

@@ -72,16 +63,14 @@ class StyleDatabase:
         return apply_styles_to_prompt(prompt, [self.styles.get(x, self.no_style).negative_prompt for x in styles])

 

     def save_styles(self, path: str) -> None:

-        # Write to temporary file first, so we don't nuke the file if something goes wrong

-        fd, temp_path = tempfile.mkstemp(".csv")

+        # Always keep a backup file around

+        if os.path.exists(path):

+            shutil.copy(path, f"{path}.bak")

+

+        fd = os.open(path, os.O_RDWR|os.O_CREAT)

         with os.fdopen(fd, "w", encoding="utf-8-sig", newline='') as file:

             # _fields is actually part of the public API: typing.NamedTuple is a replacement for collections.NamedTuple,

             # and collections.NamedTuple has explicit documentation for accessing _fields. Same goes for _asdict()

             writer = csv.DictWriter(file, fieldnames=PromptStyle._fields)

             writer.writeheader()

             writer.writerows(style._asdict() for k,     style in self.styles.items())

-

-        # Always keep a backup file around

-        if os.path.exists(path):

-            shutil.move(path, path + ".bak")

-        shutil.move(temp_path, path)