From e4ccbdc45bda2d58776eb8a3186c627863d4e8b3 Mon Sep 17 00:00:00 2001 From: stehpancar Date: Thu, 14 Jan 2016 13:31:29 +0100 Subject: [PATCH 1/2] Return code 226: string matching updated (changed in FileZilla Server) Somwhere between FileZilla_Server-0_9_24 and FileZilla_Server-0_9_54 a status message changed from "226 Transfer OK" to "226 Successfully transferred". See ControlSocket.cpp of FileZilla_Server. Now successful transfers are found again. --- FLACore.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FLACore.py b/FLACore.py index 8a81ac3..7f10296 100644 --- a/FLACore.py +++ b/FLACore.py @@ -1174,7 +1174,9 @@ def analyze((m,p,d,t,u,i,a),lineCtr): print msg, lineCtr+1 elif parsedAction[0] == '226' and ((parsedAction[1] == 'ABOR' and parsedAction[2] == 'command') or \ (parsedAction[1] == 'Transfer' and (parsedAction[2] == 'OK' or \ - parsedAction[2] == 'OK,'))): + parsedAction[2] == 'OK,')) or \ + (parsedAction[1] == 'Successfully' and (parsedAction[2] == 'transferred' or \ + parsedAction[2] == 'transferred,'))): tempM = G.events.getStored(m,u,p,True) if grabAfterUser(tempM,2) == 'began downloading' or grabAfterUser(tempM,2) == 'restarted download': msg = "User '" + u + "' finished downloading '" + G.events.getHeldStatistic(m,u,p)[5] + "'." From ebf5061dacc201417d01e04b084d0c245b7be39c Mon Sep 17 00:00:00 2001 From: stehpancar Date: Thu, 14 Jan 2016 13:36:17 +0100 Subject: [PATCH 2/2] Open logfiles with utf-8 encoding forced. --- FLACore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FLACore.py b/FLACore.py index 7f10296..046daf1 100644 --- a/FLACore.py +++ b/FLACore.py @@ -1987,7 +1987,7 @@ def processAndExecute(argv,nextArg): discInst = None G.logFile = argv[nextArg] - f = open(G.logFile) + f = open(G.logFile, encoding="utf-8") lineCtr = 0 G.line = 1 if (G.pFlag and not G.sFlag and (G.parseFrom != -1 or G.parseTill != -1)) or (G.fFlag and G.specifiedLineNum == -1):