storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polish clipboard handling, clean ups, more mark functions

Browse Source
This commit is contained in:
chrys
2016-08-25 01:42:46 +02:00
parent 41caeed747
commit acd10812c6
14 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/fenrir-package/utils/mark_utils.py
View File

@ -3,12 +3,10 @@
def getTextBetweenMarks(firstMark, secondMark, inText):
if inText == None:
return ''
if isinstance(inText, list):
if not isinstance(inText, list):
inText = inText.split('\n')
if len(inText) < 1:
return ''
if inText == '':
return ''
if firstMark == None:
return ''
if secondMark == None:
@ -19,30 +17,30 @@ def getTextBetweenMarks(firstMark, secondMark, inText):
else:
endMark = firstMark.copy()
startMark = secondMark.copy()
currX = startMark['x']
currY = startMark['y']
textPart = ''
while currY <= endMark['y'] and currY <= len(inText):
if startMark['y'] == endMark['y']:
textPart += inText[currY][currX:endMark['x'] + 1]
else:
if startMark['y'] == endMark['y']:
textPart += inText[startMark['y']][startMark['x']:endMark['x'] + 1]
else:
currY = startMark['y']
while currY <= endMark['y']:
if currY < endMark['y']:
textPart += inText[currY][currX:]
if len(textPart) - len(textPart[::-1].strip()) > 0:
textPart = textPart[:len(textPart[::-1].strip())] + "\n"
if currY == startMark['y']:
textPart += inText[currY][startMark['x']:]
else:
textPart += inText[currY]
if len(inText[currY].strip()) != 0:
if len(textPart) - len(textPart[::-1].strip()) > 0:
textPart = textPart[:len(textPart[::-1].strip())] + "\n"
else:
textPart += '\n'
else:
textPart += inText[currY][:currX + 1]
currX = 0
currY += 1
textPart += inText[currY][:endMark['x'] + 1]
currY += 1
return textPart
def getTextBeforeMark(mark, inText):
if inText == None:
return ''
if isinstance(inText, list):
inText = inText.split('\n')
if len(inText) < 1:
return ''
if mark == None:
return ''
return getTextBetweenMarks({'x':0,'y':0}, mark, inText)
@ -50,10 +48,6 @@ def getTextBeforeMark(mark, inText):
def getTextAfterMark(mark, inText):
if inText == None:
return ''
if isinstance(inText, list):
inText = inText.split('\n')
if len(inText) < 1:
return ''
if mark == None:
return ''
return getTextBetweenMarks(mark, {'x':len(inText[0])-1,'y':len(inText)-1}, inText)