From 5b8bf0da3117f9c5c966d26094618283cfabfd53 Mon Sep 17 00:00:00 2001
From: Daniel Dolezal <d.dolezal97@protonmail.com>
Date: Mon, 6 May 2024 09:13:43 +0200
Subject: [PATCH] move storage classes into server folder and fix error in
 localStorage when winner_snake is none

---
 server/Server.py                                  | 2 +-
 {statestorage => server/storage}/EdgeDB.py        | 0
 {statestorage => server/storage}/LocalStorage.py  | 2 +-
 {statestorage => server/storage}/StorageLoader.py | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {statestorage => server/storage}/EdgeDB.py (100%)
 rename {statestorage => server/storage}/LocalStorage.py (95%)
 rename {statestorage => server/storage}/StorageLoader.py (62%)

diff --git a/server/Server.py b/server/Server.py
index 134ae38..866eef0 100644
--- a/server/Server.py
+++ b/server/Server.py
@@ -2,7 +2,7 @@ from server.Files import read_file
 from server.GameBoard import GameBoard
 from server.SnakeBuilder import SnakeBuilder
 
-from statestorage.StorageLoader import StorageLoader
+from server.storage.StorageLoader import StorageLoader
 
 from flask import Flask
 from flask import request
diff --git a/statestorage/EdgeDB.py b/server/storage/EdgeDB.py
similarity index 100%
rename from statestorage/EdgeDB.py
rename to server/storage/EdgeDB.py
diff --git a/statestorage/LocalStorage.py b/server/storage/LocalStorage.py
similarity index 95%
rename from statestorage/LocalStorage.py
rename to server/storage/LocalStorage.py
index 5d0f360..02839aa 100644
--- a/statestorage/LocalStorage.py
+++ b/server/storage/LocalStorage.py
@@ -35,7 +35,7 @@ class LocalStorage:
       f"{game_board.snake_class.__class__.__name__}_{game_board.now_date.strftime('%H-%M-%S')}_{game_board.id}.json",
       game_type["name"],
       game_type["is_ladder"],
-      True if "me" in game_board.winner_snake_names else False
+      True if game_board.winner_snake_names and "me" in game_board.winner_snake_names else False
     )
 
     save_file(save_file_path, {
diff --git a/statestorage/StorageLoader.py b/server/storage/StorageLoader.py
similarity index 62%
rename from statestorage/StorageLoader.py
rename to server/storage/StorageLoader.py
index 20b4c3b..c31f962 100644
--- a/statestorage/StorageLoader.py
+++ b/server/storage/StorageLoader.py
@@ -2,6 +2,6 @@
 class StorageLoader:
   @classmethod
   def build(self, selected_storage:str):
-    storage_module = __import__(f'statestorage.{selected_storage}', fromlist=[selected_storage])
+    storage_module = __import__(f'server.storage.{selected_storage}', fromlist=[selected_storage])
     storage_class = getattr(storage_module, selected_storage)
     return storage_class