Only use simple json for Jarvis, newer versions won't need it

xbmc · Jan 20, 2017 · 83c38e5 · 83c38e5
1 parent 805ec12
commit 83c38e5
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/generators/app/templates/addon.xml b/generators/app/templates/addon.xml
@@ -3,7 +3,7 @@
     <requires>
         <import addon="xbmc.python" version="<%= props.kodiVersion %>"/>
 <%_ if (props.type == 'Plugin') { -%>        <import addon="script.module.routing" version="0.2.0"/><% } %>
-<%_ if (props.type == 'Plugin' || props.type == 'Script' || props.type == 'Service') { -%>        <import addon="script.module.simplejson" version="3.3.0"/><% } %>
+<%_ if (props.kodiVersion == '2.24.0' && (props.type == 'Plugin' || props.type == 'Script' || props.type == 'Service')) { -%>        <import addon="script.module.simplejson" version="3.3.0"/><% } %>
     </requires>
     <% if (props.type == 'Contextmenu') { -%><extension point="kodi.context.item" library="context.py">
     <item>

diff --git a/generators/app/templates/resources/lib/utilities.py b/generators/app/templates/resources/lib/utilities.py
@@ -6,11 +6,14 @@
 import sys
 import logging
 
-
+<%_ if (props.kodiVersion == '2.24.0') { -%>
 if sys.version_info >= (2, 7):
     import json as json
 else:
     import simplejson as json
+<%_ } else { -%>
+import json as json
+<% } %>
 
 # read settings
 ADDON = xbmcaddon.Addon('<%= props.scriptid %>')

diff --git a/test/app.js b/test/app.js
@@ -159,7 +159,8 @@ describe('generate plugin', function () {
     assert.fileContent('addon.xml', '<import addon="xbmc.python" version="2.25.0"/>');
     assert.fileContent('addon.xml', '<provides>video</provides>');
     assert.fileContent('addon.xml', '<import addon="script.module.routing" version="');
-    assert.fileContent('addon.xml', '<import addon="script.module.simplejson" version="');
+    assert.noFileContent('addon.xml', '<import addon="script.module.simplejson" version="');
+    assert.noFileContent('resources/lib/utilities.py', 'import simplejson as json');
   });
 });
 
@@ -268,7 +269,8 @@ describe('generate script', function () {
     assert.fileContent('addon.xml', '<platform>all</platform>');
     assert.fileContent('addon.xml', '<import addon="xbmc.python" version="2.25.0"/>');
     assert.fileContent('addon.xml', '<provides>executable</provides>');
-    assert.fileContent('addon.xml', '<import addon="script.module.simplejson" version="');
+    assert.noFileContent('addon.xml', '<import addon="script.module.simplejson" version="');
+    assert.noFileContent('resources/lib/utilities.py', 'import simplejson as json');
   });
 });
 
@@ -324,6 +326,33 @@ describe('generate service', function () {
     assert.fileContent('addon.xml', ' provider-name="Me">');
     assert.fileContent('addon.xml', '<platform>all</platform>');
     assert.fileContent('addon.xml', '<import addon="xbmc.python" version="2.25.0"/>');
+    assert.noFileContent('addon.xml', '<import addon="script.module.simplejson" version="');
+    assert.noFileContent('resources/lib/utilities.py', 'import simplejson as json');
+  });
+});
+
+describe('check simplejson for jarvis', function () {
+  before(function () {
+    return helpers.run(path.join(__dirname, '../generators/app'))
+      .withPrompts({
+        type: 'Service',
+        scriptid: 'service.test',
+        start: 'login',
+        scriptname: 'My service name',
+        kodiVersion: '2.24.0',
+        platforms: 'all',
+        license: 'MIT',
+        authors: 'Me',
+        summary: 'My summary',
+        authorName: 'My real name',
+        email: 'test@test.de',
+        website: 'www.kodi.tv'
+      })
+      .toPromise();
+  });
+
+  it('check service addon.xml content', function () {
     assert.fileContent('addon.xml', '<import addon="script.module.simplejson" version="');
+    assert.fileContent('resources/lib/utilities.py', 'import simplejson as json');
   });
 });