Commit d64ccf0

authored

Merge pull request avinashkranjan#285 from antrikshmisri/master

fix: nested-files,diff calc,add to gitignore

2 parents 8d0e805 + 13ea7a7 commit d64ccf0Copy full SHA for d64ccf0

File tree

+60

-13

lines changed

+60

-13

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ To run the script use following commands`
`30`	`30`
`31`	`31`	`4. Run the python script to listen for changes`
`32`	`32`	```python
`33`		`- python main.py`
	`33`	`+ python ./auto-scripts/main.py`
`34`	`34`	```
`35`	`35`
	`36`	+*Note: This script listens to all nested files, ignoring directories like `.git` , `node_modules`. If you want to add custom folders that you want the script to ignore add them in filechange.py like this:*
	`37`	+```python
	`38`	`+10 ignoredirs = ['.git' , '.idea' , '__pycache__' , 'node_modules' , 'custom_folder']`
	`39`	+```

Lines changed: 17 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,21 @@`
	`1`	`+`
`1`	`2`	`import difflib`
`2`	`3`
	`4`	`+def getMaxSpaces(file):`
	`5`	`+ max = float('-inf')`
	`6`	`+ for ele in file:`
	`7`	`+ ele = ele.strip()`
	`8`	`+ if(len(ele) > max):`
	`9`	`+ max = len(ele)`
	`10`	`+ return max`
	`11`	`+`
`3`	`12`	`def calcDiff(firstFile , secondFile):`
`4`	`13`	`diff = difflib.ndiff(firstFile , secondFile)`
`5`		`- delta = ''.join(x[2:] for x in diff if x.startswith('+ '))`
`6`		`- deltaNoSpace = delta.split('\n')`
`7`		`- print('CHANGED LINES ARE:-\n-----------------')`
`8`		`- for ele in deltaNoSpace:`
`9`		`- print(ele.strip())`
`10`		`- print('-----------------\n')`
	`14`	`+ deltainit = ''.join(x[2:] for x in diff if x.startswith('+ '))`
	`15`	`+ deltainit = deltainit.split('\n')`
	`16`	`+ maxspacesinit = getMaxSpaces(deltainit)`
	`17`	`+ print('CHANGED LINES ARE:-\n' , '-' * maxspacesinit)`
	`18`	`+ for ele in deltainit:`
	`19`	`+ print(str(ele.strip()) , ' ' * (maxspacesinit - len(ele.strip())), '+\|')`
	`20`	`+ print('' , '-' * maxspacesinit)`
	`21`	`+`

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,20 @@`
`5`	`5`	`import time`
`6`	`6`	`import diffcalc`
`7`	`7`	`mypath = os.getcwd()`
`8`		`-onlyfiles = [f for f in listdir(mypath) if isfile(join(mypath, f))]`
	`8`	`+nestfiles = []`
	`9`	`+# add folders that you don't want to listen to`
	`10`	`+ignoredirs = ['.git' , '.idea' , '__pycache__' , 'node_modules']`
	`11`	`+# gets the list of all nested files`
	`12`	`+def getNestedFiles(rootDir):`
	`13`	`+ for path , subdirs , files in os.walk(rootDir):`
	`14`	`+ if(all(ele not in path for ele in ignoredirs)):`
	`15`	`+ for name in files:`
	`16`	`+ nestfiles.append(join(path , name))`
	`17`	`+ return nestfiles`
	`18`	`+`
	`19`	`+onlyfiles = getNestedFiles(mypath)`
	`20`	`+`
	`21`	`+# Reads and appends the contents of each file`
`9`	`22`	`def read_file():`
`10`	`23`	`filecontent = []`
`11`	`24`	`for file in onlyfiles:`
`@@ -50,6 +63,3 @@ def ischanged(url , branch):`
`50`	`63`	`git.push(url , branch)`
`51`	`64`	`initial = current`
`52`	`65`
`53`		`-`
`54`		`-`
`55`		`-`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,35 @@`
`7`	`7`	`if(file.endswith('.py') and file != 'install.py'):`
`8`	`8`	`files.append(file)`
`9`	`9`	`print(files)`
	`10`	`+`
	`11`	`+def checkForIgnore(dst):`
	`12`	`+ return os.path.isfile(os.path.join(dst , '.gitignore'))`
	`13`	`+`
	`14`	`+def addToIgnore(dst):`
	`15`	`+ with open(os.path.join(dst , '.gitignore') , "a") as f:`
	`16`	`+ f.write('\n/auto-scripts')`
	`17`	`+ f.close()`
	`18`	`+`
	`19`	`+def makeIgnore(dst):`
	`20`	`+ f = open(os.path.join(dst , '.gitignore') , "x")`
	`21`	`+ f.write('/auto-scripts')`
	`22`	`+ f.close()`
	`23`	`+`
`10`	`24`	`def copyfiles(file:str , dst:str):`
`11`	`25`	`copy(file , dst)`
`12`	`26`	`print('Installation Successful\n')`
`13`	`27`
`14`	`28`	`def installfiles():`
`15`	`29`	`location = input('Enter installation directory: ')`
	`30`	`+ if(checkForIgnore(location)):`
	`31`	`+ print('.gitignore found')`
	`32`	`+ addToIgnore(location)`
	`33`	`+ else:`
	`34`	`+ print('.gitignore not found, creating one')`
	`35`	`+ makeIgnore(location)`
	`36`	`+ addToIgnore(location)`
	`37`	`+ os.makedirs(os.path.join(location , 'auto-scripts'))`
	`38`	`+ location = os.path.join(location , 'auto-scripts')`
`16`	`39`	`print('Installing Files')`
`17`	`40`	`for file in files:`
`18`	`41`	`print('Installing %s' % file)`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`import repoInfo,filechange`
`3`	`2`	`import gitcommands as git`
`4`	`3`	`def init():`
`@@ -19,4 +18,4 @@ def init():`
`19`	`18`	`filechange.ischanged(info[0] , info[1])`
`20`	`19`
`21`	`20`	`if __name__ == '__main__':`
`22`		`- init()`
	`21`	`+ init()`

Comments

(0)