From 2956856e76cd8ab2ec979c3d8913eb2cb33c31cc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 2 May 2020 16:05:28 +0000 Subject: [PATCH] Tidying --- git.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/git.py b/git.py index cb5c34888..5b6977c64 100644 --- a/git.py +++ b/git.py @@ -21,7 +21,8 @@ def getGitProjectName(baseDir: str, nickname: str, domain: str, if not os.path.isfile(gitProjectsFilename): return None projectName = None - for word in subject.lower().split(' '): + subjectLineWords = subject.lower().split(' ') + for word in subjectLineWords: if word + '\n' in open(gitProjectsFilename).read(): return word return projectName @@ -64,9 +65,12 @@ def receiveGitPatch(baseDir: str, nickname: str, domain: str, if not isGitPatch(baseDir, nickname, domain, subject, content): return False + + # replace html formatting, so that it's more + # like the original patch file contentStr = content.replace('
','\n').replace('
','\n') contentStr = contentStr.replace('

','').replace('

','\n') - + patchLines = contentStr.split('\n') patchFilename = None patchDir = None @@ -76,8 +80,7 @@ def receiveGitPatch(baseDir: str, nickname: str, domain: str, patchSubject = \ line.replace('Subject:', '').replace('/', '|').strip() projectName = \ - getGitProjectName(baseDir, nickname, domain, - subject) + getGitProjectName(baseDir, nickname, domain, subject) patchDir = \ baseDir + '/accounts/' + nickname + '@' + domain + \ '/patches/' + projectName