From 973ae2a5e6c259369f62b0b41908ed9469c77a97 Mon Sep 17 00:00:00 2001
From: tretrauit <tretrauit@gmail.com>
Date: Thu, 25 May 2023 13:01:04 +0700
Subject: [PATCH] fix: actually delete files in deletefiles.txt

---
 setup.py               |  2 +-
 worthless/__init__.py  |  2 +-
 worthless/__main__.py  |  0
 worthless/cli.py       |  0
 worthless/installer.py | 11 +++++++----
 5 files changed, 9 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 worthless/__main__.py
 mode change 100755 => 100644 worthless/cli.py

diff --git a/setup.py b/setup.py
index feabdf4..edf5b76 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name='worthless',
-    version='2.2.19',
+    version='2.2.20',
     packages=['worthless', 'worthless.classes', 'worthless.classes.launcher', 'worthless.classes.installer'],
     url='https://git.froggi.es/tretrauit/worthless-launcher',
     license='MIT License',
diff --git a/worthless/__init__.py b/worthless/__init__.py
index f98620a..0043fae 100644
--- a/worthless/__init__.py
+++ b/worthless/__init__.py
@@ -4,4 +4,4 @@ Launcher = launcher.Launcher
 Installer = installer.Installer
 
 
-__version__ = "2.2.19"
+__version__ = "2.2.20"
diff --git a/worthless/__main__.py b/worthless/__main__.py
old mode 100755
new mode 100644
diff --git a/worthless/cli.py b/worthless/cli.py
old mode 100755
new mode 100644
diff --git a/worthless/installer.py b/worthless/installer.py
index c4a1868..ce220f5 100644
--- a/worthless/installer.py
+++ b/worthless/installer.py
@@ -404,14 +404,17 @@ class Installer:
             print(f"Error while reading hdifffiles.txt: {e}")
 
         try:
-            deletefiles = archive.read("deletefiles.txt").decode().split("\n")
+            deletefiles = archive.read("deletefiles.txt").decode().split("\r\n")
             for file in deletefiles:
-                current_game_file = Path(self._gamedir.joinpath(file))
+                current_game_file = Path(self._gamedir).joinpath(file)
                 if current_game_file == Path(self._gamedir):
+                    # Don't delete the game folder
+                    print("Game folder detected, not deleting:", current_game_file)
                     continue
-                if not current_game_file.is_file():
+                if not current_game_file.relative_to(Path(self._gamedir)):
+                    print("Not deleting (not relative to game):", current_game_file)
                     continue
-                print("Deleting ", file)
+                print("Deleting", file)
                 current_game_file.unlink(missing_ok=True)
         except Exception as e:
             print(f"Error while reading deletefiles.txt: {e}")