Rewrote cli

Author: rayzchen

.gitignore

@@ -7,6 +7,8 @@
 *.egg-info
 build/
 **/.doctrees
+# Only so that we don't upload builds to github
+dist/
 
 # Coverage
 .coverage

cli.py

@@ -1,2 +1,5 @@
+import sys
+sys.argv.append("Test")
+
 from editor.__main__ import main
 main()

editor/app.py

@@ -13,7 +13,7 @@
 
 def testing(string):
     def inner():
-        print(string)
+        Logger.Log(string)
     return inner
 
 class Application(QApplication):
@@ -68,7 +68,7 @@ def start(self):
         self.exec_()
 
     def open(self):
-        print("Choosing folder...")
+        Logger.Log("Choosing folder...")
         # Get opened project
         subprocess.Popen(["py", "cli.py"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         self.quit()

editor/cli.py

@@ -1,9 +1,26 @@
-from .splash import start
+from .splash import start, disable_print
+from time import strftime
+import os
+import sys
 
 def main():
+    if len(sys.argv) < 2:
+        raise ValueError("Please specify a file.")
+    elif not os.path.isdir(sys.argv[1]):
+        raise ValueError("Please specify a valid directory.")
+    
     from .app import Application
-    app = Application("Test")
+    app = Application(sys.argv[1])
     app.start()
 
+def gui():
+    disable_print()
+    os.environ["PYUNITY_DEBUG_MODE"] = "0"
+    from pyunity import Logger
+    directory = os.path.join(os.path.dirname(Logger.folder), "Editor", "Logs")
+    os.makedirs(directory, exist_ok=True)
+    Logger.SetStream(open(os.path.join(directory, strftime("%Y-%m-%d %H-%M-%S") + ".log"), "w+"))
+    start(main)
+
 def run():
     start(main)

editor/files.py

@@ -1,7 +1,7 @@
 from PyQt5.QtCore import QTimer, Qt
 from PyQt5.QtWidgets import QMessageBox
 from PyQt5.QtGui import QFont
-from pyunity import Loader
+from pyunity import Loader, Logger
 import os
 import glob
 import enum
@@ -27,14 +27,14 @@ def check(self):
         files2 = set(glob.glob(os.path.join(self.path, "**/*"), recursive=True))
         for file in self.files:
             if file not in files2:
-                print("Removed " + file)
+                Logger.Log("Removed " + file)
                 self.changed.append((file, FileState.DELETED))
             elif self.times[file] < os.stat(file)[8]:
-                print("Modified " + file)
+                Logger.Log("Modified " + file)
                 self.changed.append((file, FileState.MODIFIED))
                 self.times[file] = os.stat(file)[8]
         for file in files2 - self.files:
-            print("Created " + file)
+            Logger.Log("Created " + file)
             self.changed.append((file, FileState.CREATED))
             self.times[file] = os.stat(file)[8]
         self.files = files2

editor/render.py

@@ -90,7 +90,7 @@ def pause(self, on):
                 self.timer.start(1000 // config.fps)
 
     def save(self):
-        print(self.original.ids)
+        pyu.Logger.Log(self.original.ids)
         pyu.Loader.SaveScene(self.original, self.file_tracker.project)
 
     def on_switch(self):

editor/splash.py

@@ -6,17 +6,15 @@
 import sys
 from PIL import ImageTk, Image
 
-_print = builtins.print
 sys._stderr = sys.stderr
+sys._stdout = sys.stdout
 
 def disable_print():
-    def wrapper(*args, **kwargs):
-        pass
-    builtins.print = wrapper
+    sys.stdout = os.devnull
     sys.stderr = os.devnull
 
 def enable_print():
-    builtins.print = _print
+    sys.stdout = sys._stdout
     sys.stderr = sys._stderr
 
 def splash():

editor/views.py

@@ -103,15 +103,15 @@ def new_sibling(self):
     def remove(self):
         items = self.tree_widget.selectedItems()
         if len(items) == 0:
-            print("Nothing selected")
+            pyu.Logger.Log("Nothing selected")
             return
 
         for item in items:
             item.selectAll()
         items = self.tree_widget.selectedItems()
         self.items = []
         for item in items:
-            print("Removing", item.gameObject.name)
+            pyu.Logger.Log("Removing", item.gameObject.name)
             self.tree_widget.invisibleRootItem().removeChild(item)
             if self.loaded.Has(item.gameObject):
                 self.loaded.Remove(item.gameObject)

setup.py

@@ -1,7 +1,4 @@
-# gui_scripts
-
 from setuptools import setup, find_packages
-import os
 import glob
 
 with open("README.md", "r") as fh:
@@ -37,6 +34,9 @@
     packages= ["editor"] + ["editor." + package for package in find_packages(where="editor")],
     package_data={"editor": [file[7:] for file in data_files]},
     entry_points={
+        # "gui_scripts": [
+        #     "pyunity-editor=editor.cli:gui"
+        # ]
         "console_scripts": [
             "pyunity-editor=editor.cli:run"
         ]

splash.py

@@ -1,3 +1,6 @@
+import sys
+sys.argv.append("Test")
+
 from editor.splash import start
 
 def main():