Fixing conflict

Author: Dids

ProperTree.bat

@@ -24,8 +24,12 @@ goto checkpy
 
 :checkpy
 REM Get python location
-FOR /F "tokens=* USEBACKQ" %%F IN (`where python 2^> nul`) DO (
-    SET "python=%%F"
+set "python="
+FOR /F "tokens=* USEBACKQ" %%F IN (`python -V 2^>^&1`) DO (
+    set "t=%%F"
+    if /i "!t:~0,6!" == "python" (
+        set "python=%%F"
+    )
 )
 
 REM Check for py and give helpful hints!
@@ -174,8 +178,8 @@ exit /b
 REM Python found
 cls
 if "%*"=="" (
-    "!python!" "!thisDir!!script_name!"
+    python "!thisDir!!script_name!"
 ) else (
-    "!python!" "!thisDir!!script_name!" %*
+    python "!thisDir!!script_name!" %*
 )
 goto :EOF

ProperTree.command

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import sys, os, binascii, base64
-import queue, json, ctypes # Fix for pyinstaller failing to bundle dependencies
+import sys, os, binascii, base64, json, re, queue, ctypes
+from collections import OrderedDict
 try:
     import Tkinter as tk
     import ttk
@@ -19,51 +19,59 @@ class ProperTree:
         self.tk = tk.Tk()
         self.tk.title("Convert Values")
         self.tk.minsize(width=640,height=130)
-        self.tk.resizable(False, False)
-        # self.tk.columnconfigure(2,weight=1)
+        self.tk.resizable(True, False)
+        self.tk.columnconfigure(2,weight=1)
+        self.tk.columnconfigure(3,weight=1)
         # Build the Hex <--> Base64 converter
         f_label = tk.Label(self.tk, text="From:")
         f_label.grid(row=0,column=0)
         t_label = tk.Label(self.tk, text="To:")
         t_label.grid(row=1,column=0)
+
         # Setup the from/to option menus
         f_title = tk.StringVar(self.tk)
         t_title = tk.StringVar(self.tk)
         f_title.set("Base64")
         t_title.set("Hex")
-        f_option = tk.OptionMenu(self.tk, f_title, "Ascii", "Base64", "Hex", command=self.change_from_type)
-        t_option = tk.OptionMenu(self.tk, t_title, "Ascii", "Base64", "Hex", command=self.change_to_type)
+        f_option = tk.OptionMenu(self.tk, f_title, "Ascii", "Base64", "Decimal", "Hex", command=self.change_from_type)
+        t_option = tk.OptionMenu(self.tk, t_title, "Ascii", "Base64", "Decimal", "Hex", command=self.change_to_type)
         self.from_type = "Base64"
         self.to_type   = "Hex"
         f_option.grid(row=0,column=1,sticky="we")
         t_option.grid(row=1,column=1,sticky="we")
 
-        self.f_text = tk.Entry(self.tk,width=80)
+        self.f_text = tk.Entry(self.tk)
         self.f_text.delete(0,tk.END)
         self.f_text.insert(0,"")
-        self.f_text.grid(row=0,column=2,sticky="we",padx=10,pady=10)
+        self.f_text.grid(row=0,column=2,columnspan=2,sticky="we",padx=10,pady=10)
 
-        self.t_text = tk.Entry(self.tk,width=80)
+        self.t_text = tk.Entry(self.tk)
         self.t_text.configure(state='normal')
         self.t_text.delete(0,tk.END)
         self.t_text.insert(0,"")
         self.t_text.configure(state='readonly')
-        self.t_text.grid(row=1,column=2,sticky="we",padx=10,pady=10)
+        self.t_text.grid(row=1,column=2,columnspan=2,sticky="we",padx=10,pady=10)
 
         self.c_button = tk.Button(self.tk, text="Convert", command=self.convert_values)
-        self.c_button.grid(row=2,column=2,sticky="e",padx=10,pady=10)
+        self.c_button.grid(row=2,column=3,sticky="e",padx=10,pady=10)
+
+        self.f_text.bind("<Return>", self.convert_values)
+        self.f_text.bind("<KP_Enter>", self.convert_values)
 
-        self.tk.bind("<Return>", self.convert_values)
-        self.tk.bind("<KP_Enter>", self.convert_values)
+        self.start_window = None 
 
-        self.clipboard = None
+        # Regex to find the processor serial numbers when
+        # opened from the Finder
+        self.regexp = re.compile(r"^-psn_[0-9]+_[0-9]+$")
 
         # Setup the menu-related keybinds - and change the app name if needed
         key="Control"
         sign = "Ctr+"
         if str(sys.platform) == "darwin":
             # Remap the quit function to our own
             self.tk.createcommand('::tk::mac::Quit', self.quit)
+            self.tk.createcommand("::tk::mac::OpenDocument", self.open_plist_from_app)
+            self.tk.createcommand("::tk::mac::ReopenApplication", self.open_plist_from_app)
             # Import the needed modules to change the bundle name and force focus
             try:
                 from Foundation import NSBundle
@@ -93,6 +101,7 @@ class ProperTree:
         file_menu.add_command(label="Save ({}S)".format(sign), command=self.save_plist)
         file_menu.add_command(label="Save As ({}Shift+S)".format(sign), command=self.save_plist_as)
         file_menu.add_command(label="Duplicate ({}D)".format(sign), command=self.duplicate_plist)
+        file_menu.add_command(label="Reload From Disk ({}L)".format(sign), command=self.reload_from_disk)
         file_menu.add_separator()
         file_menu.add_command(label="OC Snapshot ({}R)".format(sign), command=self.oc_snapshot)
         file_menu.add_separator()
@@ -107,38 +116,83 @@ class ProperTree:
         self.tk.config(menu=main_menu)
 
         # Set bindings
+        self.tk.bind("<{}-w>".format(key), self.close_window)
         self.tk.bind_all("<{}-n>".format(key), self.new_plist)
         self.tk.bind_all("<{}-o>".format(key), self.open_plist)
         self.tk.bind_all("<{}-s>".format(key), self.save_plist)
         self.tk.bind_all("<{}-S>".format(key), self.save_plist_as)
         self.tk.bind_all("<{}-d>".format(key), self.duplicate_plist)
-        self.tk.bind_all("<{}-c>".format(key), self.copy_selection)
-        self.tk.bind_all("<{}-v>".format(key), self.paste_selection)
         self.tk.bind_all("<{}-t>".format(key), self.show_convert)
         self.tk.bind_all("<{}-z>".format(key), self.undo)
         self.tk.bind_all("<{}-Z>".format(key), self.redo)
         self.tk.bind_all("<{}-m>".format(key), self.strip_comments)
         self.tk.bind_all("<{}-r>".format(key), self.oc_snapshot)
+        self.tk.bind_all("<{}-l>".format(key), self.reload_from_disk)
         if not str(sys.platform) == "darwin":
             # Rewrite the default Command-Q command
             self.tk.bind_all("<{}-q>".format(key), self.quit)
 
+        cwd = os.getcwd()
+        os.chdir(os.path.dirname(os.path.realpath(__file__)))
+        settings = {}
+        try:
+            if os.path.exists("Scripts/settings.json"):
+                settings = json.load(open("Scripts/settings.json"))
+        except:
+            pass
+        self.xcode_data = settings.get("xcode_data",True) # keep <data>xxxx</data> in one line when true
+        self.sort_dict = settings.get("sort_dict",False) # Preserve key ordering in dictionaries when loading/saving
+        os.chdir(cwd)
+
+        # Wait before opening a new document to see if we need to.
+        # This was annoying to debug, but seems to work.
+        self.tk.after(100, lambda:self.check_open(plists))
+
+        # Start our run loop
+        tk.mainloop()
+
+    def check_open(self, plists = []):
+        plists = [x for x in plists if not self.regexp.search(x)]
         if isinstance(plists, list) and len(plists):
-            self.start_window = None
             # Iterate the passed plists and open them
             for p in set(plists):
-                self.open_plist_with_path(None,p,None)
-        else:
+                window = self.open_plist_with_path(None,p,None)
+                if self.start_window == None:
+                    self.start_window = window
+        elif not len(self.stackorder(self.tk)):
             # create a fresh plist to start
             self.start_window = self.new_plist()
 
-        # Start our run loop
-        tk.mainloop()
+    def open_plist_from_app(self, *args):
+        if isinstance(args, str):
+            args = [args]
+        args = [x for x in args if not self.regexp.search(x)]
+        for arg in args:
+            # Let's load the plist
+            if self.start_window == None:
+                self.start_window = self.open_plist_with_path(None,arg,None)
+            elif self.start_window.current_plist == None:
+                self.open_plist_with_path(None,arg,self.start_window)
+            else:
+                self.open_plist_with_path(None,arg,None)
+
+    def change_hd_type(self, value):
+        self.hd_type = value
+
+    def reload_from_disk(self, event = None):
+        windows = self.stackorder(self.tk)
+        if not len(windows):
+            # Nothing to do
+            return
+        window = windows[-1] # Get the last item (most recent)
+        if window == self.tk:
+            return
+        window.reload_from_disk(event)
 
     def change_data_display(self, new_data = None):
         windows = self.stackorder(self.tk)
         if not len(windows):
-            # Nothing to save
+            # Nothing to do
             return
         window = windows[-1] # Get the last item (most recent)
         if window == self.tk:
@@ -148,7 +202,7 @@ class ProperTree:
     def oc_snapshot(self, event = None):
         windows = self.stackorder(self.tk)
         if not len(windows):
-            # Nothing to save
+            # Nothing to do
             return
         window = windows[-1] # Get the last item (most recent)
         if window == self.tk:
@@ -157,10 +211,10 @@ class ProperTree:
 
     def close_window(self, event = None, check_close = True):
         # Remove the default window that comes from it
-        if str(sys.platform) == "darwin":
-            self.tk.iconify()
-        else:
-            self.tk.withdraw()
+        #if str(sys.platform) == "darwin":
+        #    self.tk.iconify()
+        #else:
+        self.tk.withdraw()
         if check_close:
             windows = self.stackorder(self.tk)
             if not len(windows):
@@ -170,7 +224,7 @@ class ProperTree:
     def strip_comments(self, event = None):
         windows = self.stackorder(self.tk)
         if not len(windows):
-            # Nothing to save
+            # Nothing to do
             return
         window = windows[-1] # Get the last item (most recent)
         if window == self.tk:
@@ -196,27 +250,34 @@ class ProperTree:
         if self.from_type.lower() == "hex":
             if from_value.lower().startswith("0x"):
                 from_value = from_value[2:]
-            from_value = from_value.replace(" ","")
+            from_value = from_value.replace(" ","").replace("<","").replace(">","")
             if [x for x in from_value if x.lower() not in "0123456789abcdef"]:
                 self.tk.bell()
                 mb.showerror("Invalid Hex Data","Invalid character in passed hex data.",parent=self.tk)
                 return
         try:
+            if self.from_type.lower() == "decimal":
+                # Convert to hex bytes
+                from_value = "{:x}".format(int(from_value))
+                if len(from_value) % 2:
+                    from_value = "0"+from_value
             # Handle the from data
             if sys.version_info >= (3,0):
                 # Convert to bytes
                 from_value = from_value.encode("utf-8")
             if self.from_type.lower() == "base64":
                 from_value = base64.b64decode(from_value)
-            elif self.from_type.lower() == "hex":
+            elif self.from_type.lower() in ["hex","decimal"]:
                 from_value = binascii.unhexlify(from_value)
             # Let's get the data converted
             to_value = from_value
             if self.to_type.lower() == "base64":
                 to_value = base64.b64encode(from_value)
             elif self.to_type.lower() == "hex":
                 to_value = binascii.hexlify(from_value)
-            if sys.version_info >= (3,0):
+            elif self.to_type.lower() == "decimal":
+                to_value = str(int(binascii.hexlify(from_value),16))
+            if sys.version_info >= (3,0) and not self.to_type.lower() == "decimal":
                 # Convert to bytes
                 to_value = to_value.decode("utf-8")
             if self.to_type.lower() == "hex":
@@ -235,36 +296,10 @@ class ProperTree:
     # Save/Load Plist Functions #
     ###                       ###
 
-    def copy_selection(self, event = None):
-        windows = self.stackorder(self.tk)
-        if not len(windows):
-            # Nothing to save
-            return
-        window = windows[-1] # Get the last item (most recent)
-        if window == self.tk:
-            return
-        node = window._tree.focus()
-        if node == "":
-            # Nothing to copy
-            return
-        self.clipboard = window.nodes_to_values(node,{})
-
-    def paste_selection(self, event = None):
-        if self.clipboard == None:
-            return
-        windows = self.stackorder(self.tk)
-        if not len(windows):
-            # Nothing to save
-            return
-        window = windows[-1] # Get the last item (most recent)
-        if window == self.tk:
-            return
-        window.paste_selection(self.clipboard)
-
     def duplicate_plist(self, event = None):
         windows = self.stackorder(self.tk)
         if not len(windows):
-            # Nothing to save
+            # Nothing to do
             return
         window = windows[-1] # Get the last item (most recent)
         if window == self.tk:
@@ -275,7 +310,7 @@ class ProperTree:
     def save_plist(self, event = None):
         windows = self.stackorder(self.tk)
         if not len(windows):
-            # Nothing to save
+            # Nothing to do
             return
         window = windows[-1] # Get the last item (most recent)
         if window == self.tk:
@@ -285,7 +320,7 @@ class ProperTree:
     def save_plist_as(self, event = None):
         windows = self.stackorder(self.tk)
         if not len(windows):
-            # Nothing to save
+            # Nothing to do
             return
         window = windows[-1] # Get the last item (most recent)
         if window == self.tk:
@@ -295,7 +330,7 @@ class ProperTree:
     def undo(self, event = None):
         windows = self.stackorder(self.tk)
         if not len(windows):
-            # Nothing to save
+            # Nothing to do
             return
         window = windows[-1] # Get the last item (most recent)
         if window == self.tk:
@@ -305,7 +340,7 @@ class ProperTree:
     def redo(self, event = None):
         windows = self.stackorder(self.tk)
         if not len(windows):
-            # Nothing to save
+            # Nothing to do
             return
         window = windows[-1] # Get the last item (most recent)
         if window == self.tk:
@@ -348,10 +383,11 @@ class ProperTree:
         if path == None:
             # Uh... wut?
             return
+        path = os.path.realpath(os.path.expanduser(path))
         # Let's try to load the plist
         try:
             with open(path,"rb") as f:
-                plist_data = plist.load(f)
+                plist_data = plist.load(f,dict_type=dict if self.sort_dict else OrderedDict)
         except Exception as e:
             # Had an issue, throw up a display box
             # print("{}\a".format(str(e)))