refac: extracted utility functions to utils.py

Author: antrikshmisri

Github-Automation/diffcalc.py

@@ -1,21 +1,23 @@
+from colors import logcolors
+from difflib import ndiff
+from utils import getMaxSpaces
 
-import difflib
 
-def getMaxSpaces(file):
-    max = float('-inf')
-    for ele in file:
-        ele = ele.strip()
-        if(len(ele) > max):
-            max = len(ele)
-    return max
 
-def calcDiff(firstFile , secondFile):
-    diff = difflib.ndiff(firstFile , secondFile)
+def calcDiff(firstFile, secondFile):
+    # calculate raw diff
+    diff = ndiff(firstFile, secondFile)
+    # calculate unique lines in secondfile
     deltainit = ''.join(x[2:] for x in diff if x.startswith('+ '))
+    # reformat the lines
     deltainit = deltainit.split('\n')
     maxspacesinit = getMaxSpaces(deltainit)
-    print('CHANGED LINES ARE:-\n' , '-' * maxspacesinit)
+    print(f'{logcolors.BOLD}CHANGED LINES ARE{logcolors.ENDC}\n',
+          f'{logcolors.BOLD}-{logcolors.ENDC}' * maxspacesinit)
+
     for ele in deltainit:
-        print(str(ele.strip()) , ' ' * (maxspacesinit - len(ele.strip())), '+|')
-    print('' , '-' * maxspacesinit)
-    
+        print(f'{logcolors.SUCCESS} {str(ele.strip())} {logcolors.ENDC}',
+              ' ' * (maxspacesinit - len(ele.strip())), '+')
+              
+    print('', f'{logcolors.BOLD}-{logcolors.ENDC}' * maxspacesinit)
+    return deltainit

Github-Automation/gitcommands.py

@@ -1,8 +1,12 @@
 from subprocess import call
 from sys import platform as _platform
+from colors import logcolors
+
+
 def init():
     call('git init')
-# git add <filename>
+
+
 def createReadme():
     if _platform == "linux" or _platform == "linux2":
         call('touch README.md')
@@ -12,38 +16,50 @@ def createReadme():
         call('type nul>README.md')
 
 
-# Windows
 def add(filelist):
     for file in filelist:
         # perform git add on file
-        print("Adding" , file)
+        print(f"{logcolors.SUCCESS}Adding{logcolors.ENDC}",
+              file.split('\\')[-1])
         call(('git add ' + file))
 
 # git commit -m "passed message"
-def commit(filelist):
+
+
+def commit(filelist,*args,**kwargs):
+    diffarr = kwargs.get('diffarr' , -1)
     for file in filelist:
         # ask user for commit message
-        msg = str(input('Enter the commit message for ' + file +  ' or enter -r to reject commit'))
+        msg = str(input(f'{logcolors.BOLD}Enter the commit message for{logcolors.ENDC} ' +
+                        file.split('\\')[-1] + f' {logcolors.BOLD}or enter {logcolors.ERROR}-r{logcolors.ENDC} to reject commit{logcolors.ENDC}'))
         # if msg == -r reject commit
         if(msg == '-r'):
+            print(f'{logcolors.ERROR}commit rejected{logcolors.ENDC}')
+            if(diffarr != -1):
+                diffarr.remove(diffarr[filelist.index(file)])
             filelist.remove(file)
-            print('commit rejected')
             call('cls', shell=True)
             return False
         # else execute git commit for the file
-        #added a comment
+        # added a comment
         else:
-            filelist.remove(file)
             call('git commit -m "' + msg + '"')
-            call('cls' , shell=True)
-            
+            call('cls', shell=True)
+            print(
+                f'Commited {logcolors.CYAN}{file}{logcolors.ENDC} with msg: {logcolors.BOLD}{msg}{logcolors.ENDC}')
+
+
 def setremote(url):
     call('git remote add origin ' + url)
-    
+
+
 def setBranch(branch):
     call('git branch -M ' + branch)
-    
+
 # git push
-def push(url , branch):
+
+
+def push(url, branch):
     call('git push -u ' + url + ' ' + branch)
-    #added a comment
+    call('cls', shell=True)
+    print(f'{logcolors.SUCCESS}Successfully Pushed Changes{logcolors.ENDC}')

Github-Automation/install.py

@@ -1,24 +1,21 @@
 from shutil import copy , copyfile
 import os
 dir = os.getcwd()
-files = []
-# files = ['diffcalc.py' , 'main.py' , 'filechange.py' , 'gitcommands.py' , 'repoInfo.py']
-for file in os.listdir(dir):
-    if(file.endswith('.py') and file != 'install.py'):
-        files.append(file)
-print(files)
 
+files = [file for file in os.listdir(dir) if file.endswith('.py') and file != 'install.py']
+files.append('tmp.json')
+print(files)
 def checkForIgnore(dst):
     return os.path.isfile(os.path.join(dst , '.gitignore'))
 
 def addToIgnore(dst):
     with open(os.path.join(dst , '.gitignore') , "a") as f:
-            f.write('\n/auto-scripts')
+            f.write('\nauto-scripts\n.idea\n__pycache__\n.git')
             f.close()
 
 def makeIgnore(dst):
     f = open(os.path.join(dst , '.gitignore') , "x")
-    f.write('/auto-scripts')
+    f.write('auto-scripts\n.idea\n__pycache__\n.git')
     f.close()
 
 def copyfiles(file:str , dst:str):
@@ -33,7 +30,6 @@ def installfiles():
     else:
         print('.gitignore not found, creating one')
         makeIgnore(location)
-        addToIgnore(location)
     os.makedirs(os.path.join(location , 'auto-scripts'))
     location = os.path.join(location , 'auto-scripts')
     print('Installing Files')