simo 2.7.13__py3-none-any.whl → 2.7.15__py3-none-any.whl

simo/fleet/controllers.py

@@ -72,6 +72,14 @@ class FleeDeviceMixin:
                 config[key] = val
         return config
 
+    def _call_cmd(self, method, *args, **kwargs):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id, command='call', method=method,
+            args=args, kwargs=kwargs
+        ).publish()
+
 
 class BasicSensorMixin:
     gateway_class = FleetGatewayHandler

simo/generic/forms.py

@@ -5,6 +5,7 @@ from django import forms
 from django.forms import formset_factory
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
+from django.core.files.uploadedfile import InMemoryUploadedFile
 from simo.core.forms import HiddenField, BaseComponentForm
 from simo.core.models import Icon, Component, PublicFile
 from simo.core.controllers import (
@@ -624,25 +625,25 @@ class AudioAlertConfigForm(BaseComponentForm):
     loop = forms.BooleanField(initial=False, required=False)
     volume = forms.IntegerField(initial=30, min_value=2, max_value=100)
     players = Select2ModelMultipleChoiceField(
-        queryset=Component.objects.all(),#filter(base_type='audio-player'),
+        queryset=Component.objects.filter(base_type='audio-player'),
         url='autocomplete-component',
+        forward=(forward.Const(['audio-player',], 'base_type'),)
     )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.basic_fields.extend(['sound', 'loop', 'volume', 'players'])
-        if self.instance.id:
-            public_file = PublicFile.objects.filter(
-                component=self.instance
-            ).first()
-            if public_file:
-                self.fields['sound'].help_text = f"Currently: {public_file.file}"
+        if self.instance.config.get('sound'):
+            self.fields['sound'].help_text = \
+                f"Currently: {self.instance.config['sound']}"
 
     def clean_sound(self):
         if not self.cleaned_data.get('sound'):
             if not self.instance.pk:
                 raise forms.ValidationError("Please pick a sound!")
             return
+        if type(self.cleaned_data['sound']) != InMemoryUploadedFile:
+            return self.cleaned_data['sound']
         if self.cleaned_data['sound'].size > 1024 * 1024 * 50:
             raise forms.ValidationError("No more than 50Mb please.")
         temp_path = os.path.join(
@@ -672,19 +673,21 @@ class AudioAlertConfigForm(BaseComponentForm):
 
     def save(self, commit=True):
         obj = super().save(commit=commit)
-        if commit and self.cleaned_data.get('sound') \
-        and self.cleaned_data['sound'] != self.fields['sound'].initial:
-            public_file = PublicFile(component=obj)
-            public_file.file.save(
-                self.cleaned_data['sound'].name, self.cleaned_data['sound'],
-                save=True
-            )
-            org = PublicFile.objects.filter(
-                id=self.instance.config.get('public_file_id', 0)
-            )
-            if org:
-                org.delete()
-            self.instance.config['public_file_id'] = public_file.id
-            self.instance.config['duration'] = self.cleaned_data['sound'].duration
-            self.instance.save()
+        if type(self.cleaned_data['sound']) != InMemoryUploadedFile:
+            return obj
+
+        public_file = PublicFile(component=obj)
+        public_file.file.save(
+            self.cleaned_data['sound'].name, self.cleaned_data['sound'],
+            save=True
+        )
+        org = PublicFile.objects.filter(
+            id=self.instance.config.get('public_file_id', 0)
+        )
+        if org:
+            org.delete()
+        self.instance.config['public_file_id'] = public_file.id
+        self.instance.config['duration'] = self.cleaned_data['sound'].duration
+        self.instance.config['sound'] = self.cleaned_data['sound'].name
+        self.instance.save()
         return obj

simo/multimedia/app_widgets.py

@@ -5,7 +5,7 @@ from simo.core.app_widgets import BaseAppWidget
 class AudioPlayerWidget(BaseAppWidget):
     uid = 'audio-player'
     name = _('Audio Player')
-    size = [2, 2]
+    size = [4, 1]
 
 
 class VideoPlayerWidget(BaseAppWidget):

simo/multimedia/controllers.py

@@ -17,6 +17,7 @@ class BasePlayer(Switch):
         'duration': None,
         'position': None,
         'title': None,
+        'image_url': None,
         'library': []
     }
     default_value = 'stopped'