update version 1.3.3

NSMusicS-Electron/package.json

@@ -7,7 +7,7 @@
     "email": "[email protected]"
   },
   "description": "NSMusicS For Web(Electron+Vue3+TS),Multi platform Multi mode Super Music Software (Full stack development, audio processing, artificial intelligence, natural language processing)",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "private": true,
   "license": "AGPL - 3.0",
   "scripts": {

NSMusicS-Electron/resources/config/NSMusicS.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <item>
-<version>1.3.2</version>
+<version>1.3.3</version>
 <url> </url>
 <changelog>https://github.com/Super-Badmen-Viper/NSMusicS/releases</changelog>
 <changelog_explain>

NSMusicS-Electron/src/App.vue

@@ -122,11 +122,11 @@
           key: 'artist',
           icon: renderIcon(UserAvatarFilledAlt)
         },
-        {
-          label: computed(() => renderRouterLink('genre', t('entity.genre_other'))),
-          key: 'genre',
-          icon: renderIcon(TagMultiple24Regular)
-        },
+        // {
+        //   label: computed(() => renderRouterLink('genre', t('entity.genre_other'))),
+        //   key: 'genre',
+        //   icon: renderIcon(TagMultiple24Regular)
+        // },
         // {
         //   label: computed(() => t('TabMusic')),
         //   icon: renderIcon(LibraryMusicOutlined),
@@ -779,7 +779,7 @@
     }
 
     try {
-      store_app_configs_info.version = '1.3.2';
+      store_app_configs_info.version = '1.3.3';
       console.log('Current Version:', store_app_configs_info.version);
       const xmlUrl = 'https://github.com/Super-Badmen-Viper/NSMusicS/releases/download/NSMusicS-Win-Update/NSMusicS.xml';
       await store_app_configs_logic_update.fetchAndParseXML(xmlUrl);
@@ -1083,19 +1083,17 @@
       <n-drawer
         v-model:show="store_playlist_appearance.playlist_show"
         :width="520"
+        z-index="100"
         style="
           border-radius: 12px 0 0 12px;
           border: 1.5px solid #FFFFFF20;
           background-color: rgba(127, 127, 127, 0.1);
           backdrop-filter: blur(10px);
           margin-top: 88px;margin-bottom:88px;
-          z-index: 100;
         ">
         <n-drawer-content style="z-index: 100;">
           <template #default>
-            <Bar_Music_PlayList
-                v-if="store_playlist_appearance.playlist_show"
-                style="z-index: 100;">
+            <Bar_Music_PlayList style="z-index: 100;">
             </Bar_Music_PlayList>
           </template>
         </n-drawer-content>

NSMusicS-Electron/src/data/data_access/servers_configs/jellyfin_api/services_web/Jellyfin_Api_Services_Web.ts

@@ -26,7 +26,7 @@ export class Jellyfin_Api_Services_Web {
             if(store_server_user_model.authorization_of_Je != undefined &&
                 store_server_user_model.authorization_of_Je.length > 0) {
                 const headers = {
-                    'Authorization': `MediaBrowser Token="${store_server_user_model.authorization_of_Je}", Client="Electron Desktop", Device="NSMusicS", DeviceId="NSMusicS-GO", Version="1.3.2"`
+                    'Authorization': `MediaBrowser Token="${store_server_user_model.authorization_of_Je}", Client="Electron Desktop", Device="NSMusicS", DeviceId="NSMusicS-GO", Version="1.3.3"`
                 };
 
                 const queryString = params ? new URLSearchParams(params).toString() : '';

NSMusicS-Electron/src/data/data_access/servers_configs/jellyfin_api/services_web/Users/index_service.ts

@@ -24,7 +24,7 @@ export class Users_ApiService_of_Je extends Jellyfin_Api_Services_Web {
             const url = `${baseUrl}/${endpoint}`;
             const AccessToken = '27ec731cc56344159d05822f13bfef75';
             const headers = {
-                'Authorization': `MediaBrowser Token="${AccessToken}", Client="Electron Desktop", Device="NSMusicS", DeviceId="NSMusicS-GO", Version="1.3.2"`
+                'Authorization': `MediaBrowser Token="${AccessToken}", Client="Electron Desktop", Device="NSMusicS", DeviceId="NSMusicS-GO", Version="1.3.3"`
             };
             const data = {
                 Username: username,

NSMusicS-Electron/src/data/data_access/servers_configs/jellyfin_api/services_web_instant_access/class_Get_Jellyfin_Temp_Data_To_LocalSqlite.ts

@@ -232,15 +232,15 @@ export class Get_Jellyfin_Temp_Data_To_LocalSqlite{
                     const medium_image_url =
                         album.Id != undefined ? (
                             store_server_users.server_select_kind === 'jellyfin'
-                            ?
-                            store_server_users.server_config_of_current_user_of_sqlite?.url + '/Items/' +
-                            album.Id + '/Images/Primary?api_key=' + store_server_user_model.authorization_of_Je
-                            :
-                            store_server_users.server_config_of_current_user_of_sqlite?.url + '/emby/Items/' +
-                            (album.ImageTags?.Primary ? album.Id : album.ParentBackdropItemId) +
-                            (album.ImageTags?.Primary ? '/Images/Primary?fillWidth=122&fillHeight=122&tag=' : '/Images/Backdrop?fillWidth=122&fillHeight=122&tag=') +
-                            (album.ImageTags?.Primary ?? album.ParentBackdropImageTags?.[0] ?? 'default') +
-                            '&api_key=' + store_server_user_model.authorization_of_Je
+                                ?
+                                store_server_users.server_config_of_current_user_of_sqlite?.url + '/Items/' +
+                                album.Id + '/Images/Primary?api_key=' + store_server_user_model.authorization_of_Je
+                                :
+                                store_server_users.server_config_of_current_user_of_sqlite?.url + '/emby/Items/' +
+                                (album.PrimaryImageItemId ? album.PrimaryImageItemId : album.ParentBackdropItemId) +
+                                (album.PrimaryImageItemId ? '/Images/Primary?fillWidth=122&fillHeight=122&tag=' : '/Images/Backdrop?fillWidth=122&fillHeight=122&tag=') +
+                                (album.PrimaryImageItemId ?? album.ParentBackdropImageTags?.[0] ?? 'default') +
+                                '&api_key=' + store_server_user_model.authorization_of_Je
                         ) : undefined
                     store_view_home_page_info.home_Files_temporary_recently_added.push({
                         favorite: album.UserData.IsFavorite,
@@ -1029,15 +1029,15 @@ export class Get_Jellyfin_Temp_Data_To_LocalSqlite{
                     const medium_image_url =
                         album.Id != undefined ? (
                             store_server_users.server_select_kind === 'jellyfin'
-                            ?
-                            store_server_users.server_config_of_current_user_of_sqlite?.url + '/Items/' +
-                            album.Id + '/Images/Primary?api_key=' + store_server_user_model.authorization_of_Je
-                            :
-                            store_server_users.server_config_of_current_user_of_sqlite?.url + '/emby/Items/' +
-                            (album.ImageTags?.Primary ? album.Id : album.ParentBackdropItemId) +
-                            (album.ImageTags?.Primary ? '/Images/Primary?fillWidth=122&fillHeight=122&tag=' : '/Images/Backdrop?fillWidth=122&fillHeight=122&tag=') +
-                            (album.ImageTags?.Primary ?? album.ParentBackdropImageTags?.[0] ?? 'default') +
-                            '&api_key=' + store_server_user_model.authorization_of_Je
+                                ?
+                                store_server_users.server_config_of_current_user_of_sqlite?.url + '/Items/' +
+                                album.Id + '/Images/Primary?api_key=' + store_server_user_model.authorization_of_Je
+                                :
+                                store_server_users.server_config_of_current_user_of_sqlite?.url + '/emby/Items/' +
+                                (album.PrimaryImageItemId ? album.PrimaryImageItemId : album.ParentBackdropItemId) +
+                                (album.PrimaryImageItemId ? '/Images/Primary?fillWidth=122&fillHeight=122&tag=' : '/Images/Backdrop?fillWidth=122&fillHeight=122&tag=') +
+                                (album.PrimaryImageItemId ?? album.ParentBackdropImageTags?.[0] ?? 'default') +
+                                '&api_key=' + store_server_user_model.authorization_of_Je
                         ) : undefined
                     store_view_album_page_info.album_File_metadata.push(album)
                     store_view_album_page_info.album_Files_temporary.push({

NSMusicS-Electron/src/views/view_music/music_components/player_bar/Bar_Music_Player.vue

@@ -420,7 +420,10 @@ async function Play_Media_Order(model_num: string, increased: number) {
   }else if(store_server_user_model.model_server_type_of_web){
     if(!store_server_user_model.random_play_model) {
       // web获取的该列表项总数，触底加载不刷新
-      last_index = store_playlist_list_fetchData._totalCount || store_playlist_list_info.playlist_MediaFiles_temporary.length;
+      if(store_playlist_list_fetchData._totalCount < store_playlist_list_info.playlist_MediaFiles_temporary.length){
+        store_playlist_list_fetchData._totalCount = store_playlist_list_info.playlist_MediaFiles_temporary.length
+      }
+      last_index = store_playlist_list_fetchData._totalCount;
     }else{
       // web随机获取，设置为固定10项，触底加载刷新+10
       last_index = store_playlist_list_info.playlist_MediaFiles_temporary.length
@@ -604,7 +607,7 @@ let unwatch_play_go_index_time =  watch(() => store_player_audio_logic.player_go
 
 ////// open playList
 const Set_Playlist_Show = () => {
-  store_playlist_appearance.playlist_show = true
+  store_playlist_appearance.playlist_show = !store_playlist_appearance.playlist_show
 }
 ////// open sound effects
 const Set_Player_Show_Sound_effects= () => {
@@ -1162,7 +1165,8 @@ watch(() => store_server_user_model.random_play_model, (newValue) => {
           <n-tooltip trigger="hover" placement="top">
             <template #trigger>
               <n-badge :value="store_playlist_list_info.playlist_MediaFiles_temporary.length" show-zero :max="9999" :offset="[-7, 3]">
-                <n-button strong secondary class="gird_Right_current_playlist_button_area_of_button" @click="Set_Playlist_Show">
+                <n-button strong secondary class="gird_Right_current_playlist_button_area_of_button"
+                          @click="Set_Playlist_Show">
                   <template #icon>
                     <n-icon :size="42"><QueueMusicRound/></n-icon>
                   </template>

NSMusicS-Electron/src/views/view_music/music_components/player_list/Table_Music_PlayList_Line_Virtual.vue

@@ -109,7 +109,7 @@ import {
 import {store_view_media_page_logic} from "@/views/view_music/music_page/page_media/store/store_view_media_page_logic";
 import {store_player_audio_logic} from "@/views/view_music/music_page/page_player/store/store_player_audio_logic";
 import {store_view_media_page_info} from "@/views/view_music/music_page/page_media/store/store_view_media_page_info";
-const contextmenu = ref(null as any)// inject("playlist_contextmenu", null);
+const contextmenu = inject("playlist_contextmenu", null);
 async function update_playlist_addMediaFile(id: any, playlist_id: any){
   try{
     await store_local_data_set_mediaInfo.Set_MediaInfo_Add_Selected_Playlist(id,playlist_id)
@@ -220,7 +220,7 @@ onMounted(()=>{
       <v-contextmenu v-if="!store_playlist_list_info.playlist_DragSort_Model"
                      ref="contextmenu"
                      class="v-contextmenu-item v-contextmenu-item--hover"
-                     style="z-index: 9999;">
+                     style="z-index: 9999;position: absolute;">
         <v-contextmenu-submenu :title="menu_item_add_to_songlist">
           <v-contextmenu-item
               v-for="n in store_playlist_list_info.playlist_names_ALLLists"

NSMusicS-Electron/src/views/view_music/music_page/page_album/Table_Album.vue

@@ -972,9 +972,8 @@ onBeforeUnmount(() => {
                       <icon :size="42" color="#FFFFFF" style="margin-left: -2px;margin-top: 3px;"><PlayCircle24Regular/></icon>
                     </button>
                     <div class="hover_buttons_top"
-                         v-if="
-                         store_server_users.server_select_kind != 'jellyfin' ||
-                         store_server_users.server_select_kind != 'emby'">
+                         v-if="(store_server_users.server_select_kind != 'jellyfin' &&store_server_users.server_select_kind != 'emby') || store_server_user_model.model_server_type_of_local"
+                    >
                       <rate
                         class="viaSlot" style="margin-right: 8px;"
                         :length="5"

NSMusicS-Electron/src/views/view_music/music_page/page_genre/store/store_view_genre_page_info.ts

@@ -0,0 +1,13 @@
+import { reactive } from 'vue'
+
+export const store_view_genre_page_info = reactive({
+    genre_File_metadata: [],
+
+    genre_Files_temporary: [],
+
+    genre_page_sizes: 15,
+
+    genre_item_count: 0,
+    genre_starred_count: 0,
+    genre_recently_count: 0
+});

NSMusicS-Electron/src/views/view_music/music_page/page_genre/store/store_view_genre_page_logic.ts

@@ -0,0 +1,17 @@
+import {reactive, watch} from 'vue'
+import {store_router_history_data_of_genre} from "@/router/router_store/store_router_history_data_of_genre";
+import {store_view_genre_page_fetchData} from "./store_view_genre_page_fetchData";
+import {store_router_data_info} from "@/router/router_store/store_router_data_info";
+import {store_app_configs_logic_save} from "@/data/data_stores/app/store_app_configs_logic_save";
+
+export const store_view_genre_page_logic = reactive({
+    list_data_StartUpdate: false,
+});
+watch(() => store_view_genre_page_logic.list_data_StartUpdate, (newValue) => {
+    if(newValue) {
+        store_view_genre_page_fetchData.fetchData_Album()
+
+        store_view_genre_page_logic.list_data_StartUpdate = false
+        console.log('page_genrelists_reset_data?:' + newValue)
+    }
+});