Merge remote-tracking branch 'upstream/release-v0.5.x' into mp3

Author: christianmemije

kolibri/plugins/media_player/assets/src/views/index.vue

@@ -314,6 +314,11 @@
   $video-player-font-size = 12px
 
 
+  /* Hide control bar when playing & inactive */
+  .vjs-has-started.vjs-playing.vjs-user-inactive
+    .vjs-control-bar
+      visibility: hidden
+
 
   /*** CUSTOM VIDEOJS SKIN ***/
   .custom-skin

kolibri/tasks/api.py

@@ -24,8 +24,7 @@
 from barbequeue.common.classes import State
 
 from .permissions import IsDeviceOwnerOnly
-from .apps import client
-
+from .client import get_client
 
 logging = logger.getLogger(__name__)
 
@@ -37,15 +36,15 @@ class TasksViewSet(viewsets.ViewSet):
     permission_classes = (IsDeviceOwnerOnly,)
 
     def list(self, request):
-        jobs_response = [_job_to_response(j) for j in client.all_jobs()]
+        jobs_response = [_job_to_response(j) for j in get_client().all_jobs()]
         return Response(jobs_response)
 
     def create(self, request):
         # unimplemented. Call out to the task-specific APIs for now.
         pass
 
     def retrieve(self, request, pk=None):
-        task = _job_to_response(client.status(pk))
+        task = _job_to_response(get_client().status(pk))
         return Response(task)
 
     def destroy(self, request, pk=None):
@@ -73,11 +72,11 @@ def startremoteimport(self, request):
                 _("The requested channel does not exist on the content server")
             )
 
-        task_id = client.schedule(
+        task_id = get_client().schedule(
             _networkimport, channel_id, track_progress=True)
 
         # attempt to get the created Task, otherwise return pending status
-        resp = _job_to_response(client.status(task_id))
+        resp = _job_to_response(get_client().status(task_id))
 
         return Response(resp)
 
@@ -92,11 +91,11 @@ def startlocalimport(self, request):
             raise serializers.ValidationError(
                 "The 'drive_id' field is required.")
 
-        job_id = client.schedule(
+        job_id = get_client().schedule(
             _localimport, request.data['drive_id'], track_progress=True)
 
         # attempt to get the created Task, otherwise return pending status
-        resp = _job_to_response(client.status(job_id))
+        resp = _job_to_response(get_client().status(job_id))
 
         return Response(resp)
 
@@ -111,11 +110,11 @@ def startlocalexport(self, request):
             raise serializers.ValidationError(
                 "The 'drive_id' field is required.")
 
-        job_id = client.schedule(
+        job_id = get_client().schedule(
             _localexport, request.data['drive_id'], track_progress=True)
 
         # attempt to get the created Task, otherwise return pending status
-        resp = _job_to_response(client.status(job_id))
+        resp = _job_to_response(get_client().status(job_id))
 
         return Response(resp)
 
@@ -129,7 +128,7 @@ def cleartask(self, request):
             raise serializers.ValidationError(
                 "The 'task_id' field is required.")
 
-        client.clear(force=True)
+        get_client().clear(force=True)
         return Response({})
 
     @list_route(methods=['get'])

kolibri/tasks/apps.py

@@ -1,11 +1,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from django.apps import AppConfig
-from django.conf import settings
-
-from barbequeue.client import SimpleClient
-
-client = None
 
 
 class KolibriTasksConfig(AppConfig):
@@ -14,6 +9,4 @@ class KolibriTasksConfig(AppConfig):
     verbose_name = 'Kolibri Tasks'
 
     def ready(self):
-        global client
-        client = SimpleClient(app="kolibri", storage_path=settings.QUEUE_JOB_STORAGE_PATH)
-        client.clear(force=True)
+        pass

kolibri/tasks/client.py

@@ -0,0 +1,22 @@
+import atexit
+
+from django.conf import settings
+
+from barbequeue.client import SimpleClient
+
+_client = None
+
+
+def get_client():
+    """
+
+    :return: the SimpleClient object
+    """
+
+    global _client
+    if not _client:
+        # not initialized, initialize it
+        _client = SimpleClient(app="kolibri", storage_path=settings.QUEUE_JOB_STORAGE_PATH)
+        atexit.register(_client.shutdown)
+
+    return _client

requirements/base.txt

@@ -10,7 +10,7 @@ djangorestframework-csv==1.4.1
 tqdm==4.8.3                     # progress bars
 requests==2.10.0
 https://github.com/cherrypy/cherrypy/archive/v6.2.0.zip#egg=cherrypy
-https://github.com/learningequality/barbequeue/archive/d655b.zip#egg=barbequeue
+https://github.com/learningequality/barbequeue/archive/aa729.zip#egg=barbequeue
 porter2stemmer==1.0
 unicodecsv==0.14.1
 metafone==0.5