From 248c0994c9588416e4bc06c20c65050f267af644 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 22 Oct 2020 12:22:19 +0200
Subject: [PATCH 01/10] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F,=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E4=BD=BF=E5=85=B6=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/style.scss   | 3 +++
 src/components/EditSites.vue | 3 +--
 src/components/History.vue   | 3 +--
 src/components/IPTV.vue      | 3 +--
 src/components/Star.vue      | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index e083877..eae9290 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -252,6 +252,9 @@
       .el-table .highlight{
         color: var(--highlight-color) !important;
       }
+      .el-button{
+        font-size: 1rem;
+      }
     }
   }
 }
diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 689e667..5e0db04 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -32,8 +32,7 @@
           <el-table-column
             label="操作"
             header-align="center"
-            align="right"
-            width="140">
+            align="right">
             <template slot-scope="scope">
               <el-button size="mini" @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
               <el-button size="mini" @click.stop="editSite(scope.row)" type="text">编辑</el-button>
diff --git a/src/components/History.vue b/src/components/History.vue
index d4dffd4..3859097 100644
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -30,8 +30,7 @@
           <el-table-column
             label="操作"
             header-align="center"
-            align="right"
-            width="180">
+            align="right">
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(scope.row)" type="text">播放</el-button>
               <el-button @click.stop="shareEvent(scope.row)" type="text">分享</el-button>
diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index dffb627..7c534f6 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -40,8 +40,7 @@
           <el-table-column
             label="操作"
             header-align="center"
-            align="right"
-            width="100">
+            align="right">
             <template slot-scope="scope">
               <el-button size="mini" @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
               <el-button size="mini" @click.stop="removeEvent(scope.row)" type="text">删除</el-button>
diff --git a/src/components/Star.vue b/src/components/Star.vue
index a56067c..e836d3b 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -54,8 +54,7 @@
           <el-table-column
             label="操作"
             header-align="center"
-            align="right"
-            width="180">
+            align="right">
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(scope.row)" type="text">播放</el-button>
               <el-button @click.stop="shareEvent(scope.row)" type="text">分享</el-button>

From 98b4f5bc1d99728b643e5894552ce76a4cdfc02d Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Wed, 21 Oct 2020 22:15:45 +0200
Subject: [PATCH 02/10] =?UTF-8?q?=E6=94=B9=E8=BF=9Bstar=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Star.vue | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/Star.vue b/src/components/Star.vue
index e836d3b..73c7bc9 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -11,24 +11,30 @@
         <el-table size="mini" fit :data="list" height="100%" row-key="id" :cell-class-name="checkUpdate" @row-click="detailEvent">
           <el-table-column
             sortable
+            :sort-method="sortByName"
             prop="name"
             label="片名">
           </el-table-column>
           <el-table-column
+            :sort-by="['type', 'name']"
             sortable
+            :sort-method="sortByType"
             prop="type"
             label="类型"
             width="100">
           </el-table-column>
           <el-table-column
             sortable
+            :sort-by="['year', 'name']"
             prop="year"
             label="上映"
             width="100"
             align="center">
           </el-table-column>
           <el-table-column
+            :sort-by="['site', 'name']"
             sortable
+            :sort-method="sortBySite"
             prop="site"
             width="120"
             label="片源">
@@ -37,13 +43,11 @@
             </template>
           </el-table-column>
           <el-table-column v-if="list.some(e => e.note)"
-            sortable
             prop="note"
             width="120"
             label="备注">
           </el-table-column>
           <el-table-column v-if="list.some(e => e.index >= 0)"
-            sortable
             prop="index"
             width="120"
             label="观看至">
@@ -125,6 +129,20 @@ export default {
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    sortByName (a, b) {
+      return a.name.localeCompare(b.name)
+    },
+    sortByType (a, b) {
+      return a.type.localeCompare(b.type)
+    },
+    sortBySite (a, b) {
+      const siteA = this.getSiteName(a.key)
+      if (!siteA) {
+        return -1
+      } else {
+        return siteA.localeCompare(this.getSiteName(b.key))
+      }
+    },
     detailEvent (e) {
       this.detail = {
         show: true,

From 8abe4b7ef8c0c1befa8e7e333252159fa37af240 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Wed, 21 Oct 2020 23:27:05 +0200
Subject: [PATCH 03/10] =?UTF-8?q?IPTV=E6=89=B9=E5=A4=84=E7=90=86=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IPTV.vue | 106 ++++++++++++++++++++++++----------------
 1 file changed, 65 insertions(+), 41 deletions(-)

diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 7c534f6..cec2121 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -1,51 +1,61 @@
 <template>
   <div class="listpage" id="IPTV">
     <div class="listpage-content">
-      <div class="listpage-header">
+      <div class="listpage-header" v-show="!eableBatchEdit">
+        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
         <el-button type="text">总频道数:{{iptvList.length}}</el-button>
         <el-button @click.stop="exportChannels" type="text">导出</el-button>
         <el-button @click.stop="importChannels" type="text">导入</el-button>
         <el-button @click.stop="removeAllChannels" type="text">清空</el-button>
         <el-button @click.stop="resetChannelsEvent" type="text">重置</el-button>
       </div>
+      <div class="listpage-header" v-show="eableBatchEdit">
+        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
+        <el-input placeholder="新的组名" v-model="newGroupName"></el-input>
+        <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
+      </div>
       <div class="listpage-body" id="iptv-table">
         <el-table
-          size="mini"
-          fit
-          :data="filteredTableData"
-          row-key="id"
-          @row-click="playEvent">
-          <el-table-column
-            prop="name"
-            label="频道名">
-            <template #header>
-              <el-input
-              placeholder="搜索"
-              size="mini"
-              v-model.trim="searchTxt">
-              <i slot="prefix" class="el-input__icon el-icon-search"></i>
-              </el-input>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="group"
-            label="分组"
-            :filters="getFilters"
-            :filter-method="filterHandle"
-            filter-placement="bottom-end">
-            <template slot-scope="scope">
-              <el-button type="text">{{scope.row.group}}</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            header-align="center"
+              :data="filteredTableData"
+              row-key="id"
+              @row-click="playEvent"
+              @selection-change="handleSelectionChange">
+              <el-table-column
+                type="selection"
+                v-if="eableBatchEdit"
+                width="55">
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                label="频道名">
+                <template #header>
+                  <el-input
+                  placeholder="搜索"
+                  size="mini"
+                  v-model.trim="searchTxt">
+                  <i slot="prefix" class="el-input__icon el-icon-search"></i>
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="group"
+                label="分组"
+                :filters="getFilters"
+                :filter-method="filterHandle"
+                filter-placement="bottom-end">
+                <template slot-scope="scope">
+                  <el-button type="text">{{scope.row.group}}</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="操作"
+                header-align="center"
             align="right">
-            <template slot-scope="scope">
-              <el-button size="mini" @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
-              <el-button size="mini" @click.stop="removeEvent(scope.row)" type="text">删除</el-button>
-            </template>
-          </el-table-column>
+                <template slot-scope="scope">
+                  <el-button @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
+                  <el-button @click.stop="removeEvent(scope.row)" type="text">删除</el-button>
+                </template>
+              </el-table-column>
         </el-table>
       </div>
     </div>
@@ -65,6 +75,9 @@ export default {
       iptvList: [],
       searchTxt: '',
       searchRecordList: [],
+      eableBatchEdit: false,
+      newGroupName: '',
+      multipleSelection: [],
       show: {
         search: false
       }
@@ -119,6 +132,17 @@ export default {
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    handleSelectionChange (rows) {
+      this.multipleSelection = rows
+    },
+    saveBatchEdit () {
+      if (this.multipleSelection && this.newGroupName) {
+        this.multipleSelection.forEach(ele => {
+          ele.group = this.newGroupName
+        })
+      }
+      this.updateDatabase()
+    },
     playEvent (e) {
       this.video = { iptv: { name: e.name, url: e.url } }
       this.view = 'Play'
@@ -269,12 +293,12 @@ export default {
     },
     moveToTopEvent (i) {
       this.iptvList.sort(function (x, y) { return (x.name === i.name && x.url === i.url) ? -1 : (y.name === i.name && y.url === i.url) ? 1 : 0 })
-      this.updateDatabase(this.iptvList)
+      this.updateDatabase()
     },
-    updateDatabase (data) {
+    updateDatabase () {
       iptv.clear().then(res => {
-        this.resetId(data)
-        iptv.bulkAdd(data).then(this.getChannels())
+        this.resetId(this.iptvList)
+        iptv.bulkAdd(this.iptvList).then(this.getChannels())
       })
     },
     resetId (inArray) {
@@ -291,7 +315,7 @@ export default {
         onEnd ({ newIndex, oldIndex }) {
           const currRow = _this.iptvList.splice(oldIndex, 1)[0]
           _this.iptvList.splice(newIndex, 0, currRow)
-          _this.updateDatabase(_this.iptvList)
+          _this.updateDatabase()
         }
       })
     }

From d63710afe6d91b7d6b89d39c7861be1281ae2b44 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 22 Oct 2020 14:07:14 +0200
Subject: [PATCH 04/10] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index eae9290..edb3fd2 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -223,6 +223,7 @@
         }
       }
       .el-button{
+        font-size: 1rem;
         border: none;
         &:hover{
           cursor: pointer;

From d1e6ac1ae6b166a6adeda4a4b6bb57c444ebdd09 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 22 Oct 2020 16:10:39 +0200
Subject: [PATCH 05/10] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=BA=90=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 30 ++++++++++++++-
 src/lib/dexie/dexie.js       |  2 +-
 src/lib/dexie/initData.js    | 75 ++++++++++++++++++++++++------------
 3 files changed, 80 insertions(+), 27 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 5e0db04..f966876 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -29,6 +29,16 @@
               </el-switch>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="group"
+            label="分组"
+            :filters="getFilters"
+            :filter-method="filterHandle"
+            filter-placement="bottom-end">
+            <template slot-scope="scope">
+              <el-button type="text">{{scope.row.group}}</el-button>
+            </template>
+          </el-table-column>
           <el-table-column
             label="操作"
             header-align="center"
@@ -115,10 +125,25 @@ export default {
       set (val) {
         this.SET_EDITSITES(val)
       }
+    },
+    getFilters () {
+      const groups = [...new Set(this.sites.map(site => site.group))]
+      var filters = []
+      groups.forEach(g => {
+        var doc = {
+          text: g,
+          value: g
+        }
+        filters.push(doc)
+      })
+      return filters
     }
   },
   methods: {
     ...mapMutations(['SET_SETTING', 'SET_EDITSITES']),
+    filterHandle (value, row) {
+      return row.group === value
+    },
     getSites () {
       sites.all().then(res => {
         this.sites = res
@@ -225,11 +250,14 @@ export default {
             var str = fs.readFileSync(file)
             const json = JSON.parse(str)
             json.forEach(ele => {
-              if (this.sites.filter(x => x.key === ele.key).length === 0 && this.sites.filter(x => x.name === ele.name && x.url === ele.url).length === 0) {
+              if (ele.api && this.sites.filter(x => x.key === ele.key).length === 0 && this.sites.filter(x => x.name === ele.name && x.api === ele.api).length === 0) {
                 // 不含该key 同时也不含名字和url一样的
                 if (ele.isActive === undefined) {
                   ele.isActive = 1
                 }
+                if (ele.group === undefined) {
+                  ele.group = '导入'
+                }
                 this.sites.push(ele)
               }
             })
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 423329c..7d29d15 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -9,7 +9,7 @@ db.version(3).stores({
   setting: 'id, theme, site, shortcut, view, externalPlayer, searchAllSites, excludeRootClasses, excludeR18Films, forwardTimeInSec',
   shortcut: 'name, key, desc',
   star: '++id, site, ids, name, type, year, index',
-  sites: '++id, key, name, api, download, isActive',
+  sites: '++id, key, name, api, download, isActive, group',
   history: '++id, site, ids, name, type, year, index, time',
   mini: 'id, site, ids, name, index, time',
   iptv: '++id, name, url, group'
diff --git a/src/lib/dexie/initData.js b/src/lib/dexie/initData.js
index 46d66d1..d44df0e 100644
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -19,7 +19,8 @@ const sites = [
     name: 'OK 资源网',
     api: 'http://cj.okzy.tv/inc/api.php',
     download: 'http://cj.okzy.tv/inc/apidown.php',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 2,
@@ -27,7 +28,8 @@ const sites = [
     name: '最大资源网',
     api: 'http://www.zdziyuan.com/inc/api.php',
     download: 'http://www.zdziyuan.com/inc/apidown.php',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 3,
@@ -35,7 +37,8 @@ const sites = [
     name: '豆瓣电影资源',
     api: 'http://v.1988cj.com/inc/api.php',
     download: 'http://v.1988cj.com/inc/apidown.php',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 4,
@@ -43,7 +46,8 @@ const sites = [
     name: '135 资源网',
     api: 'http://cj.zycjw1.com/inc/api.php',
     download: 'http://cj.zycjw1.com/inc/apidown.php',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 5,
@@ -51,7 +55,8 @@ const sites = [
     name: '酷云资源',
     api: 'http://caiji.kuyun98.com/inc/ldg_api.php',
     download: 'http://caiji.kuyun98.com/inc/apidown.php',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 6,
@@ -59,7 +64,8 @@ const sites = [
     name: '芒果 TV 资源网',
     api: 'https://api.shijiapi.com/api.php/provide/vod/at/xml/',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 7,
@@ -67,7 +73,8 @@ const sites = [
     name: '速播资源站',
     api: 'https://www.subo988.com/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 8,
@@ -75,7 +82,8 @@ const sites = [
     name: '209 资源',
     api: 'http://cj.1156zy.com/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 9,
@@ -83,7 +91,8 @@ const sites = [
     name: '最新资源',
     api: 'http://api.zuixinapi.com/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 10,
@@ -91,7 +100,8 @@ const sites = [
     name: '酷播资源',
     api: 'http://api.kbzyapi.com/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 11,
@@ -99,7 +109,8 @@ const sites = [
     name: '永久资源',
     api: 'http://cj.yongjiuzyw.com/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 12,
@@ -107,7 +118,8 @@ const sites = [
     name: '123 资源',
     api: 'http://cj.123ku2.com:12315/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 13,
@@ -115,7 +127,8 @@ const sites = [
     name: '88 影视资源站',
     api: 'http://www.88zyw.net/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 14,
@@ -123,7 +136,8 @@ const sites = [
     name: '卧龙资源',
     api: 'http://cj.wlzy.tv/inc/api_mac.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 15,
@@ -131,7 +145,8 @@ const sites = [
     name: '麻花资源',
     api: 'https://www.mhapi123.com/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 16,
@@ -139,7 +154,8 @@ const sites = [
     name: '快快资源',
     api: 'https://api.kkzy.tv/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 17,
@@ -147,7 +163,8 @@ const sites = [
     name: '壹伍捌资源网',
     api: 'http://cj.158zyz.net:158/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 18,
@@ -155,7 +172,8 @@ const sites = [
     name: '人人资源',
     api: 'https://www.rrzyw.cc/api.php/provide/vod/from/rrm3u8/at/xml/',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 19,
@@ -163,7 +181,8 @@ const sites = [
     name: '魔卡资源网',
     api: 'https://cj.heiyap.com/api.php/provide/vod/at/xml/',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 20,
@@ -171,7 +190,8 @@ const sites = [
     name: '快影资源站',
     api: 'https://www.kyzy.tv/api.php/kyyun/vod/at/xml/',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 21,
@@ -179,7 +199,8 @@ const sites = [
     name: '搜乐资源网',
     api: 'https://www.caijizy.vip/api.php/provide/vod/at/xml/',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 22,
@@ -187,7 +208,8 @@ const sites = [
     name: '步步高顶尖资源网',
     api: 'http://api.bbkdj.com/api',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 23,
@@ -195,7 +217,8 @@ const sites = [
     name: '1886 资源',
     api: 'http://cj.1886zy.co/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 24,
@@ -203,7 +226,8 @@ const sites = [
     name: '秒播资源',
     api: 'http://caiji.mb77.vip/inc/api.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   },
   {
     id: 25,
@@ -211,7 +235,8 @@ const sites = [
     name: '605资源',
     api: 'http://www.605zy.net/inc/seacmsapi.php',
     download: '',
-    isActive: 1
+    isActive: 1,
+    group: '默认'
   }
 ]
 

From db7cdab787947b6fb2875c12d12b15eba6096a8f Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 22 Oct 2020 16:37:54 +0200
Subject: [PATCH 06/10] =?UTF-8?q?=E6=89=B9=E5=A4=84=E7=90=86=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=BA=90=E7=9A=84=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 43 ++++++++++++++++++++++++++++--------
 src/components/IPTV.vue      |  5 ++---
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index f966876..87fd0a8 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -1,18 +1,29 @@
 <template>
   <div class="listpage" id="editSites">
     <div class="listpage-content">
-      <div class="listpage-header">
+      <div class="listpage-header" v-show="!eableBatchEdit">
+        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
         <el-button @click.stop="addSite" type="text">添加</el-button>
         <el-button @click.stop="exportSites" type="text">导出</el-button>
         <el-button @click.stop="importSites" type="text">导入</el-button>
         <el-button @click.stop="removeAllSites" type="text">清空</el-button>
         <el-button @click.stop="resetSitesEvent" type="text">重置</el-button>
       </div>
+      <div class="listpage-header" v-show="eableBatchEdit">
+        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
+        <el-input placeholder="新组名" v-model="newGroupName"></el-input>
+        <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
+      </div>
       <div class="listpage-body" id="sites-table">
         <el-table
           size="mini"
           :data="sites"
-          row-key="id">
+          row-key="id"
+          @selection-change="handleSelectionChange">
+          <el-table-column
+            type="selection"
+            v-if="eableBatchEdit">
+          </el-table-column>
           <el-table-column
             prop="name"
             label="资源名">
@@ -106,7 +117,10 @@ export default {
         download: [
           { required: false, trigger: 'blur' }
         ]
-      }
+      },
+      eableBatchEdit: false,
+      newGroupName: '',
+      multipleSelection: []
     }
   },
   computed: {
@@ -144,6 +158,17 @@ export default {
     filterHandle (value, row) {
       return row.group === value
     },
+    handleSelectionChange (rows) {
+      this.multipleSelection = rows
+    },
+    saveBatchEdit () {
+      if (this.multipleSelection && this.newGroupName) {
+        this.multipleSelection.forEach(ele => {
+          ele.group = this.newGroupName
+        })
+      }
+      this.updateDatabase()
+    },
     getSites () {
       sites.all().then(res => {
         this.sites = res
@@ -275,10 +300,10 @@ export default {
     },
     moveToTopEvent (i) {
       this.sites.sort(function (x, y) { return x.key === i.key ? -1 : y.key === i.key ? 1 : 0 })
-      this.updateDatabase(this.sites)
+      this.updateDatabase()
     },
     isActiveChangeEvent () {
-      this.updateDatabase(this.sites)
+      this.updateDatabase()
     },
     resetId (inArray) {
       var id = 1
@@ -287,14 +312,14 @@ export default {
         id += 1
       })
     },
-    updateDatabase (data) {
+    updateDatabase () {
       sites.clear().then(res => {
         var id = 1
-        data.forEach(ele => {
+        this.sites.forEach(ele => {
           ele.id = id
           id += 1
         })
-        sites.bulkAdd(data).then(this.getSites())
+        sites.bulkAdd(this.sites).then(this.getSites())
       })
     },
     removeAllSites () {
@@ -307,7 +332,7 @@ export default {
         onEnd ({ newIndex, oldIndex }) {
           const currRow = _this.sites.splice(oldIndex, 1)[0]
           _this.sites.splice(newIndex, 0, currRow)
-          _this.updateDatabase(_this.sites)
+          _this.updateDatabase()
         }
       })
     }
diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index cec2121..100fe8f 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -11,7 +11,7 @@
       </div>
       <div class="listpage-header" v-show="eableBatchEdit">
         <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
-        <el-input placeholder="新的组名" v-model="newGroupName"></el-input>
+        <el-input placeholder="新组名" v-model="newGroupName"></el-input>
         <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
       </div>
       <div class="listpage-body" id="iptv-table">
@@ -22,8 +22,7 @@
               @selection-change="handleSelectionChange">
               <el-table-column
                 type="selection"
-                v-if="eableBatchEdit"
-                width="55">
+                v-if="eableBatchEdit">
               </el-table-column>
               <el-table-column
                 prop="name"

From 1dc7b3816071be0eb3dccdfce74a5acd785a1e74 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 22 Oct 2020 16:53:57 +0200
Subject: [PATCH 07/10] =?UTF-8?q?=E6=89=B9=E5=A4=84=E7=90=86=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=85=B3=E9=97=AD=E6=BA=90=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E8=87=AA=E9=80=89=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 19 +++++++++++--------
 src/components/IPTV.vue      | 12 ++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 87fd0a8..035919b 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -10,8 +10,9 @@
         <el-button @click.stop="resetSitesEvent" type="text">重置</el-button>
       </div>
       <div class="listpage-header" v-show="eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
-        <el-input placeholder="新组名" v-model="newGroupName"></el-input>
+        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
+        <el-input placeholder="新组名" v-model="batchGroupName"></el-input>
+        <el-switch v-model="batchIsActive" :active-value="1" :inactive-value="0" active-text="自选源"></el-switch>
         <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
       </div>
       <div class="listpage-body" id="sites-table">
@@ -119,7 +120,8 @@ export default {
         ]
       },
       eableBatchEdit: false,
-      newGroupName: '',
+      batchGroupName: '',
+      batchIsActive: 1,
       multipleSelection: []
     }
   },
@@ -162,11 +164,12 @@ export default {
       this.multipleSelection = rows
     },
     saveBatchEdit () {
-      if (this.multipleSelection && this.newGroupName) {
-        this.multipleSelection.forEach(ele => {
-          ele.group = this.newGroupName
-        })
-      }
+      this.multipleSelection.forEach(ele => {
+        if (this.batchGroupName) {
+          ele.group = this.batchGroupName
+        }
+        ele.isActive = this.batchIsActive
+      })
       this.updateDatabase()
     },
     getSites () {
diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 100fe8f..520877c 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -2,7 +2,7 @@
   <div class="listpage" id="IPTV">
     <div class="listpage-content">
       <div class="listpage-header" v-show="!eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
+        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
         <el-button type="text">总频道数:{{iptvList.length}}</el-button>
         <el-button @click.stop="exportChannels" type="text">导出</el-button>
         <el-button @click.stop="importChannels" type="text">导入</el-button>
@@ -10,8 +10,8 @@
         <el-button @click.stop="resetChannelsEvent" type="text">重置</el-button>
       </div>
       <div class="listpage-header" v-show="eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
-        <el-input placeholder="新组名" v-model="newGroupName"></el-input>
+        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
+        <el-input placeholder="新组名" v-model="batchGroupName"></el-input>
         <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
       </div>
       <div class="listpage-body" id="iptv-table">
@@ -75,7 +75,7 @@ export default {
       searchTxt: '',
       searchRecordList: [],
       eableBatchEdit: false,
-      newGroupName: '',
+      batchGroupName: '',
       multipleSelection: [],
       show: {
         search: false
@@ -135,9 +135,9 @@ export default {
       this.multipleSelection = rows
     },
     saveBatchEdit () {
-      if (this.multipleSelection && this.newGroupName) {
+      if (this.multipleSelection && this.batchGroupName) {
         this.multipleSelection.forEach(ele => {
-          ele.group = this.newGroupName
+          ele.group = this.batchGroupName
         })
       }
       this.updateDatabase()

From 1d33db0143602fe2fc7d98e0360e528a5674b8bb Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 22 Oct 2020 17:07:05 +0200
Subject: [PATCH 08/10] =?UTF-8?q?IPTV=E6=94=AF=E6=8C=81=E4=BB=8EJSON?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IPTV.vue | 49 ++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 520877c..de81686 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -204,7 +204,8 @@ export default {
     importChannels () {
       const options = {
         filters: [
-          { name: 'm3u file', extensions: ['m3u', 'm3u8'] }
+          { name: 'm3u file', extensions: ['m3u', 'm3u8'] },
+          { name: 'JSON file', extensions: ['json'] }
         ],
         properties: ['openFile', 'multiSelections']
       }
@@ -213,21 +214,39 @@ export default {
           var docs = this.iptvList
           var id = docs.length
           result.filePaths.forEach(file => {
-            const parser = require('iptv-playlist-parser')
-            const playlist = fs.readFileSync(file, { encoding: 'utf-8' })
-            const result = parser.parse(playlist)
-            result.items.forEach(ele => {
-              if (ele.name && ele.url && ele.url.includes('.m3u8')) {
-                var doc = {
-                  id: id,
-                  name: ele.name,
-                  url: ele.url,
-                  group: this.determineGroup(ele.group, ele.name)
+            if (file.endsWith('m3u')) {
+              const parser = require('iptv-playlist-parser')
+              const playlist = fs.readFileSync(file, { encoding: 'utf-8' })
+              const result = parser.parse(playlist)
+              result.items.forEach(ele => {
+                if (ele.name && ele.url && ele.url.includes('.m3u8')) {
+                  var doc = {
+                    id: id,
+                    name: ele.name,
+                    url: ele.url,
+                    group: this.determineGroup(ele.group, ele.name)
+                  }
+                  id += 1
+                  docs.push(doc)
                 }
-                id += 1
-                docs.push(doc)
-              }
-            })
+              })
+            } else {
+              // Import Json file
+              var str = fs.readFileSync(file)
+              const json = JSON.parse(str)
+              json.forEach(ele => {
+                if (ele.name && ele.url && ele.url.includes('.m3u8')) {
+                  var doc = {
+                    id: id,
+                    name: ele.name,
+                    url: ele.url,
+                    group: ele.group === undefined ? this.determineGroup(ele.group, ele.name) : ele.group
+                  }
+                  id += 1
+                  docs.push(doc)
+                }
+              })
+            }
           })
           // 获取url不重复的列表
           const uniqueList = [...new Map(docs.map(item => [item.url, item])).values()]

From 7ad40ba37543cdce033982e5ea92b63791d219bf Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 22 Oct 2020 18:22:41 +0200
Subject: [PATCH 09/10] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/History.vue | 43 +++++++++++++++++++++++++++++++++++++-
 src/components/Setting.vue |  2 +-
 src/components/Star.vue    |  2 +-
 src/lib/dexie/history.js   |  3 +++
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/components/History.vue b/src/components/History.vue
index 3859097..035e046 100644
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -2,7 +2,8 @@
   <div class="listpage" id="history">
     <div class="listpage-content">
       <div class="listpage-header">
-        <span class="btn"></span>
+        <el-button @click.stop="exportHistory" type="text">导出</el-button>
+        <el-button @click.stop="importHistory" type="text">导入</el-button>
         <el-button @click.stop="clearAllHistory" type="text">清空</el-button>
       </div>
       <div class="listpage-body" id="history-table">
@@ -48,6 +49,8 @@ import { mapMutations } from 'vuex'
 import { history, sites } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Sortable from 'sortablejs'
+import { remote } from 'electron'
+import fs from 'fs'
 const { clipboard } = require('electron')
 
 export default {
@@ -169,6 +172,44 @@ export default {
         }
       })
     },
+    exportHistory () {
+      this.getAllhistory()
+      const arr = [...this.history]
+      const str = JSON.stringify(arr, null, 2)
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] }
+        ]
+      }
+      remote.dialog.showSaveDialog(options).then(result => {
+        if (!result.canceled) {
+          fs.writeFileSync(result.filePath, str)
+          this.$message.success('已保存成功')
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    importHistory () {
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] }
+        ],
+        properties: ['openFile', 'multiSelections']
+      }
+      remote.dialog.showOpenDialog(options).then(result => {
+        if (!result.canceled) {
+          result.filePaths.forEach(file => {
+            var str = fs.readFileSync(file)
+            const json = JSON.parse(str)
+            history.bulkAdd(json).then(res => {
+              this.$message.success('导入成功')
+              this.getAllhistory()
+            })
+          })
+        }
+      })
+    },
     clearAllHistory () {
       history.clear().then(res => {
         this.history = []
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index 33bcf27..7338628 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -319,7 +319,7 @@ export default {
     },
     expShortcut () {
       const arr = [...this.shortcutList]
-      const str = JSON.stringify(arr, null, 4)
+      const str = JSON.stringify(arr, null, 2)
       clipboard.writeText(str)
       this.$message.success('已复制到剪贴板')
     },
diff --git a/src/components/Star.vue b/src/components/Star.vue
index 73c7bc9..d12b4a9 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -301,7 +301,7 @@ export default {
     },
     exportFavoritesEvent () {
       const arr = [...this.list]
-      const str = JSON.stringify(arr, null, 4)
+      const str = JSON.stringify(arr, null, 2)
       const options = {
         filters: [
           { name: 'JSON file', extensions: ['json'] },
diff --git a/src/lib/dexie/history.js b/src/lib/dexie/history.js
index 6ca8112..06b6f33 100644
--- a/src/lib/dexie/history.js
+++ b/src/lib/dexie/history.js
@@ -4,6 +4,9 @@ export default {
   async add (doc) {
     return await history.add(doc)
   },
+  async bulkAdd (doc) {
+    return await history.bulkAdd(doc)
+  },
   async find (doc) {
     return await history.get(doc)
   },

From c2e2f1c49090c00cdb2bb0793431d900c7adcc11 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 22 Oct 2020 18:34:00 +0200
Subject: [PATCH 10/10] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E9=80=89?=
 =?UTF-8?q?=E6=BA=90=E5=88=97=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 035919b..f3f45cd 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -30,6 +30,8 @@
             label="资源名">
           </el-table-column>
           <el-table-column
+            :sort-by="['isActive', 'name']"
+            sortable
             prop="isActive"
             label="自选源">
             <template slot-scope="scope">
@@ -246,7 +248,7 @@ export default {
     exportSites () {
       this.getSites()
       const arr = [...this.sites]
-      const str = JSON.stringify(arr, null, 4)
+      const str = JSON.stringify(arr, null, 2)
       const options = {
         filters: [
           { name: 'JSON file', extensions: ['json'] },