Ivars 6 years ago
parent
commit
00075206f0
7 changed files with 524 additions and 458 deletions
  1. 3
    4
      addon.py
  2. 1
    4
      addon.xml
  3. 7
    2
      changelog.md
  4. 0
    1
      kmake.bat
  5. 1
    0
      kodiswift/plugin.py
  6. 511
    446
      project.wpr
  7. 1
    1
      version.txt

+ 3
- 4
addon.py View File

20
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),"resources","lib", "content", "sources"))
20
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),"resources","lib", "content", "sources"))
21
 
21
 
22
 plugin = Plugin()
22
 plugin = Plugin()
23
-plugin.load_addon_settings()
23
+#plugin.load_addon_settings()
24
 use_storage = plugin.get_setting("general_use_storage",bool) # TODO vajag nočekot vai nav labāk lietot pickle
24
 use_storage = plugin.get_setting("general_use_storage",bool) # TODO vajag nočekot vai nav labāk lietot pickle
25
 storage_ttl = plugin.get_setting("general_ttl",int)
25
 storage_ttl = plugin.get_setting("general_ttl",int)
26
 use_proxy = plugin.get_setting("general_proxy_use",bool)
26
 use_proxy = plugin.get_setting("general_proxy_use",bool)
117
             print "[playstream] Save sources to storage"
117
             print "[playstream] Save sources to storage"
118
             storage["sources"] = sources
118
             storage["sources"] = sources
119
             storage.sync()
119
             storage.sync()
120
-        return plugin.finish(items, view_mode=get_view_mode(), update_listing=False, cache_to_disc=False)
120
+        return plugin.finish(items, view_mode=get_view_mode(view_mode), update_listing=False, cache_to_disc=False)
121
 
121
 
122
 def get_list(data):
122
 def get_list(data):
123
     if isinstance(data,unicode):
123
     if isinstance(data,unicode):
214
         img = icong_url + img
214
         img = icong_url + img
215
     return img
215
     return img
216
 
216
 
217
-def get_view_mode():
217
+def get_view_mode(vm):
218
     modes = {
218
     modes = {
219
         "skin.estuary": {
219
         "skin.estuary": {
220
             "None": None,
220
             "None": None,
230
         }
230
         }
231
     }
231
     }
232
     skin = xbmc.getSkinDir()
232
     skin = xbmc.getSkinDir()
233
-    vm = plugin.get_setting("general_view_mode", str)
234
     if skin in modes and vm in modes[skin]:
233
     if skin in modes and vm in modes[skin]:
235
         view_mode = modes[skin][vm]
234
         view_mode = modes[skin][vm]
236
     else:
235
     else:

+ 1
- 4
addon.xml View File

1
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
1
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2
-<addon version="0.1.53" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
2
+<addon version="0.1.55" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
3
   <requires>
3
   <requires>
4
     <import addon="xbmc.python" version="2.1.0"/>
4
     <import addon="xbmc.python" version="2.1.0"/>
5
     <import addon="script.module.requests" />
5
     <import addon="script.module.requests" />
8
   <extension point="xbmc.python.pluginsource" library="addon.py">
8
   <extension point="xbmc.python.pluginsource" library="addon.py">
9
     <provides>video</provides>
9
     <provides>video</provides>
10
   </extension>
10
   </extension>
11
-  <extension point="xbmc.python.pluginsource" library="addon.py">
12
-    <provides>video</provides>
13
-  </extension>
14
   <extension point="xbmc.service" library="service.py" />
11
   <extension point="xbmc.service" library="service.py" />
15
   <extension point="xbmc.addon.metadata">
12
   <extension point="xbmc.addon.metadata">
16
     <platform>all</platform>
13
     <platform>all</platform>

+ 7
- 2
changelog.md View File

1
-**0.1.53** (17.02.2018)
1
+**0.1.55** (18.02.2018)
2
+- [bugfix] salabots ltc (arhīvs, epg u.c.)
3
+- [bugfix] salabots filmix search
4
+- [change] replay, ltc tiešraidēs nosaukumā rāda epg
5
+
6
+**0.1.54** (17.01.2018)
2
 - [bugfix] salabots submodule
7
 - [bugfix] salabots submodule
3
 
8
 
4
-**0.1.52** (17.02.2018)
9
+**0.1.52** (17.01.2018)
5
 - [feature] PlayStream autostart opcija
10
 - [feature] PlayStream autostart opcija
6
 - [feature] View Mode opcija
11
 - [feature] View Mode opcija
7
 
12
 

+ 0
- 1
kmake.bat View File

1
 @echo off
1
 @echo off
2
 
2
 
3
 :--- Pull content submodule ---
3
 :--- Pull content submodule ---
4
-git submodule update --init -- "resources/lib/content"
5
 pushd resources\lib\content
4
 pushd resources\lib\content
6
 git checkout .
5
 git checkout .
7
 git pull
6
 git pull

+ 1
- 0
kodiswift/plugin.py View File

106
             strings_fn = os.path.join(
106
             strings_fn = os.path.join(
107
                 plugin_dir, 'resources', 'language', 'English', 'strings.po')
107
                 plugin_dir, 'resources', 'language', 'English', 'strings.po')
108
             utils.load_addon_strings(self._addon, strings_fn)
108
             utils.load_addon_strings(self._addon, strings_fn)
109
+            self.load_addon_settings()
109
 
110
 
110
     @property
111
     @property
111
     def info_type(self):
112
     def info_type(self):

+ 511
- 446
project.wpr
File diff suppressed because it is too large
View File


+ 1
- 1
version.txt View File

1
-0.1.53
1
+0.1.55