Merge pull request #39 from ZyqGitHub1/dev

0.8.0

.travis.yml

@@ -0,0 +1,74 @@
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode10.2
+      language: node_js
+      node_js: '10'
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+    - os: linux
+      services: docker
+      language: generic
+
+cache:
+  directories:
+    - node_modules
+    - $HOME/.cache/electron
+    - $HOME/.cache/electron-builder
+
+before_install:
+  - |
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      # download aliyun OSS Linux client
+      wget -nc http://gosspublic.alicdn.com/ossutil/1.6.5/ossutil64
+      chmod 755 ossutil64
+      # config aliyun OSS Linux client https://help.aliyun.com/document_detail/50455.html
+      ./ossutil64 config -e "${OSS_ENDPOINT}" -i "${OSS_AKI}" -k "${OSS_AKS}"
+    else
+      # download aliyun OSS Linux client
+      wget -nc http://gosspublic.alicdn.com/ossutil/1.6.5/ossutilmac64
+      chmod 755 ossutilmac64
+      # config aliyun OSS Linux client https://help.aliyun.com/document_detail/50455.html
+      ./ossutilmac64 config -e "${OSS_ENDPOINT}" -i "${OSS_AKI}" -k "${OSS_AKS}"
+    fi
+
+script:
+  - |
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      docker run --rm \
+        --env-file <(env | grep -vE '\r|\n' | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
+        --env ELECTRON_CACHE="/root/.cache/electron" \
+        --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
+        -v ${PWD}:/project \
+        -v ~/.cache/electron:/root/.cache/electron \
+        -v ~/.cache/electron-builder:/root/.cache/electron-builder \
+        electronuserland/builder:wine \
+        /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn electron:build --bundler builder --target linux"
+      linux_file=`ls dist/electron/Packaged/ | grep '.AppImage$'`
+      ./ossutil64 cp "dist/electron/Packaged/${linux_file}" "${BUCKET}/${linux_file}" -f
+
+      docker run --rm \
+        --env-file <(env | grep -vE '\r|\n' | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
+        --env ELECTRON_CACHE="/root/.cache/electron" \
+        --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
+        -v ${PWD}:/project \
+        -v ~/.cache/electron:/root/.cache/electron \
+        -v ~/.cache/electron-builder:/root/.cache/electron-builder \
+        electronuserland/builder:wine \
+        /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn electron:build --bundler builder --target win"
+        win_file=`ls dist/electron/Packaged/ | grep '.zip$'`
+      ./ossutil64 cp "dist/electron/Packaged/${win_file}" "${BUCKET}/${win_file}" -f
+    else
+      yarn electron:build
+      osx_file=`ls dist/electron/Packaged/ | grep '.dmg$'`
+      ./ossutilmac64 cp "dist/electron/Packaged/${osx_file}" "${BUCKET}/${osx_file}" -f
+    fi
+
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder/wine
+
+branches:
+  except:
+    - 'master'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "h-player",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "A Quasar Framework app",
   "productName": "h-player",
   "cordovaId": "org.cordova.quasar.app",

quasar.conf.js

@@ -173,7 +173,7 @@ module.exports = function (ctx) {
     },
 
     electron: {
-      bundler: 'packager', // 'builder' or 'packager'
+      bundler: 'builder', // 'builder' or 'packager'
 
       extendWebpack(cfg) {
         // do something with Electron main process Webpack cfg
@@ -202,7 +202,17 @@ module.exports = function (ctx) {
 
       builder: {
         // https://www.electron.build/configuration/configuration
-        // appId: 'h-player'
+        appId: 'com.electron.h-player',
+        mac: {
+          category: 'public.app-category.video',
+          target: 'dmg',
+        },
+        win: {
+          target: 'zip',
+        },
+        linux: {
+          target: 'AppImage',
+        },
       },
     },
   };

src/App.vue

@@ -5,16 +5,29 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
+
 export default {
   name: 'App',
   created() {
+    const ipc = this.$q.electron.ipcRenderer;
+    ipc.on('from-mini', (event, message) => {
+      this.gotoPlayer(message);
+    });
     this.$store.dispatch('getLatestVersion');
     this.$store.dispatch('loadSiteList').then((storeSiteList) => {
       if (!storeSiteList || storeSiteList.length === 0) {
         this.$router.push('/import');
       }
     });
   },
+  methods: {
+    ...mapMutations(['setCurrentVideo']),
+    gotoPlayer(video) {
+      this.setCurrentVideo(video);
+      this.$router.push('/video');
+    },
+  },
 };
 </script>
 

src/api/maccms-v10.d.ts

@@ -0,0 +1,71 @@
+export interface getListQuery {
+  /**
+  action
+  Default: list
+  */
+  ac?: string;
+
+  /**
+  返回数据类型
+  Default: xml
+  */
+  at?: string;
+
+  /**
+  类别ID
+  */
+  t?: string;
+
+  /**
+  页码
+  */
+  pg?: string;
+
+  /**
+  搜索关键字
+  */
+  wd?: string;
+
+  /**
+  几小时内的数据
+  */
+  h?: string;
+}
+
+export function getList(apt: string, query: getListQuery): Promise<any>;
+
+export interface getDetailQuery {
+  /**
+  action
+  Default: detail
+  */
+  ac?: string;
+
+  /**
+  返回数据类型
+  Default: xml
+  */
+  at?: string;
+
+  /**
+  类别ID
+  */
+  t?: string;
+
+  /**
+  页码
+  */
+  pg?: string;
+
+  /**
+  数据ID,多个ID逗号分割
+  */
+  ids?: string;
+
+  /**
+  几小时内的数据
+  */
+  h?: string;
+}
+
+export function getDetail(apt: string, query: getDetailQuery): Promise<any>;

src/api/maccms-v10.js

@@ -0,0 +1,31 @@
+import axios from 'axios';
+import { stringify } from 'query-string';
+
+export async function getList(api, query) {
+  const defaultParams = {
+    ac: 'list',
+    at: 'xml',
+  };
+  const params = Object.assign(defaultParams, query);
+  const response = await axios.get(api, {
+    params,
+  });
+  return response;
+}
+
+export async function getDetail(api, query) {
+  const defaultParams = {
+    ac: 'detail',
+    at: 'xml',
+  };
+  const params = Object.assign(defaultParams, query);
+  const response = await axios.get(api, {
+    params,
+    paramsSerializer(qs) {
+      return stringify(qs, {
+        arrayFormat: 'comma',
+      });
+    },
+  });
+  return response;
+}

src/api/maccms-v8.d.ts

@@ -0,0 +1,59 @@
+export interface getListQuery {
+  /**
+  action
+  Default: list
+  */
+  ac?: string;
+
+  /**
+  类别ID
+  */
+  t?: string;
+
+  /**
+  页码
+  */
+  pg?: string;
+
+  /**
+  搜索关键字
+  */
+  wd?: string;
+
+  /**
+  几小时内的数据
+  */
+  h?: string;
+}
+
+export function getList(apt: string, query: getListQuery): Promise<any>;
+
+export interface getDetailQuery {
+  /**
+  action
+  Default: videolist
+  */
+  ac?: string;
+
+  /**
+  类别ID
+  */
+  t?: string;
+
+  /**
+  页码
+  */
+  pg?: string;
+
+  /**
+  数据ID,多个ID逗号分割
+  */
+  ids?: string;
+
+  /**
+  几小时内的数据
+  */
+  h?: string;
+}
+
+export function getDetail(apt: string, query: getDetailQuery): Promise<any>;

src/api/maccms-v8.js

@@ -0,0 +1,29 @@
+import axios from 'axios';
+import { stringify } from 'query-string';
+
+export async function getList(api, query) {
+  const defaultParams = {
+    ac: 'list',
+  };
+  const params = Object.assign(defaultParams, query);
+  const response = await axios.get(api, {
+    params,
+  });
+  return response;
+}
+
+export async function getDetail(api, query) {
+  const defaultParams = {
+    ac: 'videolist',
+  };
+  const params = Object.assign(defaultParams, query);
+  const response = await axios.get(api, {
+    params,
+    paramsSerializer(qs) {
+      return stringify(qs, {
+        arrayFormat: 'comma',
+      });
+    },
+  });
+  return response;
+}

src/layouts/Config.vue

@@ -304,6 +304,14 @@
                 label="是否使用https"
               />
             </div>
+            <div class="q-ml-sm">
+              <q-btn
+                color="primary"
+                icon="bug_report"
+                label="打开开发者工具"
+                @click="toggleDevTools"
+              />
+            </div>
             <div class="text-h4 q-pa-sm">软件信息</div>
             <q-separator></q-separator>
             <div class="q-pa-sm">
@@ -409,7 +417,6 @@ export default {
     data: {
       handler() {
         this.setSiteList(clonedeep(this.data));
-        this.$electronStore.set('siteList', this.siteList);
       },
       deep: true,
     },
@@ -456,7 +463,6 @@ export default {
       });
       if (dialogResult) {
         const importedFile = await fs.readJSON(dialogResult[0]);
-        this.$electronStore.set('siteList', importedFile);
         this.setSiteList(importedFile);
         this.data = clonedeep(this.siteList);
       }
@@ -516,6 +522,17 @@ export default {
         repo: 'h-player-v2',
       });
     },
+    toggleDevTools() {
+      const win = this.$q.electron.remote.BrowserWindow.getFocusedWindow();
+      if (win) {
+        const { webContents } = win;
+        if (webContents.isDevToolsOpened()) {
+          webContents.closeDevTools();
+        } else {
+          webContents.openDevTools();
+        }
+      }
+    },
   },
 };
 </script>