From 5653b79906d82c1ccd48faa13e485cb7695ea5fa Mon Sep 17 00:00:00 2001
From: suti7yk5032 <yuman1965969@gmail.com>
Date: Thu, 25 Jul 2024 20:02:12 +0900
Subject: [PATCH] =?UTF-8?q?testing=5F2=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81?=
 =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92=E3=83=9E=E3=83=BC=E3=82=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dislocker_client.py | 47 ---------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/dislocker_client.py b/dislocker_client.py
index 9afa1ee..a0230b6 100644
--- a/dislocker_client.py
+++ b/dislocker_client.py
@@ -326,52 +326,6 @@ def master_password_gen():
     return result
 
 
-<<<<<<< HEAD
-config_dir_path = "./config/"
-client_config_path = config_dir_path + "client.json"
-if not os.path.isfile(client_config_path):
-    if not os.path.isdir(config_dir_path):
-        os.mkdir(config_dir_path)
-
-    client_config = {
-        "initial": 1,
-        "auth_host_url": "http://localhost",
-        "pc_number": 1,
-        "master_password_hash": "",
-        "testing": 0
-
-    }
-    with open(client_config_path, "w") as w:
-        json.dump(client_config, w, indent=4)
-elif os.path.isfile(client_config_path):
-    with open(client_config_path, "r") as r:
-        client_config = json.load(r)
-        
-        
-if client_config["initial"] == 1:
-    args = sys.argv
-    if len(args) >= 2:
-        if args[1] == "setup":
-            client_config["pc_number"] = int(args[2])
-        else:
-            print("引数エラー。")
-    master_password = master_password_gen()
-    msgbox = tkinter.messagebox.showinfo(title=f"{app_name} | 初回起動を検出", message=f"初回起動のようです。\nマスターパスワードを記録しておいてください。\nこれ以降二度と表示されることはないでしょう。\n\n{master_password["password"]}\n\nまた、認証先サーバーの接続先を指定してください。ロックを解除できなくなります。")
-    client_config["master_password_hash"] = master_password["password_hash"]
-    client_config["initial"] = 0
-    with open(client_config_path, "w") as w:
-        json.dump(client_config, w, indent=4)
-
-else:
-    if __name__ == '__main__':
-        args = sys.argv
-        if len(args) >= 2:
-            if args[1] == "stop":
-                monitor = Monitor()
-                monitor.signal_handler()
-            else:
-                print("引数エラー。")
-=======
 if __name__ == '__main__':
     args = sys.argv
     if len(args) >= 2:
@@ -385,7 +339,6 @@ if __name__ == '__main__':
     else:
         if client_config["initial"] == 1:
             init()
->>>>>>> testing_2
         else:
             app = App()
             app.protocol("WM_DELETE_WINDOW", app.handler_close)