VIStk 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

VIS/Templates/screen.txt

@@ -6,8 +6,6 @@ import sys
 #File Specific Imports
 
 #Configure Screen
-print(cfp)
-
 w = 1080
 h = 720
 ws = root.winfo_screenwidth()

VIS/Templates/spec.txt

@@ -29,5 +29,5 @@ $name$_exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon=['../Icons/$icon$.ico'],)
-
+    icon=['../Icons/$icon$.ico'],
+    version='$meta$')

VIS/Templates/version.txt

@@ -0,0 +1,30 @@
+# UTF-8
+
+VSVersionInfo(
+  ffi=FixedFileInfo(
+    filevers=($sM$,$sm$,$sp$,0),
+    prodvers=($M$,$m$,$p$,0),
+    mask=0x3f,
+    flags=0x0,
+    OS=0x40004,
+    fileType=0x1,
+    subtype=0x0,
+    date=(0, 0)
+    ),
+  kids=[
+    StringFileInfo(
+      [
+      StringTable(
+        u'040904B0',
+        [StringStruct(u'CompanyName', u'$company$'),
+        StringStruct(u'FileDescription', u'$desc$'),
+        StringStruct(u'FileVersion', u'$sM$.$sm$.$sp$'),
+        StringStruct(u'InternalName', u'$title$-$name$'),
+        StringStruct(u'LegalCopyright', u'Copyright © $year$ $company$'),
+        StringStruct(u'OriginalFilename', u'$name$.exe'),
+        StringStruct(u'ProductName', u'$name$'),
+        StringStruct(u'ProductVersion', u'$M$.$m$.$p$')])
+      ]), 
+    VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
+  ]
+)

VIS/VIS.py

@@ -1,26 +1,15 @@
 import sys
 import os
 import zipfile
-import subprocess
-import shutil
-import project as vp
+from VIS.project import *
 from importlib import metadata
-import json
-
-#Need to get current python location where VIS is installed
-vl = subprocess.check_output('python -c "import os, sys; print(os.path.dirname(sys.executable))"').decode().strip("\r\n")+"\\Lib\\site-packages\\VIS\\"
-#print(vl)
+from VIS.release import newRelease
 
 inp = sys.argv
-#print("entered ",inp[1]," as ",inp)
-try:
-    (wd := os.getcwd()) if inp[1] in ["new","New","N","n"] else (wd := vp.getPath())
-except:
-    print(f"VIS Version {metadata.version("VIS")}")
-    sys.exit()
+print(f"VIS Version {metadata.version("VIStk")}")
+
 
-#Copied from source
-#https://stackoverflow.com/a/75246706
+#Copied from source https://stackoverflow.com/a/75246706
 def unzip_without_overwrite(src_path, dst_dir):
     with zipfile.ZipFile(src_path, "r") as zf:
         for member in zf.infolist():
@@ -30,67 +19,35 @@ def unzip_without_overwrite(src_path, dst_dir):
 def __main__():
     match inp[1]:
         case "new"|"New"|"N"|"n":#Create a new VIS project
-            if vp.getPath() == None:
-                os.mkdir(wd+"\\.VIS")
-                open(wd+"/.VIS/path.cfg","w").write(wd) if os.path.exists(wd+"/.VIS/path.cfg") else open(wd+"/.VIS/path.cfg", 'a').write(wd)
-                print(f"Created path.cfg as {vp.getPath()}")
-                unzip_without_overwrite(vl.replace("\\","/")+"Form.zip",wd)#Unzip project template to project
-                shutil.copytree(vl+"Templates",wd+".VIS/Templates",dirs_exist_ok=True)#copy templates to project
-                #DO NOT MESS WITH THE TEMPLATE HEADERS
-                title = input("Enter a name for the VIS project:")
-                info = {}
-                info[title] = {}
-                info[title]["Screens"]={}
-                info[title]["defaults"]={}
-                info[title]["defaults"]["icon"]="VIS"#default icon
-                os.mkdir(wd+"\\.VIS\\project.json")
-                with open(wd+"/.VIS/project.json","w") as f:
-                    json.dump(info,f,indent=4)
-            else:
-                print(f"VIS project already initialized with path {vp.getPath()}") 
+            project = VINFO()
 
         case "add" | "Add" | "a" | "A":
+            project = Project()
             match inp[2]:
                 case "screen" | "Screen" | "s" | "S":
-                    screen = inp[3] #File & directory creation for VIS structure
-                    print("Screens/"+screen+"\t exists") if os.path.exists(wd+"/Screens/"+screen) else os.mkdir(wd+"/Screens/"+screen)
-                    print("modules/"+screen+"\t exists") if os.path.exists(wd+"/modules/"+screen) else os.mkdir(wd+"/modules/"+screen)
-                    print(screen+".py\t\t exists") if os.path.exists(wd+screen+".py") else shutil.copyfile(wd+"/.VIS/Templates/screen.txt",wd+"/"+screen+".py") 
-                    
-                    with open(wd+"/.VIS/project.json","r") as f:
-                        info = json.load(f)
-                    name = list(info.keys())[0]
-                    if info[name]["Screens"].get(screen) == None:
-                        sc_name = input("What is the name of this screen?: ")
-                        info[name]["Screens"][sc_name] ={}
-                        info[name]["Screens"][sc_name]["script"] = screen+".py"
-                        match input("Should this screen have its own .exe?: "):
-                            case "Yes" | "yes" | "Y" | "y":
-                                info[name]["Screens"][sc_name]["release"] = "TRUE"
-                            case _:
-                                info[name]["Screens"][sc_name]["release"] = "FALSE"
-                        ictf =input("What is the icon for this screen (or none)?: ")
-                        if ".ICO" in ictf.upper():
-                            info[name]["Screens"][sc_name]["icon"] = ictf.strip(".ico")
-                        with open(wd+"/.VIS/project.json","w") as f:
-                            json.dump(info,f,indent=4)
-                    #somewhere in this process we can attempt to replace "Placeholder Title" and the root.iconbitmap
-                        
-
-                    if len(inp) >= 5:
-                        match inp[4]:
-                            case "menu" | "Menu" | "m" | "M":
-                                print("Add screen menu")
-                            case "elements" | "Elements" | "e" | "E":
-                                subprocess.call("python " + vl.replace("\\","/")+"/elements.py "+ screen + " " + inp[5])
-                    else:
-                        print("Add Screen")
-
-        case "patch" | "Patch" | "p" | "P":
-            subprocess.call("python " + vl.replace("\\","/")+"/patch.py " + inp[2])
+                    if not inp[3] == None:
+                        screen = project.verScreen(inp[3])
+                        if len(inp) >= 5:
+                            match inp[4]:
+                                case "menu" | "Menu" | "m" | "M":
+                                    screen.addMenu(inp[5])
+                                case "elements" | "Elements" | "e" | "E":
+                                    for i in inp[5].split("-"):
+                                        screen.addElement(i)
+                                    screen.stitch()
+                        else:
+                            project.newScreen(inp[3])
 
         case "stitch" | "Stitch" | "s" | "S":
-            subprocess.call("python " + vl.replace("\\","/")+"/stitch.py "+ inp[2])
+            project = Project()
+            screen = project.getScreen(inp[2])
+            if not screen == None:
+                screen.stitch()
+            else:
+                print("Screen does not exist")
 
         case "release" | "Release" | "r" | "R":
-            subprocess.call("python " + vl.replace("\\","/")+"/release.py " + inp[2])
+            if len(inp) == 4:
+                newRelease(inp[2],inp[3])
+            else:
+                newRelease(inp[2])

VIS/project.py

@@ -1,4 +1,20 @@
 import os
+import json
+import zipfile
+import shutil
+import re
+import glob
+import subprocess
+
+#Copied from source
+#https://stackoverflow.com/a/75246706
+def unzip_without_overwrite(src_path, dst_dir):
+    with zipfile.ZipFile(src_path, "r") as zf:
+        for member in zf.infolist():
+            file_path = os.path.join(dst_dir, member.filename)
+            if not os.path.exists(file_path):
+                zf.extract(member, dst_dir)
+
 def getPath():
     """Searches for .VIS folder and returns from path.cfg
     """
@@ -11,6 +27,336 @@ def getPath():
             if os.path.exists(step+".VIS/"):
                 return open(step+".VIS/path.cfg","r").read().replace("\\","/") #return stored path
             else:
-                sto += 1
+                if os.path.exists(step):
+                    sto += 1
+                else:
+                    return None #return none if cant escape more
         except:
-            return None #if failed return none
+            return None #if failed return none
+        
+def validName(name:str):
+    """Checks if provided path is a valid filename
+    """
+    if " " in name:
+        print("Cannot have spaces in file name.")
+        return False
+    if "/" in name or "\\" in name:
+        print("Cannot have filepath deliminator in file name.")
+        return False
+    if "<" in name or ">" in name or ":" in name or '"' in name or "|" in name or "?" in name or "*" in name:
+        print('Invlaid ASCII characters for windows file creation, please remove all <>:"|?* from file name.')
+        return False
+    if name.split(".")[0] in ["CON","PRN","AUX","NUL","COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9","LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"]:
+        print(f"Filename {name} reserved by OS.")
+        return False
+    if "" == name:
+        print("Must provide a name for file.")
+        return False
+    else:
+        return True
+
+
+class VINFO():
+    """Overarching control structure within the /.VIS/ folder
+    """
+    def __init__(self):
+        if getPath() == None:
+            wd = os.getcwd()
+            os.mkdir(wd+"\\.VIS")
+            open(wd+"/.VIS/path.cfg","w").write(wd) if os.path.exists(wd+"/.VIS/path.cfg") else open(wd+"/.VIS/path.cfg", 'a').write(wd)
+            print(f"Stored project path in path.cfg as {wd} in {wd}/.VIS/path.cfg")
+
+            unzip_without_overwrite("./Form.zip",wd)
+            print(f"Copied structure to {wd}")
+
+            shutil.copytree("./Templates",wd+"/.VIS/Templates",dirs_exist_ok=True)
+            print(f"Loaded default templates into {wd}/.VIS/Templates/")
+
+           
+            #DO NOT MESS WITH THE TEMPLATE HEADERS
+
+            title = input("Enter a name for the VIS project: ")
+            self.title = title
+            info = {}
+            info[self.title] = {}
+            info[self.title]["Screens"]={}
+            info[self.title]["defaults"]={}
+            info[self.title]["defaults"]["icon"]="VIS"#default icon
+            self.d_icon = "VIS"
+            self[self.title]["metadata"]={}
+            comp = input("What company is this for(or none)? ")
+            if not comp in ["none","None"]:
+                info[self.title]["metadata"]["company"] = comp
+                self.company = comp
+            else:
+                info[self.title]["metadata"]["company"] = None
+                self.company = None
+
+            version = input("What is the initial version for the project (0.0.1 default): ")
+            vers = version.split(".")
+            if len(vers)==3:
+                if vers[0].isnumeric() and vers[1].isnumeric() and vers[2].isnumeric():
+                    self.version = version
+                else:
+                    self.version = "0.0.1"
+            else:
+                self.version = "0.0.1"
+            info[self.title]["metadata"]["version"] = self.version
+
+            with open(wd+"/.VIS/project.json","w") as f:
+                f.write("{}")
+                json.dump(info,f,indent=4)
+            print(f"Setup project.json for project {self.title} in {wd}/.VIS/")
+
+
+        #Need to get current python location where VIS is installed
+        self.p_vis = subprocess.check_output('python -c "import os, sys; print(os.path.dirname(sys.executable))"').decode().strip("\r\n")+"\\Lib\\site-packages\\VIS\\"
+
+
+        self.p_project = getPath()
+        self.p_vinfo = self.p_project + "/.VIS"
+        self.p_sinfo = self.p_vinfo + "/project.json"
+        with open(self.p_sinfo,"r") as f: 
+            info = json.load(f)
+            self.title = list(info.keys())[0]
+            self.version = info[self.title]["metadata"]["version"]
+            self.company = info[self.title]["metadata"]["company"]
+            
+        self.screenlist = []
+        self.p_screens = self.p_project +"/Screens"
+        self.p_modules = self.p_project +"/modules"
+        self.p_templates = self.p_vinfo + "/Templates"
+        self.p_icons = self.p_project + "/Icons"
+        self.p_images = self.p_project + "/Images"
+        
+    def setVersion(self,version:str):
+        """Sets a new project version
+        """
+        with open(self.p_sinfo,"r") as f: 
+            info = json.load(f)
+
+        info[self.title]["metadata"]["version"] = version
+
+        with open(self.p_sinfo,"w") as f:
+            json.dump(info,f,indent=4)
+
+
+class Screen(VINFO):
+    """A VIS screen object
+    """
+    def __init__(self,name:str,script:str,release:bool=False,icon:str=None,exists:bool=True,desc:str=None):
+        super().__init__()
+        self.name=name
+        self.script=script
+        self.release=release
+        self.icon=icon
+        self.path = self.p_screens+"/"+self.name
+        self.m_path = self.p_modules+"/"+self.name
+
+        if not exists:
+            with open(self.p_sinfo,"r") as f:
+                info = json.load(f)
+
+            info[self.title]["Screens"][self.name] = {"script":script,"release":release}
+            if not icon == None:
+                info[self.title]["Screens"][self.name]["icon"] = icon
+            
+            if not desc == None:
+                info[self.title]["Screens"][self.name]["desc"] = desc
+            else:
+                info[self.title]["Screens"][self.name]["desc"] = "A VIS Created Executable"
+
+            info[self.title]["Screens"][self.name]["version"] = "1.0.0"#always making first major version of screen
+
+            info[self.title]["Screens"][self.name]["current"] = None#always making first major version of screen
+
+            with open(self.p_sinfo,"w") as f:
+                json.dump(info,f,indent=4)
+
+            shutil.copyfile(self.p_templates+"/screen.txt",self.p_project+"/"+script)
+            os.mkdir(self.p_screens+"/"+self.name)
+            os.mkdir(self.p_modules+"/"+self.name)
+
+        with open(self.p_sinfo,"r") as f:
+                info = json.load(f)
+        self.desc = info[self.title]["Screens"][self.name]["desc"]
+        self.s_version = info[self.title]["Screens"][self.name]["version"]
+        self.current = info[self.title]["Screens"][self.name]["current"]
+        
+
+    def addElement(self,element:str) -> int:
+        if validName(element):
+            if not os.path.exists(self.path+"/f_"+element+".py"):
+                shutil.copyfile(self.p_templates+"/f_element.txt",self.path+"/f_"+element+".py")
+                print(f"Created element f_{element}.py in {self.path}")
+                self.patch(element)
+            if not os.path.exists(self.m_path+"/m_"+element+".py"):
+                with open(self.m_path+"/m_"+element+".py", "w"): pass
+                print(f"Created module m_{element}.py in {self.m_path}")
+            return 1
+        else:
+            return 0
+        
+    def addMenu(self,menu:str) -> int:
+        pass #will be command line menu creation tool
+
+    def patch(self,element:str) -> int:
+        """Patches up the template after its copied
+        """
+        if os.path.exists(self.path+"/f_"+element+".py"):
+            with open(self.path+"/f_"+element+".py","r") as f:
+                text = f.read()
+            text = text.replace("<frame>","f_"+element)
+            with open(self.path+"/f_"+element+".py","w") as f:
+                f.write(text)
+            print(f"patched f_{element}.py")
+            return 1
+        else:
+            print(f"Could not patch, element does not exist.")
+            return 0
+    
+    def stitch(self) -> int:
+        """Connects screen elements to a screen
+        """
+        with open(self.p_project+"/"+self.script,"r") as f: text = f.read()
+        stitched = []
+        #Elements
+        pattern = r"#Screen Elements.*#Screen Grid"
+
+        elements = glob.glob(self.path+'/f_*')#get all elements
+        for i in range(0,len(elements),1):#iterate into module format
+            elements[i] = elements[i].replace("\\","/")
+            elements[i] = elements[i].replace(self.path+"/","Screens."+self.name+".")[:-3]
+            stitched.append(elements[i])
+        #combine and change text
+        elements = "from " + " import *\nfrom ".join(elements) + " import *\n"
+        text = re.sub(pattern, "#Screen Elements\n" + elements + "\n#Screen Grid", text, flags=re.DOTALL)
+
+        #Modules
+        pattern = r"#Screen Modules.*#Handle Arguments"
+
+        modules = glob.glob(self.m_path+'/m_*')#get all modules
+        for i in range(0,len(modules),1):#iterate into module format
+            modules[i] = modules[i].replace("\\","/")
+            modules[i] = modules[i].replace(self.m_path+"/","modules."+self.name+".")[:-3]
+            stitched.append(modules[i])
+        #combine and change text
+        modules = "from " + " import *\nfrom ".join(modules) + " import *\n"
+        text = re.sub(pattern, "#Screen Modules\n" + modules + "\n#Handle Arguments", text, flags=re.DOTALL)
+
+        #write out
+        with open(self.p_project+"/"+self.script,"w") as f:
+            f.write(text)
+        print("Stitched: ")
+        for i in stitched:
+            print(f"\t{i} to {self.name}")
+
+    def syncVersion(self) -> int:
+        """Syncs the version stored in sinfo with the version in memory
+        """
+        with open(self.p_sinfo,"r") as f:
+            info = json.load(f)
+        info[self.title]["Screens"][self.name]["current"] = self.current
+        with open(self.p_sinfo,"w") as f:
+            json.dump(info,f)
+        return 1
+
+    def crntVersion(self) -> int:
+        """Checks if the version needs to be synced and returns 1 if its synced
+        """
+        if not self.s_version == self.current:
+            self.current = self.version
+            self.syncVersion()
+            return 1
+        else:
+            return 0
+
+
+class Project(VINFO):
+    """VIS Project Object
+    """
+    def __init__(self):
+        """Initializes or load a VIS project
+        """
+        super().__init__()
+        with open(self.p_sinfo,"r") as f:
+            info = json.load(f)
+            self.name = list(info.keys())[0]
+
+            for screen in list(info[self.name]["Screens"].keys()):
+                scr = Screen(screen,
+                             info[self.name]["Screens"][screen]["script"],
+                             info[self.name]["Screens"][screen]["release"],
+                             info[self.name]["Screens"][screen].get("icon"),
+                             exists=True)
+                self.screenlist.append(scr)
+            self.d_icon = info[self.name]["defaults"]["icon"]
+    
+    def newScreen(self,screen:str) -> int:
+        """Creates a new screen with some prompting
+
+        Returns:
+            0 Failed
+            1 Success
+        """
+        #Check for valid filename  
+        if not validName(screen):
+            return 0
+        
+        with open(self.p_sinfo,"r") as f:
+            info = json.load(f) #Load info
+
+        name = self.title
+        if info[name]["Screens"].get(screen) == None: #If Screen does not exist in VINFO
+            while True: #ensures a valid name is used for script
+                match input(f"Should python script use name {screen}.py? "):
+                    case "Yes" | "yes" | "Y" | "y":
+                        script = screen + ".py"
+                        break
+                    case _:
+                        script = input("Enter the name for the script file: ").strip(".py")+".py"
+                        if validName(script):
+                            break
+
+            match input("Should this screen have its own .exe?: "):
+                case "Yes" | "yes" | "Y" | "y":
+                    release = True
+                case _:
+                    release = False
+            ictf =input("What is the icon for this screen (or none)?: ")
+            icon = ictf.strip(".ico") if ".ICO" in ictf.upper() else None
+            desc = input("Write a description for this screen: ")
+            self.screenlist.append(Screen(screen,script,release,icon,False,desc))
+
+            return 1
+        else:
+            print(f"Information for {screen} already in project.")
+            return 1
+
+    def hasScreen(self,screen:str) -> bool:
+        """Checks if the project has the correct screen
+        """
+        for i in self.screenlist:
+            if i.name == screen:
+                return True
+        return False
+    
+    def getScreen(self,screen:str) -> Screen:
+        """Returns a screen object by its name
+        """
+        for i in self.screenlist:
+            if i.name == screen:
+                return i
+        return None
+
+    def verScreen(self,screen:str) -> Screen:
+        """Verifies a screen exists and returns it
+
+        Returns:
+            screen (Screen): Verified screen
+        """
+        if not self.hasScreen(screen):
+            self.newScreen(screen)
+        scr = self.getScreen(screen)
+        return scr
+

VIS/release.py

@@ -1,107 +1,158 @@
-import sys
-from project import *
+from VIS.project import *
 import subprocess
-import json
 import shutil
 from os.path import exists
+import time
+import datetime
 
-root = getPath()
 info = {}
-with open(root+"/.VIS/project.json","r") as f:
-    info = json.load(f)
-name = list(info.keys())[0]
+project = Project()
+
 
 def build(version:str=""):
     """Build project spec file with specific version
     """
     
-    print(f"Creating project.spec for {name}")
+    print(f"Creating project.spec for {project.name}")
 
-    with open(root+"/.VIS/Templates/spec.txt","r") as f:
+    with open(project.p_vinfo+"/Templates/spec.txt","r") as f:
         spec = f.read()
-    with open(root+"/.VIS/Templates/collect.txt","r") as f:
+    with open(project.p_vinfo+"/Templates/collect.txt","r") as f:
         collect = f.read()
     
     spec_list = []
     name_list = []
-    
-    for i in info[name]["Screens"].keys():
-        if info[name]["Screens"][i]["release"] == "TRUE":
-            name_list.append(i)
-            file = info[name]["Screens"][i]["script"]
-            #icon = "du"
-            if not info[name]["Screens"][i].get("icon") == None:
-                icon = info[name]["Screens"][i]["icon"]
+    os.mkdir(project.p_vinfo+"/Build")
+    for i in project.screenlist:
+        if i.release:
+            name_list.append(i.name)
+            if not i.icon == None:
+                icon = i.icon
             else:
-                icon = info[name]["defaults"]["icon"]
-            spec_list.append(spec.replace("$name$",i))
+                icon = project.d_icon
+            spec_list.append(spec.replace("$name$",i.name))
             spec_list[len(spec_list)-1] = spec_list[len(spec_list)-1].replace("$icon$",icon)
-            spec_list[len(spec_list)-1] = spec_list[len(spec_list)-1].replace("$file$",file)
+            spec_list[len(spec_list)-1] = spec_list[len(spec_list)-1].replace("$file$",i.script)
+
+            #build metadata
+            with open(project.p_templates+"/version.txt","r") as f:
+                meta = f.read()
+
+            #Update Overall Project Version
+            vers = project.version.split(".")
+            major = vers[0]
+            minor = vers[1]
+            patch = vers[2]
+            meta = meta.replace("$M$",major)
+            meta = meta.replace("$m$",minor)
+            meta = meta.replace("$p$",patch)
+
+            #Update Screen Version
+            vers = i.s_version.split(".")
+            major = vers[0]
+            minor = vers[1]
+            patch = vers[2]
+            meta = meta.replace("$sM$",major)
+            meta = meta.replace("$sm$",minor)
+            meta = meta.replace("$sp$",patch)
+
+            if project.company != None:
+                meta = meta.replace("$company$",project.company)
+                meta = meta.replace("$year$",str(datetime.datetime.now().year))
+            else:
+                meta = meta.replace("            VALUE \"CompanyName\",      VER_COMPANYNAME_STR\n","")
+                meta = meta.replace("            VALUE \"LegalCopyright\",   VER_LEGALCOPYRIGHT_STR\n","")
+                meta = meta.replace("#define VER_LEGAL_COPYRIGHT_STR     \"Copyright © $year$ $company$\\0\"\n\n","")
+            meta = meta.replace("$name$",i.name)
+            meta = meta.replace("$desc$",i.desc)
+            
+            with open(project.p_vinfo+f"/Build/{i.name}.txt","w") as f:
+                f.write(meta)
+            spec_list[len(spec_list)-1] = spec_list[len(spec_list)-1].replace("$meta$",project.p_vinfo+f"/Build/{i.name}.txt")
             spec_list.append("\n\n")
 
     insert = ""
     for i in name_list:
         insert=insert+"\n\t"+i+"_exe,\n\t"+i+"_a.binaries,\n\t"+i+"_a.zipfiles,\n\t"+i+"_a.datas,"
     collect = collect.replace("$insert$",insert)
-    collect = collect.replace("$version$",name+"-"+version) if not version == "" else collect.replace("$version$",name)
+    collect = collect.replace("$version$",project.name+"-"+version) if not version == "" else collect.replace("$version$",project.name)
     
     header = "# -*- mode: python ; coding: utf-8 -*-\n\n\n"
 
-    with open(root+"/.VIS/project.spec","w") as f:
+    with open(project.p_vinfo+"/project.spec","w") as f:
         f.write(header)
-    with open(root+"/.VIS/project.spec","a") as f:
+    with open(project.p_vinfo+"/project.spec","a") as f:
         f.writelines(spec_list)
         f.write(collect)
 
-    print(f"Setup project.spec for {name} {version if not version =="" else "current"}")#advanced version will improve this
+    print(f"Finished creating project.spec for {project.title} {version if not version =="" else "current"}")#advanced version will improve this
 
 def clean(version:str=" "):
     """Cleans up build environment to save space
     """
     print("Cleaning up build environment")
-    if version == "":
-        if exists(f"{root}/dist/{name}/Icons/"): shutil.rmtree(f"{root}/dist/{name}/Icons/")
-        if exists(f"{root}/dist/{name}/Images/"): shutil.rmtree(f"{root}/dist/{name}/Images/")
-        shutil.copytree(root+"/Icons/",f"{root}/dist/{name}/Icons/",dirs_exist_ok=True)
-        shutil.copytree(root+"/Images/",f"{root}/dist/{name}/Images/",dirs_exist_ok=True)
+    project=Project()
+    shutil.rmtree(project.p_vinfo+"/Build")
+    print("Appending Screen Data To Environment")
+    if version == " ":
+        if exists(f"{project.p_project}/dist/{project.title}/Icons/"): shutil.rmtree(f"{project.p_project}/dist/{project.title}/Icons/")
+        if exists(f"{project.p_project}/dist/{project.title}/Images/"): shutil.rmtree(f"{project.p_project}/dist/{project.title}/Images/")
+        shutil.copytree(project.p_project+"/Icons/",f"{project.p_project}/dist/{project.title}/Icons/",dirs_exist_ok=True)
+        shutil.copytree(project.p_project+"/Images/",f"{project.p_project}/dist/{project.title}/Images/",dirs_exist_ok=True)
     else:
-        if exists(f"{root}/dist/{name}/Icons/"): shutil.rmtree(f"{root}/dist/{name}/Icons/")
-        if exists(f"{root}/dist/{name}/Images/"): shutil.rmtree(f"{root}/dist/{name}/Images/")
-        shutil.copytree(root+"/Icons/",f"{root}/dist/{name}-{version.strip(" ")}/Icons/",dirs_exist_ok=True)
-        shutil.copytree(root+"/Images/",f"{root}/dist/{name}-{version.strip(" ")}/Images/",dirs_exist_ok=True)
-    print(f"\n\nReleased new{version}build of {name}!")
+        if exists(f"{project.p_project}/dist/{project.title}/Icons/"): shutil.rmtree(f"{project.p_project}/dist/{project.name}/Icons/")
+        if exists(f"{project.p_project}/dist/{project.title}/Images/"): shutil.rmtree(f"{project.p_project}/dist/{project.name}/Images/")
+        shutil.copytree(project.p_project+"/Icons/",f"{project.p_project}/dist/{project.title}-{version.strip(" ")}/Icons/",dirs_exist_ok=True)
+        shutil.copytree(project.p_project+"/Images/",f"{project.p_project}/dist/{project.title}-{version.strip(" ")}/Images/",dirs_exist_ok=True)
+    print(f"\n\nReleased new{version}build of {project.title}!")
+
+def newVersion(version:str):
+    """Updates the project version, permanent, cannot be undone
+    """
+    project = VINFO()
+    old = str(project.version)
+    vers = project.version.split(".")
+    if version == "Major":
+        vers[0] = str(int(vers[0])+1)
+        vers[1] = str(0)
+        vers[2] = str(0)
+    if version == "Minor":
+        vers[1] = str(int(vers[1])+1)
+        vers[2] = str(0)
+    if version == "Patch":
+        vers[2] = str(int(vers[2])+1)
 
-version = sys.argv[1]
-match version:
-    case "a":
-        build("alpha")
-        subprocess.call(f"pyinstaller {root}/.VIS/project.spec --noconfirm --distpath {root}/dist/ --log-level FATAL")
-        clean(" alpha ")
-    case "b":
-        build("beta")
-        subprocess.call(f"pyinstaller {root}/.VIS/project.spec --noconfirm --distpath {root}/dist/ --log-level FATAL")
-        clean(" beta ")
-    case "c":
-        build()
-        subprocess.call(f"pyinstaller {root}/.VIS/project.spec --noconfirm --distpath {root}/dist/ --log-level FATAL")
-        clean()
-    case "sync":
-        build("alpha")
-        subprocess.call(f"pyinstaller {root}/.VIS/project.spec --noconfirm --distpath {root}/dist/ --log-level FATAL")
-        clean(" alpha ")
-        build("beta")
-        subprocess.call(f"pyinstaller {root}/.VIS/project.spec --noconfirm --distpath {root}/dist/ --log-level FATAL")
-        clean(" beta ")
-        build()
-        subprocess.call(f"pyinstaller {root}/.VIS/project.spec --noconfirm --distpath {root}/dist/ --log-level FATAL")
-        clean()
-        print("\t- alpha\n\t- beta\n\t- current")
-    case _:
-        inp = input(f"Release Project Version {version}?")
-        match inp:
-            case "y" | "Y" | "yes" | "Yes":
-                build(version)
-                subprocess.call(f"pyinstaller {root}/.VIS/project.spec --noconfirm --distpath {root}/dist/ --log-level FATAL")
-                clean(f" {version} ")
-            case _:
-                print(f"Could not release Project Version {version}")
+    project.setVersion(f"{vers[0]}.{vers[1]}.{vers[2]}")
+    project = VINFO()
+    print(f"Updated Version {old}=>{project.version}")
+
+def newRelease(version,type:str="Patch"):
+    """Releases a version of your project
+    """
+    match version:
+        case "a":
+            build("alpha")
+            subprocess.call(f"pyinstaller {project.p_vinfo}/project.spec --noconfirm --distpath {project.p_project}/dist/ --log-level FATAL")
+            clean(" alpha ")
+        case "b":
+            build("beta")
+            subprocess.call(f"pyinstaller {project.p_vinfo}/project.spec --noconfirm --distpath {project.p_project}/dist/ --log-level FATAL")
+            clean(" beta ")
+        case "c":
+            newVersion(type)
+            build()
+            subprocess.call(f"pyinstaller {project.p_vinfo}/project.spec --noconfirm --distpath {project.p_project}/dist/ --log-level FATAL")
+            clean()
+        case "sync":
+            build("alpha")
+            subprocess.call(f"pyinstaller {project.p_vinfo}/project.spec --noconfirm --distpath {project.p_project}/dist/ --log-level FATAL")
+            clean(" alpha ")
+            build("beta")
+            subprocess.call(f"pyinstaller {project.p_vinfo}/project.spec --noconfirm --distpath {project.p_project}/dist/ --log-level FATAL")
+            clean(" beta ")
+            build()
+            subprocess.call(f"pyinstaller {project.p_vinfo}/project.spec --noconfirm --distpath {project.p_project}/dist/ --log-level FATAL")
+            clean()
+            print("\t- alpha\n\t- beta\n\t- current")
+        case _:
+            print(f"Could not release Project Version {version}")

{vistk-0.3.6.dist-info → vistk-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: VIStk
-Version: 0.3.6
+Version: 0.3.8
 Summary: Visual Interfacing Structure for python using tkinter
 Author-email: Elijah Love <elijah2005l@gmail.com>
 Maintainer-email: Elijah Love <elijah2005l@gmail.com>

vistk-0.3.8.dist-info/RECORD

@@ -0,0 +1,18 @@
+VIS/Form.zip,sha256=qyNG6hPgFcMkkilC1D3KnIC2BStmFJabyGXQmxqvQzg,24596
+VIS/VIS.py,sha256=Wu-RoboUtWyqeUydhYxkov6kXvA-tgbnujUrgZxWQYg,1892
+VIS/__init__.py,sha256=gO-ri9N9K-CQ3wJi-CX12MYhbrdqz2fvhJU-ZGf5BjI,69
+VIS/menu.py,sha256=PqPYzsFfGpVeej85v59wbeWeSy24I-m0bFUAxtRBiSQ,1815
+VIS/project.py,sha256=aSG0xJKqhp3s_fMwO14fAcY5llC4PKSfLTDJrULs8VE,13804
+VIS/release.py,sha256=HltNabVQdMzRP7-WCgAqieu0N5nJuL963jSYvNKMkzw,6934
+VIS/Templates/collect.txt,sha256=ZU5m4g2VBOWNWAGMUjZoi2UIc2uWmlV-L7_IXc3lBVU,96
+VIS/Templates/f_element.txt,sha256=MVovajsLC2O5t_ZSOb9NppGqzziGqISWSaEJ7kbrl7U,485
+VIS/Templates/screen.txt,sha256=qjEB8x_krQ1UGcVjbIxuVgasxcpJwIMh2UKbdeeE0KI,791
+VIS/Templates/spec.txt,sha256=3PReA_cz0TqQ3l_eo7C_aVGZNneWOPT5KoK-lOom4RI,709
+VIS/Templates/version.txt,sha256=O3e6gO4MkPps1plgkpsIfMxutxqVbT8sVDf91-LUmvc,826
+VIS/__pycache__/__init__.cpython-313.pyc,sha256=G_EdBuWyhjGJ4zI9Sc81loMtV0ANdEzC6JmUwcnaomI,218
+vistk-0.3.8.dist-info/licenses/LICENSE,sha256=FxXH04vmzWaQWNEoGwgDcLEG8Li5qf36NNz3UyrBMvQ,1300
+vistk-0.3.8.dist-info/METADATA,sha256=B-O45Y0rQ8X18nv-YK6NqGjtJuu7XwF_OZXiS_rTvr0,2493
+vistk-0.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vistk-0.3.8.dist-info/entry_points.txt,sha256=Fq_VLNEc6Rk4-S8ICPkPjNozFeDeeeFAF5lvK7hQu7o,41
+vistk-0.3.8.dist-info/top_level.txt,sha256=iFRNav6cokh9J-6nat5rgNWLdQm371xQ3OPb9w7i5mI,4
+vistk-0.3.8.dist-info/RECORD,,

VIS/elements.py

@@ -1,27 +0,0 @@
-import sys
-import shutil
-import os
-import subprocess
-import project as vp
-
-screen = sys.argv[1]
-elements = sys.argv[2]
-elements = elements.split('-')
-
-project = vp.getPath()
-    
-for e in elements:
-    if not os.path.exists(project+"/Screens/"+screen+"/f_"+e+".py"):
-        shutil.copyfile(project+"/.VIS/Templates/f_element.txt",project+"/Screens/"+screen+"/f_"+e+".py")
-        print("element\tf_"+e+".py\tcreated in\tScreens/"+screen+"/")
-        subprocess.call("VIS patch "+project+"/Screens/"+screen+"/"+e+".py")
-
-    if not os.path.exists(project+"/modules/"+screen+"/m_"+e+".py"):
-        with open(project+"/modules/"+screen+"/m_"+e+".py", "w"): pass
-        print("module\tm_"+e+".py\tcreated in\tScreens/"+screen+"/")
-
-    if not os.path.exists(project+"/"+screen+".py"):#cannot create elements without screen so will create screen if it doesnt exist
-        shutil.copyfile(project+"/.VIS/Templates/screen.txt"+project+"/"+screen+".py")
-        print("screen\t"+e+".py \tcreated in\troot")
-
-subprocess.call("VIS stitch "+screen)

VIS/patch.py

@@ -1,11 +0,0 @@
-import sys
-
-file = sys.argv[1]
-frame = file.split('/')[-1][:-3]
-file=file.replace(frame,"f_"+frame)
-with open(file,"r") as f:
-    text = f.read()
-text = text.replace("<frame>","f_"+frame)
-with open(file,"w") as f:
-    f.write(text)
-    print("patched\tf_"+frame+".py")

VIS/screen.py

@@ -1,15 +0,0 @@
-import sys
-file = sys.argv[1]
-frame = file.split('\\')[-1][:-3]
-dump_screens = False
-dump_modules = False
-with open(file,"r") as f:
-    text= f.readlines()
-    for line in text:
-        if "screen elements" in line.lower():
-            dump_screens=True
-        elif "screen elements" in line.lower():
-            dump_modules=True
-
-with open(file,"w") as f:
-    f.write(text)

VIS/stitch.py

@@ -1,37 +0,0 @@
-import sys
-import re
-import glob
-import project as vp
-
-project = vp.getPath()
-screen = sys.argv[1]
-with open(project+"/"+screen+".py","r") as f:
-    text = f.read()
-
-#Elements
-pattern = r"#Screen Elements.*#Screen Grid"
-replacement = glob.glob(project+"/Screens/"+screen+'/f_*')
-for i in range(0,len(replacement),1):
-    replacement[i] = replacement[i].replace("\\","/")
-    replacement[i] = replacement[i].replace(project+"/Screens/"+screen+"/","Screens."+screen+".")[:-3]
-#print(replacement)
-replacement = "from " + " import *\nfrom ".join(replacement) + " import *\n"
-#print(replacement)
-text = re.sub(pattern, "#Screen Elements\n" + replacement + "\n#Screen Grid", text, flags=re.DOTALL)
-
-#Modules
-pattern = r"#Screen Modules.*#Handle Arguments"
-replacement = glob.glob(project+"/modules/"+screen+'/m_*')
-for i in range(0,len(replacement),1):
-    replacement[i] = replacement[i].replace("\\","/")
-    print("stitching\t"+replacement[i].strip(project)+"\tto\t"+screen+".py")
-    replacement[i] = replacement[i].replace(project+"/modules/"+screen+"/","modules."+screen+".")[:-3]
-#print(replacement)
-replacement = "from " + " import *\nfrom ".join(replacement) + " import *\n"
-#print(replacement)
-text = re.sub(pattern, "#Screen Modules\n" + replacement + "\n#Handle Arguments", text, flags=re.DOTALL)
-#print(text)
-
-with open(project+"/"+screen+".py","w") as f:
-    f.write(text)
-    print("stitched\t"+screen+".py\twith\tall")

vistk-0.3.6.dist-info/RECORD

@@ -1,21 +0,0 @@
-VIS/Form.zip,sha256=Uu6GK-n26kOSxSzL7HWHcqZf6p3bCn7tHCZ2F1YWnxk,25866
-VIS/VIS.py,sha256=4ZpMLbYSlvHpiQvWptY-pb4kH3tflbNfu4wumbJXQWM,4885
-VIS/__init__.py,sha256=gO-ri9N9K-CQ3wJi-CX12MYhbrdqz2fvhJU-ZGf5BjI,69
-VIS/elements.py,sha256=cq5__ICkdiKVF981o5AbetbmD3lB3HgMp0nsfZ6vKIo,1041
-VIS/menu.py,sha256=PqPYzsFfGpVeej85v59wbeWeSy24I-m0bFUAxtRBiSQ,1815
-VIS/patch.py,sha256=xvXXSF1cWH1aQhYauHkHulAyoj-RB85pJgSaPvGkglM,268
-VIS/project.py,sha256=kWkNzCSIdc6Ij0vnGVGugSjbWs0EFCkPmDtCF8w5850,536
-VIS/release.py,sha256=grA6M5hVbZDdJyi3bUXcwYzcye21yiNThThsjRgzTuY,4478
-VIS/screen.py,sha256=am3pRnfXoC2G1TSVA_FyAuOKQ_PuVCKQMQCwkwSWe_s,377
-VIS/stitch.py,sha256=AT9y9bDAJp-wmfUCWeUCp3mn_b8u9yEL5DE5XOn32Sc,1428
-VIS/Templates/collect.txt,sha256=ZU5m4g2VBOWNWAGMUjZoi2UIc2uWmlV-L7_IXc3lBVU,96
-VIS/Templates/f_element.txt,sha256=MVovajsLC2O5t_ZSOb9NppGqzziGqISWSaEJ7kbrl7U,485
-VIS/Templates/screen.txt,sha256=4k732aBbT_tf3fwcsM1RLB8UPFNA03EWBRo1aw0jw8U,803
-VIS/Templates/spec.txt,sha256=_IlwxuNxmtFOriZ6JWgtPANLkA8GFzOm80lE9PhqKfs,690
-VIS/__pycache__/__init__.cpython-313.pyc,sha256=G_EdBuWyhjGJ4zI9Sc81loMtV0ANdEzC6JmUwcnaomI,218
-vistk-0.3.6.dist-info/licenses/LICENSE,sha256=FxXH04vmzWaQWNEoGwgDcLEG8Li5qf36NNz3UyrBMvQ,1300
-vistk-0.3.6.dist-info/METADATA,sha256=dUjKSYpAIYq7nrYOFYdsZ8SNNJMtXkRqrTRREg9SLoc,2493
-vistk-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vistk-0.3.6.dist-info/entry_points.txt,sha256=Fq_VLNEc6Rk4-S8ICPkPjNozFeDeeeFAF5lvK7hQu7o,41
-vistk-0.3.6.dist-info/top_level.txt,sha256=iFRNav6cokh9J-6nat5rgNWLdQm371xQ3OPb9w7i5mI,4
-vistk-0.3.6.dist-info/RECORD,,