From 3cec4de15e4b9fe233b061c1dd107873fde8110a Mon Sep 17 00:00:00 2001
From: Dooy <dooy520@qq.com>
Date: Sun, 9 Jun 2024 15:21:21 +0800
Subject: [PATCH] v2.18.5

---
 changlog.md                |  4 ++++
 package.json               |  2 +-
 src-tauri/tauri.conf.json  |  2 +-
 src/api/suno.ts            |  2 +-
 src/views/suno/mcInput.vue | 15 +++++++++++++--
 src/views/suno/mcList.vue  | 14 ++++++++++++--
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/changlog.md b/changlog.md
index 60b38005e..e141a2239 100644
--- a/changlog.md
+++ b/changlog.md
@@ -1,6 +1,10 @@
 # 功能升级日志
 
 #  计划
+# 2.18.5
+- 😄 升级：将suno可版本选择 v3 v3.5
+- 🐞 修复：suno 生成失败 error 状态
+
 # 2.18.4
 - 😄 升级：将suno 升级为3.5版本
 
diff --git a/package.json b/package.json
index 358344472..ae2fa1bad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web-midjourney-proxy",
-  "version": "2.18.4",
+  "version": "2.18.5",
   "private": false,
   "description": "ChatGPT Web Midjourney Proxy",
   "author": "Dooy <ydlhero@gmail.com>",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index c2ec7f91d..84f3a64b4 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "ChatGPT-MJ",
-    "version": "2.18.4"
+    "version": "2.18.5"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/api/suno.ts b/src/api/suno.ts
index 908177ed2..97580d464 100644
--- a/src/api/suno.ts
+++ b/src/api/suno.ts
@@ -67,7 +67,7 @@ export const FeedTask= async (ids:string[])=>{
     mlog('FeedTask',d )
     d.forEach( (item:SunoMedia) =>{
          sunoS.save( item)
-        if(item.status== "complete"){
+        if(item.status== "complete" || item.status== "error" ){
             ids= ids.filter(v=>v!=item.id )
         }
     });
diff --git a/src/views/suno/mcInput.vue b/src/views/suno/mcInput.vue
index 6d2be54bc..7748c99d3 100644
--- a/src/views/suno/mcInput.vue
+++ b/src/views/suno/mcInput.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref,computed ,onMounted} from 'vue';
-import { NTabs ,NTabPane ,NInput,NSwitch ,NTooltip, NTag ,NButton, useMessage} from "naive-ui";
+import { NTabs ,NTabPane ,NInput,NSwitch ,NTooltip, NTag ,NButton, useMessage,NSelect} from "naive-ui";
 import { SvgIcon } from '@/components/common';
 import { mlog } from '@/api';
 import { sunoFetch ,lyricsFetch, randStyle, FeedTask} from '@/api/suno';
@@ -24,6 +24,11 @@ const cs= ref({
 
 });
 
+const mvOption= [
+{label: 'verion: v3.5',value: 'chirp-v3-5'}
+,{label:'verion: v3',value: 'chirp-v3-0'}
+ ]
+
 const canPost = computed(() => {
    // return true; 
     if( st.value.isLoading ) return false;
@@ -125,6 +130,9 @@ const generate= async ()=>{
                 :placeholder="$t('suno.descpls')"  type="textarea"  size="small"   
                 :autosize="{ minRows: 3, maxRows: 12  }"  />
             </div>
+            <div  class="pt-1">
+                 <n-select v-model:value="des.mv" :options="mvOption" size="small" />
+            </div>
         </n-tab-pane>
 
         <n-tab-pane name="custom" :tab="$t('suno.custom')">
@@ -166,10 +174,13 @@ const generate= async ()=>{
                 </div>
             </div>
             <div  class="pt-1"> 
-            <n-input v-model:value="cs.prompt" :disabled="des.make_instrumental"
+                <n-input v-model:value="cs.prompt" :disabled="des.make_instrumental"
                 :placeholder="$t('suno.lypls')" type="textarea"  size="small"   
                 :autosize="{ minRows: 3, maxRows: 12  }"  />
             </div>
+            <div  class="pt-1">
+                <n-select v-model:value="cs.mv" :options="mvOption" size="small" />
+            </div>
         </n-tab-pane>
     </n-tabs>
 
diff --git a/src/views/suno/mcList.vue b/src/views/suno/mcList.vue
index baf174591..9d2ebd043 100644
--- a/src/views/suno/mcList.vue
+++ b/src/views/suno/mcList.vue
@@ -7,12 +7,14 @@ import {   sunoStore, SunoMedia} from '@/api/sunoStore';
 import playui from './playui.vue';
 import { homeStore } from '@/store';
 import { mlog } from '@/api';
-import {NEmpty, NImage } from "naive-ui"
+import {NEmpty, NImage ,useMessage} from "naive-ui"
 import { FeedTask } from '@/api/suno';
 
 const list= ref<SunoMedia[]>([]);
 const csuno= new sunoStore()
 const st= ref({playid:''});
+
+const ms = useMessage();
 const initLoad=()=>{
     let arr = csuno.getObjs();
     list.value= arr.reverse()
@@ -25,8 +27,13 @@ const getNowCls=(v:any)=>{
     return [];
 }
 const goPlay=(v:SunoMedia)=>{
+    if(v.status=='error'){
+        ms.info("这首歌生成失败！")
+        return ;
+    }
     st.value.playid=v.id
     homeStore.setMyData({act:'goPlay',actData:v})
+    
     if(v.status!='complete'){
         FeedTask([v.id ])
     }
@@ -95,7 +102,10 @@ initLoad();
              {{$t('suno.noly')}}
               </div>
             <div class="text-right text-[14px] flex justify-end items-center space-x-2  ">
-                <div class="text-[10px] flex items-center border-[1px] border-gray-500/30 px-0.5 list-none rounded-md" v-if="item.metadata && item.metadata.duration"> {{item.metadata.duration.toFixed(1)}}s</div>
+             
+                <div v-if="item.status=='error'" class="text-[8px] flex items-center border-[1px] border-red-500/80 px-1 list-none rounded-md ">失败</div>
+                <div class="text-[8px] flex items-center border-[1px] border-gray-500/30 px-1 list-none rounded-md" v-if="item.major_model_version"> {{item.major_model_version}}</div>
+                <div class="text-[8px] flex items-center border-[1px] border-gray-500/30 px-1 list-none rounded-md" v-if="item.metadata && item.metadata.duration"> {{item.metadata.duration.toFixed(1)}}s</div>
                 <SvgIcon icon="mdi:play-circle-outline" class="cursor-pointer"  @click="goPlay( item )" />
                 <a :href="item.audio_url" download  target="_blank"><SvgIcon icon="mdi:download" class="cursor-pointer"/></a>
             </div>