Merge pull request #151 from callym/windows-fixes

Windows fixes

flamenco/manager/application/config.py.example

 import os
+import tempfile
 import socket
+
 class Config(object):
     DEBUG = True
     PORT = 7777
@@ -20,7 +22,7 @@ class Config(object):
     SETTINGS_PATH_LINUX = ""
     SETTINGS_PATH_OSX = ""
     SETTINGS_PATH_WIN = ""
-    TMP_FOLDER = '/tmp/'
+    TMP_FOLDER = tempfile.gettempdir()
     THUMBNAIL_EXTENSIONS = set(['png'])
     MANAGER_STORAGE = '{0}/static/storage'.format(
         os.path.join(os.path.dirname(__file__)))

flamenco/manager/manage.py

@@ -70,7 +70,11 @@ def runserver():
 
         render_config = JobType(
             name='simple_blender_render',
-            value=json.dumps(configuration))
+            properties=json.dumps(configuration))
+        db.session.add(render_config)
+        render_config = JobType(
+            name='blender_simple_render',
+            properties=json.dumps(configuration))
         db.session.add(render_config)
         db.session.commit()
     # Bake config
@@ -90,7 +94,7 @@ def runserver():
 
         bake_config = JobType(
             name='blender_bake_anim_cache',
-            value=json.dumps(configuration))
+            properties=json.dumps(configuration))
         db.session.add(bake_config)
         db.session.commit()
 

flamenco/server/application/config.py.example

 import os
+import tempfile
 
 class Config(object):
     SQLALCHEMY_DATABASE_URI='sqlite:///' + os.path.join(os.path.dirname(__file__), '../server.sqlite')
     DEBUG=True
     PORT=9999
     HOST='0.0.0.0' # or 'localhost'
-    TMP_FOLDER = '/tmp/'
+    TMP_FOLDER = tempfile.gettempdir()
     THUMBNAIL_EXTENSIONS = set(['png'])
     SERVER_STORAGE = '{0}/static/storage'.format(
         os.path.join(os.path.dirname(__file__)))

flamenco/server/migrations/versions/2d4e61f9aa2a_user_id_in_job_table.py

@@ -15,10 +15,12 @@ import sqlalchemy as sa
 
 
 def upgrade():
-    op.add_column('job', sa.Column('user_id', sa.Integer(), nullable=True))
-    op.create_foreign_key(None, 'job', 'user', ['user_id'], ['id'])
+    with op.batch_alter_table('job') as batch_op:
+        batch_op.add_column(sa.Column('user_id', sa.Integer(), nullable=True))
+        batch_op.create_foreign_key('job-user_id', 'user', ['user_id'], ['id'])
 
 
 def downgrade():
-    op.drop_constraint(None, 'job', type_='foreignkey')
-    op.drop_column('job', 'user_id')
+    with op.batch_alter_table('job') as batch_op:
+        batch_op.drop_constraint('job-user_id', type_='foreignkey')
+        batch_op.drop_column('user_id')

flamenco/server/migrations/versions/3a2606d017ea_removing_tasks_count_tasks_completed.py

@@ -16,15 +16,17 @@ from sqlalchemy.dialects import mysql
 
 def upgrade():
     ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('job', sa.Column('tasks_status', sa.String(256), nullable=True))
-    op.drop_column('job', 'tasks_count')
-    op.drop_column('job', 'tasks_completed')
+    with op.batch_alter_table('job') as batch_op:
+        batch_op.add_column(sa.Column('tasks_status', sa.String(256), nullable=True))
+        batch_op.drop_column('tasks_count')
+        batch_op.drop_column('tasks_completed')
     ### end Alembic commands ###
 
 
 def downgrade():
     ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('job', sa.Column('tasks_completed', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
-    op.add_column('job', sa.Column('tasks_count', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
-    op.drop_column('job', 'tasks_status')
+     with op.batch_alter_table('job') as batch_op:
+        batch_op.add_column(sa.Column('tasks_completed', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
+        batch_op.add_column(sa.Column('tasks_count', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
+        batch_op.drop_column('tasks_status')
     ### end Alembic commands ###

flamenco/worker/application/config.py.example

+import tempfile
+
 class Config(object):
     DEBUG = False
     FLAMENCO_MANAGER = 'localhost:7777'
     HOST = '0.0.0.0' # or localhost
     PORT = 5000
-    TMP_FOLDER = '/tmp/'
+    TMP_FOLDER = tempfile.gettempdir()

plugins/blender/render_flamenco.py

@@ -257,12 +257,12 @@ class bamToRenderfarm (bpy.types.Operator):
             return {'CANCELLED'}
 
         # We retrieve the username via the .blender_id profiles file. If no file
-        # is available we fail silently and set the username to ""
+        # is available we fail silently and set the username to "default"
         profile = ProfilesUtility.get_active_profile()
         if profile:
             username = profile['username']
         else:
-            username = ""
+            username = "default"
 
         job_settings = {
             'frames': "{0}-{1}".format(scn.frame_start, scn.frame_end),