Various fixes in viewer

diff --git a/melon-view.py b/melon-view.py
index 16a058332cdf57f80c6e6f6b3088cc4742aad8ee..6d0a1435504ecb91372edfe4d5e683a3cf8dd062 100755 (executable)
--- a/melon-view.py
+++ b/melon-view.py
@@ -29,7 +29,7 @@ def get_app_info(filename):
                if l[:2]=='!!' and l[-2:]=='!!':
                        last_complete_line = l
        l = last_complete_line[2:-2].split("&")
-       return AppInfo(l[0],l[1],l[2],l[3],int(l[4]))
+       return AppInfo(l[0],l[1],l[2],l[3],int(float(l[4])))
 
 
 def get_apps_info():
@@ -37,7 +37,7 @@ def get_apps_info():
        for dir in log_dirs:
                filenames = os.listdir(dir)
                for f in filenames:
-                       if f[-6:] == ".melon":
+                       if f[:6] == "melon-":
                                apps.append(get_app_info(dir+os.sep+f))
        return apps
 
@@ -80,7 +80,7 @@ while not exit:
                attribs = curses.A_NORMAL
                stdscr.addstr(3*i+1, 2, app.name, attribs)
                stdscr.addstr(3*i+1, 65, (app.user+"@"+app.machine)[:barsize], attribs)
-               stdscr.addstr(3*i+2, 2, app.status[cur_x_pos:], attribs)
+               stdscr.addstr(3*i+2, 2, app.status[cur_x_pos:cur_x_pos+57], attribs)
 
                stdscr.hline(3*i+2, 65, "-", barsize)
                stdscr.hline(3*i+2, 65, "+", int((app.progress/100.0)*barsize))