mirror of https://gitlab.com/bashrc2/epicyon
Tidying
parent
0e2b1065f6
commit
2956856e76
9
git.py
9
git.py
|
@ -21,7 +21,8 @@ def getGitProjectName(baseDir: str, nickname: str, domain: str,
|
||||||
if not os.path.isfile(gitProjectsFilename):
|
if not os.path.isfile(gitProjectsFilename):
|
||||||
return None
|
return None
|
||||||
projectName = None
|
projectName = None
|
||||||
for word in subject.lower().split(' '):
|
subjectLineWords = subject.lower().split(' ')
|
||||||
|
for word in subjectLineWords:
|
||||||
if word + '\n' in open(gitProjectsFilename).read():
|
if word + '\n' in open(gitProjectsFilename).read():
|
||||||
return word
|
return word
|
||||||
return projectName
|
return projectName
|
||||||
|
@ -64,6 +65,9 @@ def receiveGitPatch(baseDir: str, nickname: str, domain: str,
|
||||||
if not isGitPatch(baseDir, nickname, domain,
|
if not isGitPatch(baseDir, nickname, domain,
|
||||||
subject, content):
|
subject, content):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
# replace html formatting, so that it's more
|
||||||
|
# like the original patch file
|
||||||
contentStr = content.replace('<br>','\n').replace('<br />','\n')
|
contentStr = content.replace('<br>','\n').replace('<br />','\n')
|
||||||
contentStr = contentStr.replace('<p>','').replace('</p>','\n')
|
contentStr = contentStr.replace('<p>','').replace('</p>','\n')
|
||||||
|
|
||||||
|
@ -76,8 +80,7 @@ def receiveGitPatch(baseDir: str, nickname: str, domain: str,
|
||||||
patchSubject = \
|
patchSubject = \
|
||||||
line.replace('Subject:', '').replace('/', '|').strip()
|
line.replace('Subject:', '').replace('/', '|').strip()
|
||||||
projectName = \
|
projectName = \
|
||||||
getGitProjectName(baseDir, nickname, domain,
|
getGitProjectName(baseDir, nickname, domain, subject)
|
||||||
subject)
|
|
||||||
patchDir = \
|
patchDir = \
|
||||||
baseDir + '/accounts/' + nickname + '@' + domain + \
|
baseDir + '/accounts/' + nickname + '@' + domain + \
|
||||||
'/patches/' + projectName
|
'/patches/' + projectName
|
||||||
|
|
Loading…
Reference in New Issue