From 860a0aebbe995934e9488e81f1c852ea7a214ded Mon Sep 17 00:00:00 2001
From: CzBiX <gliuwr@gmail.com>
Date: Sun, 29 Mar 2020 18:18:51 +0800
Subject: [PATCH] Refine lodash import

---
 src/components/AddForm.vue                    |  4 ++--
 src/components/Footer.vue                     |  4 ++--
 .../dialogs/ConfirmDeleteDialog.vue           |  1 -
 .../dialogs/ConfirmSetCategoryDialog.vue      |  1 -
 src/components/dialogs/InfoDialog.vue         |  1 -
 src/store/config.ts                           |  8 ++++----
 src/store/index.ts                            | 19 +++++++++----------
 src/store/snackBar.ts                         |  6 +++---
 src/utils.ts                                  |  3 +--
 9 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/components/AddForm.vue b/src/components/AddForm.vue
index f28d3d6..c5489a0 100644
--- a/src/components/AddForm.vue
+++ b/src/components/AddForm.vue
@@ -145,7 +145,7 @@
 </template>
 
 <script lang="ts">
-import _ from 'lodash';
+import { isNil } from 'lodash';
 import Vue from 'vue';
 import { mapState } from 'vuex';
 
@@ -226,7 +226,7 @@ export default class AddForm extends Vue {
   }
 
   setParams(key: string, value: any) {
-    if (_.isNil(value)) {
+    if (isNil(value)) {
       Vue.delete(this.userParams, key);
     } else {
       Vue.set(this.userParams, key, value);
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index c6293bd..e06e9b7 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -128,7 +128,7 @@
 </template>
 
 <script lang="ts">
-import _ from 'lodash';
+import { sumBy } from 'lodash';
 import Vue from 'vue';
 import { mapState, mapGetters } from 'vuex';
 import api from '../Api';
@@ -180,7 +180,7 @@ export default class Footer extends Vue {
   allTorrents!: Torrent[]
 
   get totalSize() {
-    return _.sumBy(this.allTorrents, 'size');
+    return sumBy(this.allTorrents, 'size');
   }
 
   get speedModeBind() {
diff --git a/src/components/dialogs/ConfirmDeleteDialog.vue b/src/components/dialogs/ConfirmDeleteDialog.vue
index 5238ce9..745218e 100644
--- a/src/components/dialogs/ConfirmDeleteDialog.vue
+++ b/src/components/dialogs/ConfirmDeleteDialog.vue
@@ -45,7 +45,6 @@
 </template>
 
 <script lang="ts">
-import _ from 'lodash';
 import Vue from 'vue';
 import { mapGetters } from 'vuex';
 
diff --git a/src/components/dialogs/ConfirmSetCategoryDialog.vue b/src/components/dialogs/ConfirmSetCategoryDialog.vue
index 29a437e..fea5d6b 100644
--- a/src/components/dialogs/ConfirmSetCategoryDialog.vue
+++ b/src/components/dialogs/ConfirmSetCategoryDialog.vue
@@ -45,7 +45,6 @@
 </template>
 
 <script lang="ts">
-import _ from 'lodash';
 import Vue from 'vue';
 import { mapGetters } from 'vuex';
 
diff --git a/src/components/dialogs/InfoDialog.vue b/src/components/dialogs/InfoDialog.vue
index 4e350f1..3d7311b 100644
--- a/src/components/dialogs/InfoDialog.vue
+++ b/src/components/dialogs/InfoDialog.vue
@@ -91,7 +91,6 @@
 </template>
 
 <script lang="ts">
-import _ from 'lodash';
 import Vue from 'vue';
 import TorrentInfo from './TorrentInfo.vue';
 import TorrentContent from './TorrentContent.vue';
diff --git a/src/store/config.ts b/src/store/config.ts
index be350f5..99a2a01 100644
--- a/src/store/config.ts
+++ b/src/store/config.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isPlainObject, merge } from 'lodash';
 import Vue from 'vue';
 import { Module } from 'vuex';
 import { ConfigState, ConfigPayload } from './types';
@@ -40,8 +40,8 @@ export const configStore : Module<ConfigState, any> = {
   mutations: {
     updateConfig(state, payload: ConfigPayload) {
       const { key, value } = payload;
-      if (_.isPlainObject(value)) {
-        const tmp = _.merge({}, state.userConfig[key], value);
+      if (isPlainObject(value)) {
+        const tmp = merge({}, state.userConfig[key], value);
         Vue.set(state.userConfig, key, tmp);
       } else {
         Vue.set(state.userConfig, key, value);
@@ -52,7 +52,7 @@ export const configStore : Module<ConfigState, any> = {
   },
   getters: {
     config(state) {
-      return _.merge({}, defaultConfig, state.userConfig);
+      return merge({}, defaultConfig, state.userConfig);
     },
   },
 };
diff --git a/src/store/index.ts b/src/store/index.ts
index 536210b..15ba5f0 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { cloneDeep, merge, map, groupBy, sortBy } from 'lodash';
 import Vue from 'vue';
 import Vuex from 'vuex';
 import { computed, Ref } from '@vue/composition-api';
@@ -33,7 +33,7 @@ const store = new Vuex.Store<RootState>({
         delete payload.full_update;
         state.mainData = payload;
       } else {
-        const tmp: any = _.cloneDeep(state.mainData);
+        const tmp: any = cloneDeep(state.mainData);
         if (payload.torrents_removed) {
           for (const hash of payload.torrents_removed) {
             delete tmp.torrents[hash];
@@ -46,7 +46,7 @@ const store = new Vuex.Store<RootState>({
           }
           delete payload.categories_removed;
         }
-        state.mainData = _.merge(tmp, payload);
+        state.mainData = merge(tmp, payload);
       }
     },
     updatePreferences(state, payload) {
@@ -67,23 +67,22 @@ const store = new Vuex.Store<RootState>({
         return [];
       }
 
-      return _.map(state.mainData.torrents,
-        (value, key) => _.merge({}, value, { hash: key }));
+      return map(state.mainData.torrents, (value, key) => merge({}, value, { hash: key }));
     },
     allCategories(state) {
       if (!state.mainData) {
         return [];
       }
 
-      const categories = _.map(state.mainData.categories,
-        (value, key) => _.merge({}, value, { key }));
-      return _.sortBy(categories, 'name');
+      const categories = map(state.mainData.categories,
+        (value, key) => merge({}, value, { key }));
+      return sortBy(categories, 'name');
     },
     torrentGroupByCategory(state, getters) {
-      return _.groupBy(getters.allTorrents, torrent => torrent.category);
+      return groupBy(getters.allTorrents, torrent => torrent.category);
     },
     torrentGroupBySite(state, getters) {
-      return _.groupBy(getters.allTorrents, (torrent) => {
+      return groupBy(getters.allTorrents, (torrent) => {
         if (!torrent.tracker) {
           return '';
         }
diff --git a/src/store/snackBar.ts b/src/store/snackBar.ts
index 4552a0b..6dbe86b 100644
--- a/src/store/snackBar.ts
+++ b/src/store/snackBar.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { cloneDeep, isString } from 'lodash';
 import { Module } from 'vuex';
 import { SnackBarState } from './types';
 
@@ -10,12 +10,12 @@ export const snackBarStore : Module<SnackBarState, any> = {
   },
   mutations: {
     showSnackBar(state, payload) {
-      if (_.isString(payload)) {
+      if (isString(payload)) {
         state.config = {
           text: payload,
         };
       } else {
-        state.config = _.cloneDeep(payload);
+        state.config = cloneDeep(payload);
       }
     },
     closeSnackBar(state) {
diff --git a/src/utils.ts b/src/utils.ts
index cb7e065..c270adf 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { StateType } from './consts';
 import { Torrent } from './types';
 
@@ -73,7 +72,7 @@ export function codeToFlag(code: string) {
 export const isWindows = navigator.userAgent.includes('Windows');
 
 export function findSameNamedTorrents(allTorrents: Torrent[], torrents: Torrent[]) {
-  const hashes = _.map(torrents, t => t.hash);
+  const hashes = torrents.map(t => t.hash);
   const result = [];
   for (const t1 of torrents) {
     for (const t2 of allTorrents) {