From 272b3b65c3bb34353119d17dbe3e9fa517a13c28 Mon Sep 17 00:00:00 2001 From: "Harry (Open ERP)" Date: Wed, 8 Apr 2009 16:32:54 +0530 Subject: [PATCH] [DMS]fixed_bug_330263 bzr revid: hmo@tinyerp.com-20090408110254-u5y470acfussy8un --- addons/document/ftpserver/__init__.py | 3 +-- addons/document/ftpserver/abstracted_fs.py | 25 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/addons/document/ftpserver/__init__.py b/addons/document/ftpserver/__init__.py index dcac53d6061..86f49d4901a 100644 --- a/addons/document/ftpserver/__init__.py +++ b/addons/document/ftpserver/__init__.py @@ -14,7 +14,7 @@ class ftp_server(threading.Thread): logger.notifyChannel('FTP', level, message) def run(self): - autho = authorizer.authorizer() + autho = authorizer.authorizer() ftpserver.FTPHandler.authorizer = autho ftpserver.max_cons = 300 ftpserver.max_cons_per_ip = 50 @@ -27,7 +27,6 @@ class ftp_server(threading.Thread): address = (HOST, PORT) ftpd = ftpserver.FTPServer(address, ftpserver.FTPHandler) ftpd.serve_forever() - ds = ftp_server() ds.start() diff --git a/addons/document/ftpserver/abstracted_fs.py b/addons/document/ftpserver/abstracted_fs.py index 2ce81951708..106fddfc1fc 100644 --- a/addons/document/ftpserver/abstracted_fs.py +++ b/addons/document/ftpserver/abstracted_fs.py @@ -15,6 +15,22 @@ from service import security def log(message): logger = netsvc.Logger() logger.notifyChannel('DMS', netsvc.LOG_ERROR, message) + + +def _get_month_name(month): + month=int(month) + if month==1:return 'Jan' + elif month==2:return 'Feb' + elif month==3:return 'Mar' + elif month==4:return 'Apr' + elif month==5:return 'May' + elif month==6:return 'Jun' + elif month==7:return 'Jul' + elif month==8:return 'Aug' + elif month==9:return 'Sep' + elif month==10:return 'Oct' + elif month==11:return 'Nov' + elif month==12:return 'Dec' class file_wrapper(StringIO.StringIO): def __init__(self, sstr='', ressource_id=False, dbname=None, uid=1, name=''): @@ -647,7 +663,7 @@ class abstracted_fs: listing.sort() return self.format_list(basedir, listing) - # Ok + # Ok def format_list(self, basedir, listing, ignore_err=True): """Return an iterator object that yields the entries of given directory emulating the "/bin/ls -lA" UNIX command output. @@ -686,10 +702,11 @@ class abstracted_fs: # stat.st_mtime could fail (-1) if last mtime is too old # in which case we return the local time as last mtime try: - mtime = time.strftime("%b %d %H:%M", time.localtime(st.st_mtime)) + mname=_get_month_name(time.strftime("%m", time.localtime(st.st_mtime))) + mtime = mname+' '+time.strftime("%d %H:%M", time.localtime(st.st_mtime)) except ValueError: - mtime = time.strftime("%b %d %H:%M") - + mname=_get_month_name(time.strftime("%m")) + mtime = mname+' '+time.strftime("%d %H:%M") # formatting is matched with proftpd ls output yield "%s %3s %-8s %-8s %8s %s %s\r\n" %(perms, nlinks, uname, gname, size, mtime, file.path.encode('ascii','replace').replace('?','_').split('/')[-1])