Merge branch 'feature/task_list_201905312258'

# Conflicts:
#	src/renderer/components/Native/EngineClient.vue

Author: agalwood

src/renderer/api/Api.js

@@ -136,6 +136,18 @@ export default class Api {
     })
   }
 
+  getOption (params = {}) {
+    const { gid } = params
+    const args = compactUndefined([gid])
+
+    return new Promise((resolve) => {
+      this.client.call('getOption', ...args)
+        .then((data) => {
+          resolve(changeKeysToCamelCase(data))
+        })
+    })
+  }
+
   getGlobalStat () {
     return this.client.call('getGlobalStat')
   }
@@ -145,8 +157,9 @@ export default class Api {
       uris,
       options
     } = params
+    const kebabOptions = changeKeysToKebabCase(options)
     const tasks = uris.map((uri) => {
-      const args = compactUndefined([[uri], options])
+      const args = compactUndefined([[uri], kebabOptions])
       return [ 'aria2.addUri', ...args ]
     })
     return this.client.multicall(tasks)
@@ -157,7 +170,8 @@ export default class Api {
       torrent,
       options
     } = params
-    const args = compactUndefined([torrent, [], options])
+    const kebabOptions = changeKeysToKebabCase(options)
+    const args = compactUndefined([torrent, [], kebabOptions])
     return this.client.call('addTorrent', ...args)
   }
 
@@ -166,7 +180,8 @@ export default class Api {
       metalink,
       options
     } = params
-    const args = compactUndefined([metalink, options])
+    const kebabOptions = changeKeysToKebabCase(options)
+    const args = compactUndefined([metalink, kebabOptions])
     return this.client.call('addMetalink', ...args)
   }
 

src/renderer/assets/icons/task-history.svg

@@ -45,9 +45,6 @@
       }
     },
     methods: {
-      open (link) {
-        this.$electron.shell.openExternal(link)
-      },
       showAddTask (taskType = 'uri') {
         this.$store.dispatch('app/showAddTaskDialog', taskType)
       },

src/renderer/assets/icons/task-restart.svg

@@ -0,0 +1,11 @@
+import Icon from '@/components/Icons/Icon'
+
+Icon.register({
+  'task-history': {
+    'width': 24,
+    'height': 24,
+    'paths': [{
+      'd': 'M12,0C5.383,0,0,5.383,0,12s5.383,12,12,12s12-5.383,12-12S18.617,0,12,0z M19,13h-8V5h2v6h6V13z'
+    }]
+  }
+})

src/renderer/components/Aside/Index.vue

@@ -0,0 +1,17 @@
+import Icon from '@/components/Icons/Icon'
+
+Icon.register({
+  'task-restart': {
+    'width': 24,
+    'height': 24,
+    'raw': `<path data-cap="butt" fill="none" stroke="currentColor" stroke-miterlimit="10" d="M6.121,20.121 C7.727,21.22,9.907,22,12,22c5.523,0,10-4.477,10-10c0-5.523-4.477-10-10-10C8.101,2,4.728,4.233,3.078,7.488"/>
+      <polyline fill="none" stroke="currentColor" stroke-miterlimit="10" points="2.278,1.588 3.078,7.488 9.078,6.688 "/>
+      <circle data-color="color-2" fill="none" stroke-miterlimit="10" cx="4" cy="18" r="3"/>`,
+    'g': {
+      'stroke': 'currentColor',
+      'stroke-linecap': 'round',
+      'stroke-linejoin': 'round',
+      'stroke-width': '2'
+    }
+  }
+})

src/renderer/components/Icons/task-history.js

@@ -92,13 +92,21 @@
           })
       },
       onDownloadError (event) {
-        console.log('aria2 onDownloadError', event)
         const [{ gid }] = event
         this.fetchTaskItem({ gid })
           .then((task) => {
             const taskName = getTaskName(task)
+            const { errorCode, errorMessage } = task
+            console.error(`[Motrix] download error===> Gid: ${gid}, #${errorCode}, ${errorMessage}`)
             const message = this.$t('task.download-error-message', { taskName })
-            this.$msg.error(message)
+            const link = `<a target="_blank" href="https://github.com/agalwood/Motrix/wiki/Error#${errorCode}" rel="noopener noreferrer">#${errorCode}</a>`
+            this.$msg({
+              type: 'error',
+              showClose: true,
+              duration: 5000,
+              dangerouslyUseHTMLString: true,
+              message: `${message} ${link}`
+            })
           })
       },
       onDownloadComplete (event) {
@@ -196,6 +204,7 @@
       polling () {
         this.$store.dispatch('app/fetchGlobalStat')
         this.$store.dispatch('task/fetchList')
+
         if (this.taskItemInfoVisible && this.currentTaskItem) {
           this.$store.dispatch('task/fetchItem', this.currentTaskItem.gid)
         }

src/renderer/components/Icons/task-restart.js

@@ -62,9 +62,13 @@ export function moveTaskFilesToTrash (task, messages = {}) {
     return false
   }
 
-  const deleteResult1 = remote.shell.moveItemToTrash(path)
-  if (!deleteResult1 && delFailMsg) {
-    Message.error(delFailMsg)
+  let deleteResult1 = true
+  const isFileExist = existsSync(path)
+  if (isFileExist) {
+    deleteResult1 = remote.shell.moveItemToTrash(path)
+    if (!deleteResult1 && delFailMsg) {
+      Message.error(delFailMsg)
+    }
   }
 
   let deleteResult2 = true

src/renderer/components/Native/EngineClient.vue

@@ -127,7 +127,7 @@
   import '@/components/Icons/inbox'
 
   const initialForm = (state) => {
-    const { addTaskUrl } = state.app
+    const { addTaskUrl, addTaskOptions } = state.app
     const { dir, split, newTaskShowDownloading } = state.preference.config
     const result = {
       uris: addTaskUrl,
@@ -139,7 +139,8 @@
       cookie: '',
       dir,
       split,
-      newTaskShowDownloading
+      newTaskShowDownloading,
+      ...addTaskOptions
     }
     return result
   }
@@ -222,6 +223,7 @@
       },
       handleClose (done) {
         this.$store.dispatch('app/hideAddTaskDialog')
+        this.$store.dispatch('app/updateAddTaskOptions', {})
       },
       handleClosed () {
         this.reset()
@@ -258,6 +260,7 @@
         this.form.dir = dir
       },
       reset () {
+        this.showAdvanced = false
         this.form = initialForm(this.$store.state)
       },
       handleCancel (formName) {
@@ -302,7 +305,7 @@
             selectFile !== SELECTED_ALL_FILES &&
             selectFile !== NONE_SELECTED_FILES
           ) {
-            result['select-file'] = selectFile
+            result.selectFile = selectFile
           }
         }
 
@@ -369,6 +372,7 @@
 
           try {
             this.addTask(this.type, this.form)
+
             this.$store.dispatch('app/hideAddTaskDialog')
             if (this.form.newTaskShowDownloading) {
               this.$router.push({

src/renderer/components/Native/utils.js

@@ -47,9 +47,6 @@
       'status': 'onStatusChange'
     },
     methods: {
-      open (link) {
-        this.$electron.shell.openExternal(link)
-      },
       onStatusChange () {
         this.changeCurrentList()
       },