From 0bea2ab9f9cd3869ed887a33c48997af93346089 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 2 May 2020 18:15:48 +0000 Subject: [PATCH] Remove debug --- git.py | 18 ------------------ inbox.py | 6 ------ 2 files changed, 24 deletions(-) diff --git a/git.py b/git.py index f4542528..61f51d45 100644 --- a/git.py +++ b/git.py @@ -29,7 +29,6 @@ def getGitProjectName(baseDir: str, nickname: str, domain: str, and should match against a list of projects which the account holder wants to receive """ - print('Debug git subject ' + subject) gitProjectsFilename = \ baseDir + '/accounts/' + nickname + '@' + domain + '/gitprojects.txt' if not os.path.isfile(gitProjectsFilename): @@ -46,38 +45,28 @@ def isGitPatch(baseDir: str, nickname: str, domain: str, """Is the given post content a git patch? """ # must have a subject line - print('Debug git 11: ' + content) if not subject: return False - print('Debug git 12') if '[PATCH]' not in content: return False - print('Debug git 13') if '---' not in content: return False - print('Debug git 14') if 'diff ' not in content: return False - print('Debug git 15') if 'From:' not in content: return False - print('Debug git 16') if 'Date:' not in content: return False - print('Debug git 17') if 'Subject:' not in content: return False - print('Debug git 18') if '
' not in content: if '
' not in content: return False - print('Debug git 19') projectName = \ getGitProjectName(baseDir, nickname, domain, subject) if not projectName: return False - print('Debug git 20') return True @@ -85,15 +74,12 @@ def receiveGitPatch(baseDir: str, nickname: str, domain: str, subject: str, content: str) -> bool: """Receive a git patch """ - print('Debug git 21') if not isGitPatch(baseDir, nickname, domain, subject, content): return False - print('Debug git 22') contentStr = gitFormatContent(content) - print('Debug git 23: ' + contentStr) patchLines = contentStr.split('\n') patchFilename = None projectDir = None @@ -101,7 +87,6 @@ def receiveGitPatch(baseDir: str, nickname: str, domain: str, baseDir + '/accounts/' + nickname + '@' + domain + \ '/patches' # get the subject line and turn it into a filename - print('Debug git 24: ' + str(patchLines)) for line in patchLines: if line.startswith('Subject:'): patchSubject = \ @@ -119,9 +104,7 @@ def receiveGitPatch(baseDir: str, nickname: str, domain: str, projectDir + '/' + patchSubject + '.patch' break if not patchFilename: - print('Debug git 25') return False - print('Debug git 26') with open(patchFilename, "w") as patchFile: patchFile.write(contentStr) patchNotifyFilename = \ @@ -130,5 +113,4 @@ def receiveGitPatch(baseDir: str, nickname: str, domain: str, with open(patchNotifyFilename, "w") as patchFile: patchFile.write(contentStr) return True - print('Debug git 27') return False diff --git a/inbox.py b/inbox.py index d4845695..baebe2b8 100644 --- a/inbox.py +++ b/inbox.py @@ -2047,26 +2047,20 @@ def inboxAfterCapabilities(recentPostsCache: {}, maxRecentPosts: int, postJsonObject, maxMentions, maxEmoji): # check for incoming git patches - print('Debug git 1') if isinstance(postJsonObject['object'], dict): - print('Debug git 2') pprint(postJsonObject) if postJsonObject['object'].get('content') and \ postJsonObject['object'].get('summary'): - print('Debug git 3') if receiveGitPatch(baseDir, nickname, domain, postJsonObject['object']['summary'], postJsonObject['object']['content']): - print('Debug git 4') gitPatchNotify(baseDir, handle, postJsonObject['object']['summary'], postJsonObject['object']['content']) elif '[PATCH]' in postJsonObject['object']['content']: - print('Debug git 5') print('WARN: git patch not accepted - ' + postJsonObject['object']['summary']) return False - print('Debug git 6') # replace YouTube links, so they get less tracking data replaceYouTube(postJsonObject)