From f7215906af573f6e60b006cd430e82691ba4f8d6 Mon Sep 17 00:00:00 2001
From: gmasil <54176035+gmasil@users.noreply.github.com>
Date: Mon, 3 Apr 2023 18:19:57 +0200
Subject: allow styles.csv to be symlinked or mounted in docker without moving
 the file around

---
 modules/styles.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'modules/styles.py')

diff --git a/modules/styles.py b/modules/styles.py
index 990d5623..9ed85991 100644
--- a/modules/styles.py
+++ b/modules/styles.py
@@ -72,16 +72,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, 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)
-- 
cgit v1.2.1


From 3ba6c3c83c0983a025c7bddc08bb7f49481b3cbb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 9 May 2023 22:17:58 +0300
Subject: Fix up string formatting/concatenation to f-strings where feasible

---
 modules/styles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/styles.py')

diff --git a/modules/styles.py b/modules/styles.py
index 9ed85991..11642075 100644
--- a/modules/styles.py
+++ b/modules/styles.py
@@ -74,7 +74,7 @@ class StyleDatabase:
     def save_styles(self, path: str) -> None:
         # Always keep a backup file around
         if os.path.exists(path):
-            shutil.copy(path, path + ".bak")
+            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:
-- 
cgit v1.2.1


From f741a98baccae100fcfb40c017b5c35c5cba1b0c Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 10 May 2023 08:43:42 +0300
Subject: imports cleanup for ruff

---
 modules/styles.py | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'modules/styles.py')

diff --git a/modules/styles.py b/modules/styles.py
index 11642075..c22769cf 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
-- 
cgit v1.2.1


From ad3a7f2ab9bb459ba86bcfb9041c5dbbac7841ee Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 17 May 2023 22:50:08 +0300
Subject: alternative solution to fix styles load when edited by human #9765 as
 suggested by akx

---
 modules/styles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/styles.py')

diff --git a/modules/styles.py b/modules/styles.py
index c22769cf..34e1b5e1 100644
--- a/modules/styles.py
+++ b/modules/styles.py
@@ -43,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"]
-- 
cgit v1.2.1