feat: add choose cover

Author: Mivik

phira/locales/en-US/favorites.ftl

@@ -13,6 +13,8 @@ invalid-import = Invalid import code
 
 rename = Rename
 set-description = Set description
+set-cover = Set cover
+select-cover = Please select a chart as cover
 
 delete = Delete Folder
 deleted = Folder deleted

phira/locales/zh-CN/favorites.ftl

@@ -13,6 +13,8 @@ invalid-import = 无效的导入代码
 
 rename = 重命名
 set-description = 设置描述
+set-cover = 设置封面
+select-cover = 请选择一个谱面作为封面
 
 delete = 删除收藏夹
 deleted = 已删除收藏夹

phira/src/charts_view.rs

@@ -1,8 +1,8 @@
 use crate::{
-    client::Chart,
+    client::{Chart, CollectionCover},
     dir, get_data, get_data_mut,
     icons::Icons,
-    page::{ChartItem, ChartType, Fader, Illustration},
+    page::{ChartItem, ChartType, Fader, Illustration, CHOOSE_COVER, CHOSEN_COVER},
     save_data,
     scene::{render_release_to_refresh, SongScene, MP_PANEL},
 };
@@ -182,6 +182,16 @@ impl ChartsView {
                             if handled_by_mp {
                                 continue;
                             }
+                            if CHOOSE_COVER.load(Ordering::Relaxed) {
+                                CHOSEN_COVER.with(|it| {
+                                    *it.borrow_mut() = Some(if let Some(id) = chart.info.id {
+                                        Ok(id)
+                                    } else {
+                                        Err(chart.local_path.clone().unwrap())
+                                    });
+                                });
+                                continue;
+                            }
                             let download_path = chart.info.id.map(|it| format!("download/{it}"));
                             let scene = SongScene::new(
                                 chart.clone(),

phira/src/client/model/collection.rs

@@ -125,6 +125,7 @@ impl LocalCollection {
 pub enum CollectionPatch {
     Toggle(i32),
     Public(bool),
+    Cover(i32),
 }
 
 #[derive(Serialize)]

phira/src/page.rs

@@ -11,7 +11,7 @@ mod home;
 pub use home::HomePage;
 
 mod library;
-pub use library::{LibraryPage, FAV_UPDATED};
+pub use library::{LibraryPage, CHOOSE_COVER, CHOSEN_COVER, FAV_UPDATED};
 
 mod message;
 pub use message::MessagePage;

phira/src/page/favorites.rs

@@ -2,13 +2,13 @@ prpr_l10n::tl_file!("favorites");
 
 use super::{Illustration, NextPage, Page, SharedState};
 use crate::{
-    client::{recv_raw, Chart, ChartRef, Client, Collection, CollectionContent, CollectionPatch, LocalCollection, UserManager},
+    client::{Chart, ChartRef, Client, Collection, CollectionContent, CollectionCover, CollectionPatch, File, LocalCollection, Ptr, UserManager, recv_raw},
     get_data, get_data_mut,
     icons::Icons,
-    page::SFader,
+    page::{CHOOSE_COVER, SFader},
     popup::Popup,
     save_data,
-    scene::{confirm_dialog, ProfileScene, TEX_BACKGROUND},
+    scene::{ProfileScene, TEX_BACKGROUND, confirm_dialog},
 };
 use anyhow::Result;
 use chrono::{DateTime, Utc};
@@ -96,16 +96,19 @@ pub struct FavoritesPage {
     sf: SFader,
     next_page: Option<NextPage>,
 
+    chosen_cover: Option<Result<i32, String>>,
+
     upload_task: Option<Task<Result<Collection>>>,
     delete_from_cloud_task: Option<Task<Result<()>>>,
     set_public_task: Option<Task<Result<Collection>>>,
     sync_task: Option<Task<Result<Option<Collection>>>>,
     import_task: Option<Task<Result<Collection>>>,
     batch_import_task: Option<Task<Result<Vec<Chart>>>>,
+    set_cover_task: Option<Task<Result<Result<Collection, File>>>>,
 }
 
 impl FavoritesPage {
-    pub fn new(icons: Arc<Icons>, rank_icons: [SafeTexture; 8], active_folder: Option<usize>) -> Self {
+    pub fn new(icons: Arc<Icons>, rank_icons: [SafeTexture; 8], active_folder: Option<usize>, chosen_cover: Option<Result<i32, String>>) -> Self {
         let mut page = Self {
             icons,
             rank_icons,
@@ -142,12 +145,15 @@ impl FavoritesPage {
             sf: SFader::new(),
             next_page: None,
 
+            chosen_cover,
+
             upload_task: None,
             delete_from_cloud_task: None,
             set_public_task: None,
             sync_task: None,
             import_task: None,
             batch_import_task: None,
+            set_cover_task: None,
         };
         page.rebuild_folders();
         page
@@ -239,6 +245,7 @@ impl FavoritesPage {
             || self.sync_task.is_some()
             || self.import_task.is_some()
             || self.batch_import_task.is_some()
+            || self.set_cover_task.is_some()
     }
 
     fn collect_chart_ids(&self, col: &LocalCollection, allow_local: bool) -> Option<Vec<i32>> {
@@ -400,6 +407,7 @@ impl Page for FavoritesPage {
                 if col.is_owned() {
                     options.push("rename");
                     options.push("set-description");
+                    options.push("set-cover");
                 }
                 if !is_default && col.is_owned() {
                     options.push("set-as-default");
@@ -477,6 +485,42 @@ impl Page for FavoritesPage {
             folder.cover.settle(t);
         }
 
+        if let Some(chosen_cover) = self.chosen_cover.take() {
+            let data = get_data_mut();
+            let col = &mut data.collections[self.active_folder.unwrap()];
+            match chosen_cover {
+                Ok(chart_id) => {
+                    let col_id = col.id;
+                    self.set_cover_task = Some(Task::new(async move {
+                        if let Some(col_id) = col_id {
+                            // Collection is synced, update cloud directly
+                            let resp: Collection =
+                                recv_raw(Client::request(Method::PATCH, format!("/collection/{col_id}")).json(&CollectionPatch::Cover(chart_id)))
+                                    .await?
+                                    .json()
+                                    .await?;
+                            Ok(Ok(resp))
+                        } else {
+                            // Collection is not synced, fetch chart
+                            // illustration and set as cover locally
+                            let chart = Ptr::<Chart>::new(chart_id).fetch().await?;
+                            Ok(Err(chart.illustration.clone()))
+                        }
+                    }));
+                }
+                Err(local_path) => {
+                    if col.id.is_some() {
+                        Dialog::simple(ttl!("favorites-online-only")).show();
+                    } else {
+                        col.cover = CollectionCover::LocalChart(local_path);
+                        let _ = save_data();
+                        show_message(tl!("updated")).ok();
+                        self.rebuild_folders();
+                    }
+                }
+            }
+        }
+
         // 处理输入事件 || Handle input events
         if let Some((id, text)) = take_input() {
             match id.as_str() {
@@ -578,6 +622,12 @@ impl Page for FavoritesPage {
                     "set-description" => {
                         request_input("fav_description", &data.collections[index].description);
                     }
+                    "set-cover" => {
+                        FAV_PAGE_RESULT.with(|it| *it.borrow_mut() = Some(Some(index)));
+                        CHOOSE_COVER.store(true, Ordering::Relaxed);
+                        show_message(tl!("select-cover"));
+                        self.next_page = Some(NextPage::Pop);
+                    }
                     "duplicate" => {
                         let col = &data.collections[index];
                         data.collections.push(LocalCollection {
@@ -822,6 +872,33 @@ impl Page for FavoritesPage {
                 self.batch_import_task = None;
             }
         }
+        if let Some(task) = &mut self.set_cover_task {
+            if let Some(result) = task.take() {
+                match result {
+                    Ok(Ok(col)) => {
+                        let data = get_data_mut();
+                        let local = &mut data.collections[self.active_folder.unwrap()];
+                        local.id = Some(col.id);
+                        local.assign_from(&col);
+                        let _ = save_data();
+                        show_message(tl!("updated")).ok();
+                        self.rebuild_folders();
+                    }
+                    Ok(Err(cover)) => {
+                        let data = get_data_mut();
+                        let col = &mut data.collections[self.active_folder.unwrap()];
+                        col.cover = CollectionCover::Online(cover);
+                        let _ = save_data();
+                        show_message(tl!("updated")).ok();
+                        self.rebuild_folders();
+                    }
+                    Err(err) => {
+                        show_error(err);
+                    }
+                }
+                self.set_cover_task = None;
+            }
+        }
 
         Ok(())
     }

phira/src/page/library.rs

@@ -24,6 +24,7 @@ use prpr::{
 use std::{
     any::Any,
     borrow::Cow,
+    cell::RefCell,
     ops::Deref,
     sync::{
         atomic::{AtomicBool, Ordering},
@@ -33,6 +34,11 @@ use std::{
 use tap::Tap;
 
 pub static FAV_UPDATED: AtomicBool = AtomicBool::new(false);
+pub static CHOOSE_COVER: AtomicBool = AtomicBool::new(false);
+
+thread_local! {
+    pub static CHOSEN_COVER: RefCell<Option<Result<i32, String>>> = const { RefCell::new(None) };
+}
 
 const PAGE_NUM: u64 = 28;
 
@@ -306,18 +312,21 @@ impl Page for LibraryPage {
 
     fn touch(&mut self, touch: &Touch, s: &mut SharedState) -> Result<bool> {
         let t = s.t;
-        if self.order_menu.showing() {
-            self.order_menu.touch(touch, t);
-            return Ok(true);
-        }
-        if self.tabs.touch(touch, s.rt) {
-            return Ok(true);
-        }
-        if self.tags.touch(touch, t) {
-            return Ok(true);
-        }
-        if self.rating.touch(touch, t) {
-            return Ok(true);
+        let choose_cover = CHOOSE_COVER.load(Ordering::Relaxed);
+        if !choose_cover {
+            if self.order_menu.showing() {
+                self.order_menu.touch(touch, t);
+                return Ok(true);
+            }
+            if self.tabs.touch(touch, s.rt) {
+                return Ok(true);
+            }
+            if self.tags.touch(touch, t) {
+                return Ok(true);
+            }
+            if self.rating.touch(touch, t) {
+                return Ok(true);
+            }
         }
         let charts_view = &mut self.tabs.selected_mut().view;
         if charts_view.transiting() {
@@ -326,6 +335,9 @@ impl Page for LibraryPage {
         if charts_view.touch(touch, t, s.rt)? {
             return Ok(true);
         }
+        if choose_cover {
+            return Ok(true);
+        }
         if !matches!(self.tabs.selected().ty, ChartListType::Local) {
             if self.prev_page_btn.touch(touch, t) {
                 if self.current_page != 0 {
@@ -351,7 +363,7 @@ impl Page for LibraryPage {
                 }
                 if self.fav_btn.touch(touch, t) {
                     self.next_page =
-                        Some(NextPage::Overlay(Box::new(FavoritesPage::new(self.icons.clone(), self.rank_icons.clone(), self.current_fav_index))));
+                        Some(NextPage::Overlay(Box::new(FavoritesPage::new(self.icons.clone(), self.rank_icons.clone(), self.current_fav_index, None))));
                     return Ok(true);
                 }
                 if !self.search_str.is_empty() && self.search_clr_btn.touch(touch) {
@@ -398,6 +410,16 @@ impl Page for LibraryPage {
     fn update(&mut self, s: &mut SharedState) -> Result<()> {
         let t = s.t;
 
+        if let Some(chosen_cover) = CHOSEN_COVER.with(|it| it.borrow_mut().take()) {
+            CHOOSE_COVER.store(false, Ordering::Relaxed);
+            self.next_page = Some(NextPage::Overlay(Box::new(FavoritesPage::new(
+                self.icons.clone(),
+                self.rank_icons.clone(),
+                self.current_fav_index,
+                Some(chosen_cover),
+            ))));
+        }
+
         // 在 update 中处理收藏夹选择结果，绕开fader那个的0.7秒延迟  ||  Handle the favorites folder selection result in update, bypassing the 0.7-second delay of the fader
         if let Some(result) = FAV_PAGE_RESULT.with(|it| it.borrow_mut().take()) {
             self.current_fav_index = result;

phira/src/scene/song.rs

@@ -1312,7 +1312,7 @@ impl SongScene {
 
     fn toggle_in(&mut self, col: &mut LocalCollection) {
         if col.id.is_some() && self.info.id.is_none() {
-            show_message(tl!("favorites-local-only")).ok();
+            Dialog::simple(ttl!("favorites-online-only")).show();
             return;
         }
 
@@ -1892,8 +1892,11 @@ impl Scene for SongScene {
         }
         if self.fav_menu.changed() {
             let selected = self.fav_menu.selected();
+            self.fav_menu.set_selected(usize::MAX);
             self.toggle_in(&mut get_data_mut().collections[self.fav_menu_options[selected]]);
             let _ = save_data();
+            let options = self.get_fav_menu_options();
+            self.fav_menu.set_options(options);
         }
         if self.chart_should_delete.fetch_and(false, Ordering::Relaxed) {
             let id = self.info.id.unwrap();