Skip to content

Updates for FileZilla_Server-0_9_54 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stehpancar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updates for FileZilla_Server-0_9_54 #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4ccbdc
Return code 226: string matching updated (changed in FileZilla Server)
stehpancar Jan 14, 2016
ebf5061
Open logfiles with utf-8 encoding forced.
stehpancar Jan 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions FLACore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] + "'."
Expand Down Expand Up @@ -1985,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):
Expand Down