Implemented better update process

- Fixed small issue with recent files menu not working correctly.
- Removed optional update feature. (Now you can update securely if you want to or don't want to)
- Need to change what is returned if the hash is incorrect. (Need to emulate real keys to make it harder to figure out if it's fake)
- Moved around some variables to make program run more efficiently if used in update mode.
- Installer no longer asks for user's input when updating as it takes it automagically from the old version.
- File removal now happens closer to when it's created to not cause any issues of files being removed but not created.
- Renamed some intermediate files to conform better.
- Now the installer creates a desktop shortcut and a Start Menu shortcut for Windows!
- There's a new beta version of the program for the people who want to live on the bleeding-edge.
- All files now have Linux-friendly python interpreter code at the top so that it runs better.

Author: WhenLifeHandsYouLemons

Encryptext.pyw

@@ -1,3 +1,5 @@
+#!/usr/bin/python'
+
 # Created by Sooraj S
 # https://encryptext.sooraj.dev
 # Free for everyone. Forever.
@@ -31,8 +33,28 @@ def getTrueFilename(filename):
     return join(base, filename)
 
 debug = False
-# UPDATE MODE HERE
-update = False# UPDATE MODE HERE
+
+# ENCRYPTION KEY HERE
+encrypt_key = b''# ENCRYPTION KEY HERE
+
+# Uses random random-length strings of characters to determine where formatting starts and stops# FORMAT ITEM SEPARATOR HERE
+format_item_separator = ''# FORMAT ITEM SEPARATOR HERE# FORMAT SEPARATOR HERE
+format_separator = ''# FORMAT SEPARATOR HERE# FORMAT STRING HERE
+format_string = ''# FORMAT STRING HERE
+
+# HASH STRING HERE
+hash_str = ''# HASH STRING HERE
+
+def updateMode() -> tuple:
+    return (format_item_separator, format_separator, format_string, encrypt_key)
+
+arguments = sys.argv
+if len(arguments) == 2 and arguments[1] == hash_str:
+    print(updateMode())
+    sys.exit(0)
+elif len(arguments) == 2:
+    print((Fernet.generate_key().decode(), Fernet.generate_key().decode(), Fernet.generate_key().decode(), Fernet.generate_key().decode()))
+    sys.exit(0)
 
 try:
     settings_path = join(expanduser("~"), ".encryptext", "settings.json")
@@ -287,22 +309,6 @@ check_button_style.configure("TCheckbutton", font=(settings["otherSettings"]["fo
 
 recent_files = settings["recentFilePaths"]
 
-# Uses random random-length strings of characters to determine where formatting starts and stops# FORMAT ITEM SEPARATOR HERE
-format_item_separator = ''# FORMAT ITEM SEPARATOR HERE# FORMAT SEPARATOR HERE
-format_separator = ''# FORMAT SEPARATOR HERE# FORMAT STRING HERE
-format_string = ''# FORMAT STRING HERE
-
-# HASH STRING HERE
-hash_str = ''# HASH STRING HERE
-
-def updateMode() -> tuple:
-    return (format_item_separator, format_separator, format_string)
-
-arguments = sys.argv()
-if arguments[0] == 1 and arguments[1] == hash_str:
-    updateMode()
-    exit()
-
 supported_file_types = [
     ("Accepted Files", "*.etx *.md *.txt *.py *.html *.css *.js *.json *.csv *.ini *.log"),
     ("Encrypted File", "*.etx"),
@@ -318,8 +324,6 @@ supported_file_types = [
     ("Log File", "*.log"),
     ("All Files", "*.*")
 ]
-# ENCRYPTION KEY HERE
-encrypt_key = b''# ENCRYPTION KEY HERE
 
 # For debug purposes, set static key and separators
 if debug:
@@ -1299,7 +1303,7 @@ def createMenuBar():
     if len(recent_files) == 0:
         state = "disabled"
     else:
-        state = "enabled"
+        state = "normal"
     filemenu.add_cascade(label="Open Recent", menu=recentfilemenu, state=state)
     filemenu.add_command(label="View File", command=viewFile)
     filemenu.add_separator()
@@ -1343,8 +1347,7 @@ def createMenuBar():
     textstylemenu.add_command(label="Bold", accelerator="Ctrl+B", command=changeToBold)
     textstylemenu.add_command(label="Italic", accelerator="Ctrl+I", command=changeToItalic)
 
-    if update:
-        helpmenu.add_command(label="Update Encryptext", command=updateMenu)
+    helpmenu.add_command(label="Update Encryptext", command=updateMenu)
 
     helpmenu.add_command(label="About Encryptext", command=aboutMenu)
     helpmenu.add_command(label="Encryptext on GitHub", command=documentation)

encryptext_installer.py

@@ -1,7 +1,9 @@
-from os import rename, remove, rmdir, makedirs, path, environ
+#!/usr/bin/python'
+
+from os import rename, remove, rmdir, makedirs, listdir, path, environ
 from shutil import rmtree
 import sys
-from subprocess import run
+from subprocess import run, PIPE
 from time import sleep
 import json
 from cryptography.fernet import Fernet as F
@@ -29,7 +31,7 @@ def getTrueFilename(filename):
 
 # Creates an executable file
 def appCreation():
-    file_path = path.join(dir_path, "Encryptext-User.pyw")
+    file_path = path.join(dir_path, f"encryptext_v{version}.pyw")
     icon_path = getTrueFilename("app_icon.ico")
     # Fix for tkinterweb not working
     # https://github.com/pyinstaller/pyinstaller/issues/6658#issuecomment-1062817361
@@ -51,7 +53,7 @@ def appCreation():
                 "--add-data",
                 f"{icon_path};.",
                 "--name",
-                "Encryptext",
+                "encryptext",
                 "--collect-all",
                 "tkinterweb",
                 "--exclude-module",
@@ -116,29 +118,10 @@ def progress_bar(percent_done):
 while update != "u" and update != "i":
     update = input("\nAre you updating or installing Encryptext? [(u)pdating/(i)nstalling] ")
 
-need_update = input("\nDo you want to be able to update Encryptext in the future?\nNOTE: This lowers the security but allows you to update Encryptext to get new features and not lose your encrypted files. [(y)es/(n)o] ")
-while need_update != "y" and need_update != "n":
-    need_update = input("\nDo you want to be able to update Encryptext in the future?\nNOTE: This lowers the security but allows you to update Encryptext to get new features and not lose your encrypted files. [(y)es/(n)o] ")
-
-# Open the Encryptext.py file and read it into a variable
+# Open the Encryptext.pyw file and read it into a variable
 file = open(getTrueFilename("Encryptext.pyw"), "r", encoding="utf8")
 file = file.read()
-
-# Find where the update mode is stored in the file
-file = file.split("# UPDATE MODE HERE")
-
-if need_update == "y":
-    # Set the update option to true
-    option = True
-else:
-    option = False
-
-# Add the option to the file
-file[1] = f"update = {option}"
-
-text = "".join(file)
-
-print("\nUpdate option set!")
+text = file
 
 # Adds computed hash to file
 hash_str = "INSERT COMPUTED HASH HERE"
@@ -150,10 +133,16 @@ def progress_bar(percent_done):
 text = "".join(file)
 
 # Communicate to old program
+return_attributes = ""
 if update == "u":
-    print("\n\nPlease open the current version of Encryptext you have.")
-    print("In the menu bar at the top, click on 'Help'. Then click on 'Update Encryptext'.\n")
-    sleep(5)
+    try:
+        exe_files = [f for f in listdir(dir_path) if f.endswith('.exe')]
+        return_attributes = run([f"{path.join(dir_path, exe_files[0])}", hash_str], stdout=PIPE)
+        return_attributes = return_attributes.stdout.decode().split("(")[-1].split(")")[0].split(", ")
+    except IndexError:
+        raise Exception("Encryptext hasn't been installed before! Please install the program before trying to update.")
+    except:
+        raise Exception("Something went wrong! Please try again or file a crash report on GitHub.")
 
 # Find where the encryption key is stored in the file
 file = text.split("# ENCRYPTION KEY HERE")
@@ -162,10 +151,7 @@ def progress_bar(percent_done):
     # Create a key and remove the b'' from the string
     key = F.generate_key().decode()
 else:
-    key = str(input("\nPlease enter the Encryption Key (be careful to not add the spaces, just the text):"))
-    while len(key) != 44 and key[-1] != "=":
-        key = str(input("\nYou haven't entered the key correctly. Please enter the 'Encryption Key' (be careful to not add the spaces, just the text):"))
-    print()
+    key = str(return_attributes[3].split("'")[1])
 
 # Add the key to the file
 key_line = file[1]
@@ -187,9 +173,7 @@ def progress_bar(percent_done):
     # Create a format item separator string
     format_item_separator = "".join([choice(possible_characters) for i in range(randint(15, 45))])
 else:
-    format_item_separator = str(input("\nPlease enter the Format Item Separator (be careful to not add the spaces, just the text):"))
-    while len(format_item_separator) < 15:
-        format_item_separator = str(input("\nYou haven't entered the string correctly. Please enter the 'Format Item Separator' (be careful to not add the spaces, just the text):"))
+    format_item_separator = str(return_attributes[0].split("'")[1])
 
 # Add the format item separator string to the file
 key_line = file[1]
@@ -207,9 +191,7 @@ def progress_bar(percent_done):
     # Create a format separator string
     format_separator = "".join([choice(possible_characters) for i in range(randint(15, 45))])
 else:
-    format_separator = str(input("\nPlease enter the Format Separator String (be careful to not add the spaces, just the text):"))
-    while len(format_separator) < 15:
-        format_separator = str(input("\nYou haven't entered the string correctly. Please enter the 'Format Separator String' (be careful to not add the spaces, just the text):"))
+    format_separator = str(return_attributes[1].split("'")[1])
 
 # Add the format separator string to the file
 key_line = file[1]
@@ -227,10 +209,7 @@ def progress_bar(percent_done):
     # Create a format string
     format_string = "".join([choice(possible_characters) for i in range(randint(15, 45))])
 else:
-    format_string = str(input("\nPlease enter the Format String (be careful to not add the spaces, just the text):"))
-    while len(format_string) < 15:
-        format_string = str(input("\nYou haven't entered the string correctly. Please enter the 'Format String' (be careful to not add the spaces, just the text):"))
-    print()
+    format_string = str(return_attributes[2].split("'")[1])
 
 # Add the format string to the file
 key_line = file[1]
@@ -243,15 +222,6 @@ def progress_bar(percent_done):
 
 print("Format strings set!")
 
-# Removes the install files from any previous installations to not cause issues
-try:
-    remove(path.join(dir_path, f"Encryptext_v{version}.exe"))
-    remove(path.join(dir_path, "Encryptext.spec"))
-    remove(path.join(dir_path, "Encryptext-User.pyw"))
-    rmdir(path.join(dir_path, "dist"))
-    rmdir(path.join(dir_path, "build"))
-except: pass
-
 # Get the current user's home directory
 settings_file_path = path.join(dir_path, "settings.json")
 
@@ -313,12 +283,25 @@ def progress_bar(percent_done):
 
 print("Created data files!")
 
+# Removes the program file from any previous installations to not cause issues
+# This happens right before any files are going to be written to disk
+try:
+    remove(path.join(dir_path, f"encryptext_v{version}.pyw"))
+except: pass
+
 # Write the file back to the Encryptext.py file
-with open(path.join(dir_path, "Encryptext-User.pyw"), "w", encoding="utf8") as file:
+with open(path.join(dir_path, f"encryptext_v{version}.pyw"), "w", encoding="utf8") as file:
     file.write(text)
 
 print("Building custom program...\n\n")
 
+# Removes the pyinstaller files from any previous installations to not cause issues
+# This happens right before any files are going to be written to disk
+try:
+    rmdir(path.join(dir_path, "dist"))
+    rmdir(path.join(dir_path, "build"))
+except: pass
+
 # Start thread to create app
 app_thread.start()
 
@@ -328,16 +311,21 @@ def progress_bar(percent_done):
 # Wait for app compilation to finish
 app_thread.join()
 
+# Remove old version if it's the same version number before moving new one out
+try:
+    remove(path.join(dir_path, f"encryptext_v{version}.exe"))
+except: pass
+
 # Moves the exe out of the dist folder
-rename(path.join(dir_path, "dist", "Encryptext.exe"), path.join(dir_path, f"Encryptext_v{version}.exe"))
+rename(path.join(dir_path, "dist", "encryptext.exe"), path.join(dir_path, f"encryptext_v{version}.exe"))
 
 # Create desktop shortcut
-# From: https://stackoverflow.com/a/69597224
+# https://stackoverflow.com/a/69597224
 try:
     from win32com.client import Dispatch
 
-    shortcut_path = path.join(home_dir, "Desktop", f"Encryptext_v{version}.lnk")  #This is where the shortcut will be created
-    target_path = path.join(dir_path, f"Encryptext_v{version}.exe") # directory to which the shortcut is created
+    shortcut_path = path.join(home_dir, "Desktop", f"Encryptext_v{version}.lnk")
+    target_path = path.join(dir_path, f"encryptext_v{version}.exe")
 
     shell = Dispatch('WScript.Shell')
     shortcut = shell.CreateShortCut(shortcut_path)
@@ -351,8 +339,8 @@ def progress_bar(percent_done):
     # Create Start Menu folder for Encryptext
     makedirs(path.join(home_dir, "AppData", "Roaming", "Microsoft", "Windows", "Start Menu", "Programs", "Encryptext"), exist_ok=True)
 
-    shortcut_path = path.join(home_dir, "AppData", "Roaming", "Microsoft", "Windows", "Start Menu", "Programs", "Encryptext", f"Encryptext.lnk")  #This is where the shortcut will be created
-    target_path = path.join(dir_path, f"Encryptext_v{version}.exe") # directory to which the shortcut is created
+    shortcut_path = path.join(home_dir, "AppData", "Roaming", "Microsoft", "Windows", "Start Menu", "Programs", "Encryptext", f"Encryptext {version}.lnk")
+    target_path = path.join(dir_path, f"encryptext_v{version}.exe")
 
     shell = Dispatch('WScript.Shell')
     shortcut = shell.CreateShortCut(shortcut_path)
@@ -366,7 +354,7 @@ def progress_bar(percent_done):
 # Removes the files from pyinstaller
 rmdir(path.join(dir_path, "dist"))
 rmtree(path.join(dir_path, "build"))
-remove(path.join(dir_path, "Encryptext-User.pyw"))
+remove(path.join(dir_path, f"encryptext_v{version}.pyw"))
 remove(path.join(dir_path, "installer_output.log"))
 
 input("\nCompleted! Press enter to finish setup...")

encryptext_installer_v1.8.0_64bit.exe

@@ -1,3 +1,5 @@
+#!/usr/bin/python'
+
 from os import rename, path, remove
 from shutil import rmtree
 import hashlib