Linux fixes

Author: timofey260

HK.py

@@ -5,7 +5,7 @@ class HK(Menu):
     def __init__(self, process, openmenu="MN"):
         self.menu = "HK"
         self.m = openmenu
-        self.keys = json.load(open(path2hotkeys / globalsettings["hotkeydescfile"]))
+        self.keys = json.load(open(os.path.join(path2hotkeys, globalsettings["hotkeydescfile"])))
         self.scroll = 0
         self.lines = 0
 
@@ -90,6 +90,6 @@ def goback(self):
 
     def edit(self):
         if islinux:
-            os.system(f"open {path / 'files/hotkeys.json'}")
+            os.system(f"open {os.path.join(path, 'files/hotkeys.json')}")
         else:
-            os.system(f"\"{path / 'hotkeys.json'}\"")
+            os.system(f"\"{os.path.join(path, 'hotkeys.json')}\"")

LE.py

@@ -39,11 +39,11 @@ def __init__(self,process):
         self.images = {True: [], False: []}
 
         for i in globalsettings["shadowimages"]:
-            img = loadimage(path2cast / i)
+            img = loadimage(os.path.join(path2cast, i))
             img.set_colorkey(white)
             self.images[True].append(img)
 
-            img = loadimage(path2cast / i)
+            img = loadimage(os.path.join(path2cast, i))
             arr = pg.pixelarray.PixelArray(img)
             arr.replace(black, red)
             arr.replace(white, black)
@@ -180,7 +180,7 @@ def save(self):
         pg.draw.circle(self.field2.field, black, [0, self.field2.field.get_height()], 1)
         pg.draw.circle(self.field2.field, black, [self.field2.field.get_width(), self.field2.field.get_height()], 1)
         if self.data["path"] == "":
-            if globalsettings["rwefilebrowser"]:
+            if globalsettings["rwefilebrowser"] or islinux:
                 level = self.asksaveasfilename(defaultextension=[".wep"])
             else:
                 level =  filedialog.asksaveasfilename(filetypes=[("World Editor Project", ".wep")],

LevelProcess.py

@@ -2,6 +2,7 @@
 from menuclass import Menu, MenuWithField
 import time
 import requests
+from tkinter import filedialog
 
 
 class ProcessManager:
@@ -13,11 +14,11 @@ def __init__(self):
         self.keys = [pg.K_LCTRL, pg.K_LALT, pg.K_LSHIFT]
         self.movekeys = [pg.K_LEFT, pg.K_UP, pg.K_DOWN, pg.K_RIGHT]
         self.fullscreen = settings["global"]["fullscreen"]
-        loadi = loadimage(path / "load.png")
+        loadi = loadimage(os.path.join(path, "load.png"))
         self.window = pg.display.set_mode(loadi.get_size(), flags=pg.NOFRAME)
         self.window.blit(loadi, [0, 0])
 
-        pg.display.set_icon(loadimage(path / "icon.png"))
+        pg.display.set_icon(loadimage(os.path.join(path, "icon.png")))
         pg.display.flip()
         pg.display.update()
         self.tiles = inittolist(self.window)
@@ -122,7 +123,7 @@ def mainprocessupdate(self):
             self.mainprocess.update()
         except Exception as e:
             # extra save level in case of eny crashes
-            f = open(application_path / "CrashLog.txt", "w")
+            f = open(os.path.join(application_path, "CrashLog.txt"), "w")
             f.write(traceback.format_exc())
             f.write("This is why RWE+ crashed^^^\nSorry")
             saved = False
@@ -245,7 +246,7 @@ def asktoexit(self):
 
     def launchload(self, level):
         if level == -1:
-            self.file = turntoproject(open(path / "default.txt", "r").read())
+            self.file = turntoproject(open(os.path.join(path, "default.txt"), "r").read())
             self.file["level"] = ""
             self.file["path"] = ""
             self.file["dir"] = ""
@@ -314,7 +315,7 @@ def recievemessage(self, message):
             case "new":
                 self.__init__(self.manager, -1)
             case "openNewProcess":
-                if globalsettings["rwefilebrowser"]:
+                if globalsettings["rwefilebrowser"] or islinux:
                     file = self.menu.asksaveasfilename(defaultextension=[".txt", ".wep"])
                 else:
                     file = filedialog.askopenfilename(initialdir=path2levels,
@@ -324,7 +325,7 @@ def recievemessage(self, message):
                 if file is not None and os.path.exists(file):
                     self.manager.newprocess(file)
             case "open":
-                if globalsettings["rwefilebrowser"]:
+                if globalsettings["rwefilebrowser"] or islinux:
                     file = self.menu.asksaveasfilename(defaultextension=[".txt", ".wep"])
                 else:
                     file = filedialog.askopenfilename(initialdir=path2levels,

MN.py

@@ -6,7 +6,7 @@
 class MN(MenuWithField):
     def __init__(self, process):
         super().__init__(process, "MN")
-        tips = set(open(path / "tips.txt", "r").readlines())
+        tips = set(open(os.path.join(path, "tips.txt"), "r").readlines())
         self.tips = list(tips)
         self.mousp = True
         self.mousp1 = True

TE.py

@@ -41,15 +41,15 @@ def __init__(self, process):
 
         self.items: ItemData = process.renderer.tiles
         self.codes = {}
-        p: dict = jsonc.load(open(path / "patterns.json", "r"))
+        p: dict = jsonc.load(open(os.path.join(path, "patterns.json"), "r"))
         if "special" not in self.items.categories:
             self.items.append({"name": "special", "color": black, "items": p["patterns"]})
             for indx, pattern in enumerate(p["patterns"]):
                 self.items[-1]["items"][indx]["cat"] = [len(self.items), indx + 1]
 
                 # loading code presets
                 for pat in pattern.get("codenames", []):
-                    self.codes[pat] = open(path2patterns / pat, "r").read()
+                    self.codes[pat] = open(os.path.join(path2patterns, pat), "r").read()
         self.blocks = p["blocks"]
         self.brushmode = False
         self.squarebrush = False

files.py

@@ -6,15 +6,15 @@
 import sys
 import math
 import time
-from tkinter import filedialog
+
 import jsonc  # it's so fucking dumb that i use 3 json libraries in this project why
-from pathlib import Path
 
 # determine if application is a script file or frozen exe
+
 if getattr(sys, 'frozen', False):
-    application_path = Path(os.path.dirname(sys.executable))
+    application_path = os.path.dirname(sys.executable)
 else:
-    application_path = Path(os.path.dirname(__file__))
+    application_path = os.path.dirname(__file__)
 
 islinux = os.name == "posix"
 
@@ -23,7 +23,8 @@ def resolvepath(input_path):  # Thanks to someone... someone nice
     # returning function back for compatibility
     if not islinux:
         return str(input_path)
-    path = input_path.replace("\\", "/")
+    #path = input_path.replace("\\", "/")
+    path = input_path
     if os.path.isdir(path):
         return path
     directory, filename = os.path.split(path)
@@ -36,49 +37,49 @@ def resolvepath(input_path):  # Thanks to someone... someone nice
 
 allleters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.,- =+_*()[]{}#@"
 
-path = application_path / "files"
-path2favs = path / "favourites"
-path2tutorial = path / "tutorial"
-path2ui = path / "ui"
-path2graphics = application_path / "drizzle" / "Data" / "Graphics"
-path2cast = application_path / "drizzle" / "Data" / "Cast"
-path2renderedlevels = application_path / "drizzle" / "Data" / "Levels"
-path2props = application_path / "drizzle" / "Data" / "Props"
-path2levels = application_path / "LevelEditorProjects"
-path2hotkeys = path  /"hotkeys"
-
-path2effectPreviews = path / "effectPreviews"
-path2materialPreviews = path / "materialPreviews"
-path2patterns = path / "patternScripts"
-path2gifs = path / "gifs"
+path = os.path.join(application_path, "files")
+path2favs = os.path.join(path, "favourites")
+path2tutorial = os.path.join(path, "tutorial")
+path2ui = os.path.join(path, "ui")
+path2graphics = os.path.join(application_path,  "drizzle",  "Data", "Graphics")
+path2cast = os.path.join(application_path, "drizzle", "Data", "Cast")
+path2renderedlevels = os.path.join(application_path, "drizzle", "Data", "Levels")
+path2props = os.path.join(application_path, "drizzle", "Data", "Props")
+path2levels = os.path.join(application_path, "LevelEditorProjects")
+path2hotkeys = os.path.join(path, "hotkeys")
+
+path2effectPreviews = os.path.join(path, "effectPreviews")
+path2materialPreviews = os.path.join(path, "materialPreviews")
+path2patterns = os.path.join(path, "patternScripts")
+path2gifs = os.path.join(path, "gifs")
 
 pg.font.init()
 
-globalsettings : dict = jsonc.load(open(path / "settings.json", "r"))
-settings: dict = jsonc.load(open(path2ui / globalsettings["uifile"], "r"))
-hotkeys: dict = jsonc.load(open(path2hotkeys / globalsettings["hotkeyfile"], "r"))
-e = jsonc.load(open(path / "effects.json", "r"))
+globalsettings: dict = jsonc.load(open(os.path.join(path, "settings.json"), "r"))
+settings: dict = jsonc.load(open(os.path.join(path2ui, globalsettings["uifile"]), "r"))
+hotkeys: dict = jsonc.load(open(os.path.join(path2hotkeys, globalsettings["hotkeyfile"]), "r"))
+e = jsonc.load(open(os.path.join(path, "effects.json"), "r"))
 
 
 def loadimage(filepath):
-    if filepath != path / globalsettings["godimage"] and globalsettings["godmode"]:
+    if filepath != os.path.join(path, globalsettings["godimage"]) and globalsettings["godmode"]:
         global god
         return god
     if not os.path.exists(filepath):
         newpath = resolvepath(filepath)
         if newpath is not None:
             return pg.image.load(newpath)
-        raise FileNotFoundError(f"Image by path {os.path.relpath(path.absolute(), application_path.absolute())} does not exist", path)
+        raise FileNotFoundError(f"Image by path {os.path.relpath(path, application_path)} does not exist", path)
     return pg.image.load(filepath)
 
 
-god = loadimage(path / globalsettings["godimage"])
+god = loadimage(os.path.join(path, globalsettings["godimage"]))
 if god is None:
     raise Exception("how dare you")
 godres = pg.Surface([0, 0])
 
-tooltiles = loadimage(path / globalsettings["tooltiles"])
-toolmenu = loadimage(path / globalsettings["toolmenu"])
+tooltiles = loadimage(os.path.join(path, globalsettings["tooltiles"]))
+toolmenu = loadimage(os.path.join(path, globalsettings["toolmenu"]))
 
 load_error_count = 0
 
@@ -161,7 +162,7 @@ def fs(sz) -> list[pg.font.Font, int]:
     if sz in fonts.keys():
         return fonts[sz]
     else:
-        f = pg.font.Font(path / settings["global"]["font"], sz)
+        f = pg.font.Font(os.path.join(path, settings["global"]["font"]), sz)
         fonts[sz] = [f, f.size(allleters)[1]]
         return fonts[sz]
 
@@ -285,7 +286,7 @@ def tutorial():
 
 def log_to_load_log(message, error=False, nl=True):
     global load_error_count
-    with open(application_path / "loadLog.txt", "a") as load_log:
+    with open(os.path.join(application_path, "loadLog.txt"), "a") as load_log:
         load_log.write(f"{'[ERROR]: ' if error else ''}{message}")
         if nl:
             load_log.write("\n")

lingotojson.py

@@ -11,7 +11,7 @@
 from files import *
 import math
 
-notfound = loadimage(path / "notfound.png")
+notfound = loadimage(os.path.join(path, "notfound.png"))
 notfound.set_colorkey(pg.Color(255, 255, 255))
 notfoundtile = {
     "name": "unloaded tile",
@@ -26,7 +26,7 @@
     "cat": [1, 1],
     "tags": [""]
 }
-defaultlevel = open(path / "default.txt", "r").readlines()
+defaultlevel = open(os.path.join(path, "default.txt"), "r").readlines()
 
 
 def tojson(string: str, replacement: str = None):
@@ -245,10 +245,10 @@ def printmessage(message):
         window.blit(surf, [0, 0])
         pg.display.update()
     inv = settings["TE"]["LEtiles"]
-    tilefiles = [path2graphics / i for i in globalsettings["tileinits"]]
+    tilefiles = [os.path.join(path2graphics, i) for i in globalsettings["tileinits"]]
     solved = init_solve(tilefiles)
     solved_copy = copy.deepcopy(solved)
-    f = pg.font.Font(path / settings["global"]["font"], 20)
+    f = pg.font.Font(os.path.join(path, settings["global"]["font"]), 20)
     for catnum, catitem in enumerate(solved.data):
         cat = catitem["name"]
 
@@ -258,7 +258,7 @@ def printmessage(message):
         for indx, item in enumerate(items):
             printmessage(f"Loading tile {item['nm']}...")
             try:
-                img = loadimage(f"{path2graphics / item['nm']}.png")
+                img = loadimage(f"{os.path.join(path2graphics, item['nm'])}.png")
             except FileNotFoundError:
                 continue
             sz = toarr(item["sz"], "point")
@@ -331,7 +331,7 @@ def printmessage(message):
         ms = globalsettings["matsize"]
         pg.draw.rect(img, v, pg.Rect(ms[0], ms[0], ms[1], ms[1]))
         try:
-            preview = loadimage(path2materialPreviews / (k + ".png"))
+            preview = loadimage(os.path.join(path2materialPreviews, (k + ".png")))
         except FileNotFoundError:
             preview = pg.Surface([image1size, image1size])
             preview.set_alpha(0)
@@ -369,7 +369,7 @@ def renderlevel(data):
     # subprocess.Popen([f"{application_path}/drizzle/Drizzle.ConsoleApp{'' if islinux else '.exe'}", "render", fl], shell=True)
     p = multiprocessing.Process(target=renderlevelProccess, args=(f"{application_path}/drizzle/Drizzle.ConsoleApp{'' if islinux else '.exe'} render \"{fl}\"", ))
     pickedgif = random.choice(list(globalsettings["rendergifimages"].keys()))
-    theimage = loadimage(path2gifs / pickedgif)
+    theimage = loadimage(os.path.join(path2gifs, pickedgif))
     fontr: pg.font.Font = fs(30)[0]
     text = fontr.render(settings["global"].get("renderingscugtext", "wendewing level :3 Esc to cancel"), True, pg.Color(255, 255, 255), None)
     frame = 0
@@ -412,7 +412,7 @@ def renderlevelProccess(data):
 
 
 def getcolors():
-    solved = open(application_path / "drizzle" / "Data" / "Props" / "propColors.txt", 'r').readlines()
+    solved = open(os.path.join(application_path, "drizzle", "Data", "Props", "propColors.txt"), 'r').readlines()
     cols = []
     for line in solved:
         if line[0] != '[':
@@ -487,19 +487,19 @@ def printmessage(message):
         pg.draw.rect(window, pg.color.THECOLORS["black"], [0, 0, window.get_width(), surf.get_height()])
         window.blit(surf, [0, 0])
         pg.display.update()
-    propfiles = [path2props / i for i in globalsettings["propinits"]]
-    propfiles.append(path / "additionprops.txt")
+    propfiles = [os.path.join(path2props, i) for i in globalsettings["propinits"]]
+    propfiles.append(os.path.join(path, "additionprops.txt"))
     solved = init_solve(propfiles)
     solved_copy = copy.deepcopy(solved)
-    f = pg.font.Font(path / settings["global"]["font"], 20)
+    f = pg.font.Font(os.path.join(path, settings["global"]["font"]), 20)
     for catnum, catitem in enumerate(solved.data):
         items = catitem["items"]
         colr = catitem["color"]
         solved_copy[catnum]["items"] = []
         for indx, item in enumerate(items):
             printmessage(f"Loading prop {item['nm']}...")
             try:
-                img = loadimage(path2props / f"{item['nm']}.png")
+                img = loadimage(f"{os.path.join(path2props, item['nm'])}.png")
                 images = addprop(item, img)
                 newitem = solved[catnum]["items"][indx]
                 newitem["images"] = images
@@ -548,7 +548,7 @@ def printmessage(message):
                 returnimage = pg.Surface(size)
                 returnimage.fill(pg.Color(255, 255, 255))
                 try:
-                    img = loadimage(path2graphics / (tile["nm"] + ".png"))
+                    img = loadimage(os.path.join(path2graphics, (tile["nm"] + ".png")))
                 except:
                     img = pg.transform.scale(notfound, size)
                     returnimage.blit(pg.transform.scale(notfound, size), [0, 0])
@@ -600,7 +600,7 @@ def solveeffects(effects):
             if "options" not in d:
                 d["options"] = []
             if "preview" in d:
-                d["preview"] = loadimage(path2effectPreviews / f"{d['preview']}.png")
+                d["preview"] = loadimage(os.path.join(path2effectPreviews, f"{d['preview']}.png"))
             for i in effects["defaultparams"]:
                 d["options"].append(i)
             for indx, option in enumerate(d["options"]):

main.py

@@ -1,11 +1,12 @@
 import multiprocessing
+import os
 
 if __name__ == "__main__":
     import argparse
     from LevelProcess import *
 
     widgets.keybol = True
-    open(application_path / "loadLog.txt", "w")
+    open(os.path.join(application_path, "loadLog.txt"), "w")
     multiprocessing.freeze_support()
     manager = ProcessManager()
     parser = argparse.ArgumentParser(prog="RWE+ console", description="Maybe a better, than official LE.\n"