Merge pull request #4774 from pymedusa/hotfix/add-pids-to-js

Hotfix: v0.2.8
pymedusa · Jul 27, 2018 · f5973b2 · f5973b2
2 parents b733355 + 83d03d0
commit f5973b2
Show file tree

Hide file tree

Showing 16 changed files with 153 additions and 129 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 -----
 
+## 0.2.8 (2018-07-28)
+
+#### Fixes
+- Fixed tabs on home page when using the split home layout ([#4764](https://github.com/pymedusa/Medusa/pull/4764))
+- Fixed black screen after update ([#4774](https://github.com/pymedusa/Medusa/pull/4774))
+- Fixed error when trying to rename episodes ([#4774](https://github.com/pymedusa/Medusa/pull/4774))
+
+-----
+
 ## 0.2.7 (2018-07-27)
 
 #### New Features

diff --git a/medusa/common.py b/medusa/common.py
@@ -48,7 +48,7 @@
 # To enable, set SPOOF_USER_AGENT = True
 SPOOF_USER_AGENT = False
 INSTANCE_ID = str(uuid.uuid1())
-VERSION = '0.2.7'
+VERSION = '0.2.8'
 USER_AGENT = 'Medusa/{version} ({system}; {release}; {instance})'.format(
     version=VERSION, system=platform.system(), release=platform.release(),
     instance=INSTANCE_ID)

diff --git a/themes-default/slim/static/js/core.js b/themes-default/slim/static/js/core.js
@@ -57,6 +57,8 @@ const UTIL = {
         UTIL.exec('common'); // Load common
         UTIL.exec(controller); // Load MEDUSA[controller]
         UTIL.exec(controller, action); // Load MEDUSA[controller][action]
+
+        window.dispatchEvent(new Event('medusa-loaded'));
     }
 };
 

diff --git a/themes-default/slim/views/home.mako b/themes-default/slim/views/home.mako
@@ -11,35 +11,38 @@
 <%block name="scripts">
 <script>
 window.app = {};
-const startVue = () => {
-    window.app = new Vue({
-        store,
-        el: '#vue-wrap',
-        metaInfo: {
-            title: 'Home'
-        },
-        data() {
-            return {
-                header: 'Show List'
-            };
-        },
-        computed: Object.assign({
-            layout: {
-                get() {
-                    const { config } = this;
-                    return config.layout.home;
-                },
-                set(layout) {
-                    const { $store } = this;
-                    const page = 'home';
-                    $store.dispatch('setLayout', { page, layout });
-                }
+window.app = new Vue({
+    store,
+    el: '#vue-wrap',
+    metaInfo: {
+        title: 'Home'
+    },
+    data() {
+        return {
+            header: 'Show List'
+        };
+    },
+    computed: Object.assign({
+        layout: {
+            get() {
+                const { config } = this;
+                return config.layout.home;
+            },
+            set(layout) {
+                const { $store } = this;
+                const page = 'home';
+                $store.dispatch('setLayout', { page, layout });
             }
-        }),
-        mounted() {
         }
-    });
-};
+    }),
+    mounted() {
+        const postLoad = () => {
+            // Update VueInViewport
+            window.dispatchEvent(new Event('scroll'));
+        };
+        window.addEventListener('medusa-loaded', postLoad, { once: true });
+    }
+});
 </script>
 </%block>
 <%block name="metas">

diff --git a/themes-default/slim/views/layouts/main.mako b/themes-default/slim/views/layouts/main.mako
@@ -115,18 +115,18 @@
 
         ## Add Vue component x-templates here
         ## @NOTE: These will be usable on all pages
-        <script src="js/lib/vue.js"></script>
-        <script src="js/lib/http-vue-loader.js"></script>
-        <script src="js/lib/[email protected]"></script>
-        <script src="js/lib/vue-in-viewport-mixin.min.js"></script>
-        <script src="js/lib/vue-router.min.js"></script>
-        <script src="js/lib/vue-meta.min.js"></script>
-        <script src="js/lib/vue-snotify.min.js"></script>
-        <script src="js/lib/vue-js-toggle-button.js"></script>
-        <script src="js/lib/vuex.js"></script>
-        <script src="js/lib/vue-native-websocket-2.0.7.js"></script>
-        <script src="js/notifications.js"></script>
-        <script src="js/store.js"></script>
+        <script src="js/lib/vue.js?${sbPID}"></script>
+        <script src="js/lib/http-vue-loader.js?${sbPID}"></script>
+        <script src="js/lib/[email protected]?${sbPID}"></script>
+        <script src="js/lib/vue-in-viewport-mixin.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-router.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-meta.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-snotify.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-js-toggle-button.js?${sbPID}"></script>
+        <script src="js/lib/vuex.js?${sbPID}"></script>
+        <script src="js/lib/vue-native-websocket-2.0.7.js?${sbPID}"></script>
+        <script src="js/notifications.js?${sbPID}"></script>
+        <script src="js/store.js?${sbPID}"></script>
         <script>
             Vue.component('app-header', httpVueLoader('js/templates/app-header.vue'));
             Vue.component('scroll-buttons', httpVueLoader('js/templates/scroll-buttons.vue'));
@@ -202,7 +202,7 @@
             }
         </script>
         <%block name="scripts" />
-        <script src="js/router.js"></script>
+        <script src="js/router.js?${sbPID}"></script>
         <script>
             if (!window.app) {
                 console.info('Loading Vue with router since window.app is missing.');

diff --git a/themes-default/slim/views/testRename.mako b/themes-default/slim/views/testRename.mako
@@ -138,15 +138,15 @@ const startVue = () => {
     <tbody>
 <%
 odd = not odd
-epStr = str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)
+epStr = 's{season}e{episode}'.format(season=cur_ep_obj.season, episode=cur_ep_obj.episode)
 epList = sorted([cur_ep_obj.episode] + [x.episode for x in cur_ep_obj.related_episodes])
 if len(epList) > 1:
     epList = [min(epList), max(epList)]
 %>
         <tr class="season-${cur_season} ${'good' if curLoc == newLoc else 'wanted'} seasonstyle">
             <td class="col-checkbox">
             % if curLoc != newLoc:
-                <input type="checkbox" class="epCheck" id="${str(cur_ep_obj.season) + 'x' + str(cur_ep_obj.episode)}" name="${str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)}" />
+                <input type="checkbox" class="epCheck" id="${epStr}" name="${epStr}" />
             % endif
             </td>
             <td align="center" valign="top" class="nowrap">${"-".join(map(str, epList))}</td>

diff --git a/themes/dark/assets/js/core.js b/themes/dark/assets/js/core.js
@@ -57,6 +57,8 @@ const UTIL = {
         UTIL.exec('common'); // Load common
         UTIL.exec(controller); // Load MEDUSA[controller]
         UTIL.exec(controller, action); // Load MEDUSA[controller][action]
+
+        window.dispatchEvent(new Event('medusa-loaded'));
     }
 };
 

diff --git a/themes/dark/assets/js/core.js.map b/themes/dark/assets/js/core.js.map
diff --git a/themes/dark/templates/home.mako b/themes/dark/templates/home.mako
@@ -11,35 +11,38 @@
 <%block name="scripts">
 <script>
 window.app = {};
-const startVue = () => {
-    window.app = new Vue({
-        store,
-        el: '#vue-wrap',
-        metaInfo: {
-            title: 'Home'
-        },
-        data() {
-            return {
-                header: 'Show List'
-            };
-        },
-        computed: Object.assign({
-            layout: {
-                get() {
-                    const { config } = this;
-                    return config.layout.home;
-                },
-                set(layout) {
-                    const { $store } = this;
-                    const page = 'home';
-                    $store.dispatch('setLayout', { page, layout });
-                }
+window.app = new Vue({
+    store,
+    el: '#vue-wrap',
+    metaInfo: {
+        title: 'Home'
+    },
+    data() {
+        return {
+            header: 'Show List'
+        };
+    },
+    computed: Object.assign({
+        layout: {
+            get() {
+                const { config } = this;
+                return config.layout.home;
+            },
+            set(layout) {
+                const { $store } = this;
+                const page = 'home';
+                $store.dispatch('setLayout', { page, layout });
             }
-        }),
-        mounted() {
         }
-    });
-};
+    }),
+    mounted() {
+        const postLoad = () => {
+            // Update VueInViewport
+            window.dispatchEvent(new Event('scroll'));
+        };
+        window.addEventListener('medusa-loaded', postLoad, { once: true });
+    }
+});
 </script>
 </%block>
 <%block name="metas">

diff --git a/themes/dark/templates/layouts/main.mako b/themes/dark/templates/layouts/main.mako
@@ -115,18 +115,18 @@
 
         ## Add Vue component x-templates here
         ## @NOTE: These will be usable on all pages
-        <script src="js/lib/vue.js"></script>
-        <script src="js/lib/http-vue-loader.js"></script>
-        <script src="js/lib/[email protected]"></script>
-        <script src="js/lib/vue-in-viewport-mixin.min.js"></script>
-        <script src="js/lib/vue-router.min.js"></script>
-        <script src="js/lib/vue-meta.min.js"></script>
-        <script src="js/lib/vue-snotify.min.js"></script>
-        <script src="js/lib/vue-js-toggle-button.js"></script>
-        <script src="js/lib/vuex.js"></script>
-        <script src="js/lib/vue-native-websocket-2.0.7.js"></script>
-        <script src="js/notifications.js"></script>
-        <script src="js/store.js"></script>
+        <script src="js/lib/vue.js?${sbPID}"></script>
+        <script src="js/lib/http-vue-loader.js?${sbPID}"></script>
+        <script src="js/lib/[email protected]?${sbPID}"></script>
+        <script src="js/lib/vue-in-viewport-mixin.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-router.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-meta.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-snotify.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-js-toggle-button.js?${sbPID}"></script>
+        <script src="js/lib/vuex.js?${sbPID}"></script>
+        <script src="js/lib/vue-native-websocket-2.0.7.js?${sbPID}"></script>
+        <script src="js/notifications.js?${sbPID}"></script>
+        <script src="js/store.js?${sbPID}"></script>
         <script>
             Vue.component('app-header', httpVueLoader('js/templates/app-header.vue'));
             Vue.component('scroll-buttons', httpVueLoader('js/templates/scroll-buttons.vue'));
@@ -202,7 +202,7 @@
             }
         </script>
         <%block name="scripts" />
-        <script src="js/router.js"></script>
+        <script src="js/router.js?${sbPID}"></script>
         <script>
             if (!window.app) {
                 console.info('Loading Vue with router since window.app is missing.');

diff --git a/themes/dark/templates/testRename.mako b/themes/dark/templates/testRename.mako
@@ -138,15 +138,15 @@ const startVue = () => {
     <tbody>
 <%
 odd = not odd
-epStr = str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)
+epStr = 's{season}e{episode}'.format(season=cur_ep_obj.season, episode=cur_ep_obj.episode)
 epList = sorted([cur_ep_obj.episode] + [x.episode for x in cur_ep_obj.related_episodes])
 if len(epList) > 1:
     epList = [min(epList), max(epList)]
 %>
         <tr class="season-${cur_season} ${'good' if curLoc == newLoc else 'wanted'} seasonstyle">
             <td class="col-checkbox">
             % if curLoc != newLoc:
-                <input type="checkbox" class="epCheck" id="${str(cur_ep_obj.season) + 'x' + str(cur_ep_obj.episode)}" name="${str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)}" />
+                <input type="checkbox" class="epCheck" id="${epStr}" name="${epStr}" />
             % endif
             </td>
             <td align="center" valign="top" class="nowrap">${"-".join(map(str, epList))}</td>