cuemsutils 0.0.9rc2__tar.gz → 0.0.9rc4__tar.gz

{cuemsutils-0.0.9rc2 → cuemsutils-0.0.9rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuemsutils
-Version: 0.0.9rc2
+Version: 0.0.9rc4
 Summary: Reusable classes and methods for CueMS system
 Project-URL: Documentation, https://github.com/stagesoft/cuems-utils#readme
 Project-URL: Issues, https://github.com/stagesoft/cuems-utils/issues

{cuemsutils-0.0.9rc2 → cuemsutils-0.0.9rc4}/src/cuemsutils/xml/schemas/network_map.xsd

@@ -23,7 +23,7 @@
             <xs:element name="name" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"/>
             <xs:element name="node_type" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"/>
             <xs:element name="ip" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"/>
-            <xs:element name="port" minOccurs="1" maxOccurs="1" type="cms:NonEmptyString"/>
+            <xs:element name="port" minOccurs="1" maxOccurs="1" type="cms:NonPrivilegedPort"/>
             <xs:element name="online" minOccurs="1" maxOccurs="1" type="cms:BoolType"/>
         </xs:sequence>
     </xs:complexType>
@@ -54,4 +54,11 @@
             <xs:pattern value=".*[^\s].*" />
         </xs:restriction>
     </xs:simpleType>
+
+    <xs:simpleType name="NonPrivilegedPort">
+        <xs:restriction base="xs:int">
+            <xs:minInclusive value="1024" />
+            <xs:maxInclusive value="65535" />
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>

{cuemsutils-0.0.9rc2 → cuemsutils-0.0.9rc4}/src/cuemsutils/xml/schemas/script.xsd

@@ -272,10 +272,9 @@
     <xs:complexContent>
       <xs:extension base="cms:CueType">
         <xs:sequence>
-          <!-- A dmx media file path which can be none -->
-          <xs:element name="Media" type="cms:MediaType" />
-          <xs:element name="fadein_time" type="xs:integer" />
-          <xs:element name="fadeout_time" type="xs:integer" />
+          <xs:element name="fadein_time" type="xs:float" />
+          <xs:element name="fadeout_time" type="xs:float" />
+          <xs:element name="Scene" type="cms:DmxSceneType" />
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -284,11 +283,11 @@
   <!-- Dmx scene type -->
   <xs:complexType name="DmxSceneType">
     <xs:sequence>
-      <xs:element name="uuid" type="xs:string" />
+      <xs:element name="id" type="xs:string" />
       <xs:element name="name" type="cms:NameStringType" />
       <xs:element name="description" type="cms:DescriptionStringType" />
       <!-- We allow a max of 10 universes un a scene by now -->
-      <xs:element name="DmxUniverse" type="cms:DmxUniverseType">
+      <xs:element name="Universe" type="cms:DmxUniverseType">
         <!-- They must be unique id's specs for the channels -->
         <xs:unique name="unique_universe_number">
           <xs:selector xpath="DmxUniverse" />
@@ -322,11 +321,10 @@
 
   <!-- Dmx basic channel type -->
   <xs:complexType name="DmxChannelType">
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedByte">
-        <xs:attribute name="id" type="cms:ChannelNumberType" />
-      </xs:extension>
-    </xs:simpleContent>
+        <xs:sequence>
+          <xs:element name="num" type="cms:ChannelNumberType" />
+          <xs:element name="value" type="cms:ChannelValueType" />
+        </xs:sequence>
   </xs:complexType>
 
   <!-- SIMPLE DATA TYPES -->
@@ -344,6 +342,13 @@
     </xs:restriction>
   </xs:simpleType>
 
+    <xs:simpleType name="ChannelValueType">
+    <xs:restriction base="xs:integer">
+      <xs:minInclusive value="0" />
+      <xs:maxInclusive value="255" />
+    </xs:restriction>
+  </xs:simpleType>
+
   <xs:simpleType name="DateType">
     <xs:restriction base="xs:dateTime">
       <xs:minInclusive value="2020-01-01T00:00:00"></xs:minInclusive>

{cuemsutils-0.0.9rc2 → cuemsutils-0.0.9rc4}/src/cuemsutils/xml/schemas/settings.xsd

@@ -33,14 +33,14 @@
             <xs:element name="uuid" type="cms:NonEmptyString" />
             <xs:element name="mac" type="cms:NonEmptyString" />
             <xs:element name="osc_dest_host" type="cms:NonEmptyString" />
-            <xs:element name="oscquery_ws_port" type="xs:positiveInteger" />
-            <xs:element name="oscquery_osc_port" type="xs:positiveInteger" />
-            <xs:element name="websocket_port" type="xs:positiveInteger" />
+            <xs:element name="oscquery_ws_port" type="cms:NonPrivilegedPort" />
+            <xs:element name="oscquery_osc_port" type="cms:NonPrivilegedPort" />
+            <xs:element name="websocket_port" type="cms:NonPrivilegedPort" />
             <xs:element name="load_timeout" type="xs:positiveInteger" />
             <xs:element name="nodeconf_timeout" type="xs:positiveInteger" />
             <xs:element name="discovery_timeout" type="xs:positiveInteger" />
             <xs:element name="mtc_port" type="xs:string" />
-            <xs:element name="osc_in_port_base" type="xs:positiveInteger" />
+            <xs:element name="osc_in_port_base" type="cms:NonPrivilegedPort" />
             <xs:element name="videoplayer" type="cms:VideoPlayerType" minOccurs="0" maxOccurs="1" />
             <xs:element name="audioplayer" type="cms:AudioPlayerType" minOccurs="0" maxOccurs="1" />
             <xs:element name="dmxplayer" type="cms:DmxPlayerType" minOccurs="0" maxOccurs="1" />
@@ -117,4 +117,10 @@
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:simpleType name="NonPrivilegedPort">
+        <xs:restriction base="xs:int">
+            <xs:minInclusive value="1024" />
+            <xs:maxInclusive value="65535" />
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>