[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2599] trunk/py/scripts/addons/ render_renderfarmfi.py: - Hide completed and canceled sessions in the session list

[Jesse Kaukonen]

Revision: 2599
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2599
Author:   gekko
Date:     2011-11-10 12:19:55 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
- Hide completed and canceled sessions in the session list
- Fixed a bug with the cancel button never triggering due to checking the wrong list of sessions

Modified Paths:
--------------
    trunk/py/scripts/addons/render_renderfarmfi.py

Modified: trunk/py/scripts/addons/render_renderfarmfi.py
===================================================================
--- trunk/py/scripts/addons/render_renderfarmfi.py	2011-11-08 19:36:40 UTC (rev 2598)
+++ trunk/py/scripts/addons/render_renderfarmfi.py	2011-11-10 12:19:55 UTC (rev 2599)
@@ -19,9 +19,9 @@
 bl_info = {
     "name": "Renderfarm.fi",
     "author": "Nathan Letwory <nathan at letworyinteractive.com>, Jesse Kaukonen <jesse.kaukonen at gmail.com>",
-    "version": (9,),
-    "blender": (2, 5, 9),
-    "api": 40652,
+    "version": (10,),
+    "blender": (2, 6, 0),
+    "api": 41723,
     "location": "Render > Engine > Renderfarm.fi",
     "description": "Send .blend as session to http://www.renderfarm.fi to render",
     "warning": "",
@@ -792,8 +792,8 @@
     bpy.ore_complete_session_queue = []
     bpy.ore_complete_session_queue.extend(bpy.ore_pending_sessions)
     bpy.ore_complete_session_queue.extend(bpy.ore_active_sessions)
-    bpy.ore_complete_session_queue.extend(bpy.ore_completed_sessions)
-    bpy.ore_complete_session_queue.extend(bpy.ore_cancelled_sessions)
+    #bpy.ore_complete_session_queue.extend(bpy.ore_completed_sessions)
+    #bpy.ore_complete_session_queue.extend(bpy.ore_cancelled_sessions)
     
     bpy.ore_active_session_queue = bpy.ore_complete_session_queue
     updateSessionList(ore.all_sessions, ore)
@@ -815,7 +815,7 @@
         sce = context.scene
         ore = sce.ore_render
         userproxy = xmlrpc.client.ServerProxy(r'https://xmlrpc.renderfarm.fi/user')
-        if len(bpy.ore_sessions)>0:
+        if len(bpy.ore_complete_session_queue)>0:
             s = bpy.ore_complete_session_queue[ore.selected_session]
             try:
                 userproxy.user.cancelSession(ore.username, ore.hash, int(s.id))
@@ -957,8 +957,8 @@
         
         bpy.ore_complete_session_queue.extend(bpy.ore_pending_sessions)
         bpy.ore_complete_session_queue.extend(bpy.ore_active_sessions)
-        bpy.ore_complete_session_queue.extend(bpy.ore_completed_sessions)
-        bpy.ore_complete_session_queue.extend(bpy.ore_cancelled_sessions)
+        #bpy.ore_complete_session_queue.extend(bpy.ore_completed_sessions)
+        #bpy.ore_complete_session_queue.extend(bpy.ore_cancelled_sessions)
         
         bpy.ore_active_session_queue = bpy.ore_complete_session_queue
         updateSessionList(ore.all_sessions, ore)