Fix more clippy warnings.

Author: FireMasterK

cli/src/main.rs

@@ -744,21 +744,21 @@ fn print_comments(comments: &[Comment]) {
 fn print_richtext(text: &RichText) {
     for c in &text.0 {
         match c {
-            rustypipe::model::richtext::TextComponent::Text { text, style } => {
-                if !text.is_empty() {
-                    let mut tstyle = owo_colors::Style::new();
+            rustypipe::model::richtext::TextComponent::Text { text, style }
+                if !text.is_empty() =>
+            {
+                let mut tstyle = owo_colors::Style::new();
 
-                    if style.bold {
-                        tstyle = tstyle.bold();
-                    }
-                    if style.italic {
-                        tstyle = tstyle.italic();
-                    }
-                    if style.strikethrough {
-                        tstyle = tstyle.strikethrough();
-                    }
-                    anstream::print!("{}", text.style(tstyle));
+                if style.bold {
+                    tstyle = tstyle.bold();
+                }
+                if style.italic {
+                    tstyle = tstyle.italic();
+                }
+                if style.strikethrough {
+                    tstyle = tstyle.strikethrough();
                 }
+                anstream::print!("{}", text.style(tstyle));
             }
             rustypipe::model::richtext::TextComponent::Web { url, .. } => {
                 anstream::print!("{}", url.underline());

codegen/src/gen_dictionary.rs

@@ -41,7 +41,7 @@ fn ta_token_value(n: u8, unit: Option<TimeUnit>) -> String {
     }
 }
 
-fn phf_map_from_str_tokens(tokens: &OrderedHashMap<String, String>) -> phf_codegen::Map<&str> {
+fn phf_map_from_str_tokens(tokens: &OrderedHashMap<String, String>) -> phf_codegen::Map<'_, &str> {
     tokens
         .iter()
         .map(|(txt, tu_str)| {
@@ -51,14 +51,14 @@ fn phf_map_from_str_tokens(tokens: &OrderedHashMap<String, String>) -> phf_codeg
         .collect()
 }
 
-fn phf_map_from_str_u8(tokens: &BTreeMap<String, u8>) -> phf_codegen::Map<&str> {
+fn phf_map_from_str_u8(tokens: &BTreeMap<String, u8>) -> phf_codegen::Map<'_, &str> {
     tokens
         .iter()
         .map(|(txt, n)| (txt.as_str(), n.to_string()))
         .collect()
 }
 
-fn phf_map_from_album_types(tokens: &BTreeMap<String, AlbumType>) -> phf_codegen::Map<&str> {
+fn phf_map_from_album_types(tokens: &BTreeMap<String, AlbumType>) -> phf_codegen::Map<'_, &str> {
     tokens
         .iter()
         .map(|(txt, album_type)| (txt.as_str(), format!("AlbumType::{album_type:?}")))

codegen/src/model.rs

@@ -117,15 +117,6 @@ impl TimeUnit {
     }
 }
 
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum ExtItemType {
-    Track,
-    Video,
-    Episode,
-    Playlist,
-    Artist,
-}
-
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct QBrowse<'a> {

downloader/src/lib.rs

@@ -1035,8 +1035,8 @@ impl DownloadQuery {
 
                     let crop = smartcrop::find_best_crop_no_borders(
                         &img,
-                        NonZeroU32::MIN,
-                        NonZeroU32::MIN,
+                        NonZeroU32::new(1).unwrap(),
+                        NonZeroU32::new(1).unwrap(),
                     )
                     .map_err(|e| DownloadError::AudioTag(format!("image crop: {e}").into()))?
                     .crop;
@@ -1209,18 +1209,32 @@ async fn download_single_file(
         .open(&output_path_tmp)
         .await?;
 
-    let res = if is_gvideo && size.is_some() {
-        download_chunks_by_param(
-            http,
-            &mut file,
-            url,
-            size.unwrap(),
-            offset,
-            user_agent,
-            #[cfg(feature = "indicatif")]
-            pb,
-        )
-        .await
+    let res = if is_gvideo {
+        if let Some(size) = size {
+            download_chunks_by_param(
+                http,
+                &mut file,
+                url,
+                size,
+                offset,
+                user_agent,
+                #[cfg(feature = "indicatif")]
+                pb,
+            )
+            .await
+        } else {
+            download_chunks_by_header(
+                http,
+                &mut file,
+                url,
+                size,
+                offset,
+                user_agent,
+                #[cfg(feature = "indicatif")]
+                pb,
+            )
+            .await
+        }
     } else {
         download_chunks_by_header(
             http,

src/client/pagination.rs

@@ -318,11 +318,10 @@ impl MapJsonResponse<Paginator<HistoryItem<VideoItem>>> for ContinuationJson {
                             &mut map_res,
                         );
                     }
-                    response::YouTubeListItem::ContinuationItemRenderer(ep) => {
-                        if ctoken.is_none() {
-                            ctoken = ep.continuation_endpoint.into_token();
-                        }
+                    response::YouTubeListItem::ContinuationItemRenderer(ep) if ctoken.is_none() => {
+                        ctoken = ep.continuation_endpoint.into_token();
                     }
+                    response::YouTubeListItem::ContinuationItemRenderer(_) => {}
                     _ => {}
                 }
             }

src/client/response/channel.rs

@@ -108,12 +108,6 @@ pub(crate) struct PhBannerView {
     pub image_banner_view_model: ImageView,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct Metadata {
-    pub channel_metadata_renderer: ChannelMetadataRenderer,
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct ChannelMetadataRenderer {
@@ -124,12 +118,6 @@ pub(crate) struct ChannelMetadataRenderer {
     pub vanity_channel_url: Option<String>,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct Microformat {
-    pub microformat_data_renderer: MicroformatDataRenderer,
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct MicroformatDataRenderer {

src/client/response/mod.rs

@@ -26,14 +26,12 @@ use serde::{
     de::{IgnoredAny, Visitor},
     Deserialize,
 };
-use serde_with::{serde_as, DisplayFromStr, VecSkipError};
+use serde_with::{serde_as, VecSkipError};
 
 use crate::error::ExtractionError;
 use crate::serializer::text::{AttributedText, Text, TextComponent};
 use crate::serializer::{MapResult, VecSkipErrorWrap};
 
-use self::video_item::YouTubeListRenderer;
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct ContentRenderer<T> {
@@ -66,12 +64,6 @@ pub(crate) struct SectionList<T> {
     pub section_list_renderer: ContentsRenderer<T>,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct TwoColumnBrowseResults<T> {
-    pub two_column_browse_results_renderer: ContentsRenderer<T>,
-}
-
 #[derive(Default, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct ThumbnailsWrap {
@@ -229,12 +221,6 @@ pub(crate) struct TextComponentBox {
     pub text: TextComponent,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct ResponseContext {
-    pub visitor_data: Option<String>,
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct AttachmentRun {
@@ -290,25 +276,6 @@ pub enum IconName {
 
 // CONTINUATION
 
-#[serde_as]
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct Continuation {
-    /// Number of search results
-    #[serde_as(as = "Option<DisplayFromStr>")]
-    pub estimated_results: Option<u64>,
-    #[serde(
-        alias = "onResponseReceivedCommands",
-        alias = "onResponseReceivedEndpoints"
-    )]
-    #[serde_as(as = "Option<VecSkipError<_>>")]
-    pub on_response_received_actions: Option<Vec<ContinuationActionWrap<YouTubeListItem>>>,
-    /// Used for channel video rich grid renderer
-    ///
-    /// A/B test seen on 19.10.2022
-    pub continuation_contents: Option<RichGridContinuationContents>,
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct ContinuationActionWrap<T> {
@@ -322,12 +289,6 @@ pub(crate) struct ContinuationAction<T> {
     pub continuation_items: MapResult<Vec<T>>,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct RichGridContinuationContents {
-    pub rich_grid_continuation: YouTubeListRenderer,
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct MusicContinuationData {

src/client/response/music_item.rs

@@ -19,7 +19,7 @@ use super::{
     url_endpoint::{
         BrowseEndpointWrap, MusicPage, MusicPageType, MusicVideoType, NavigationEndpoint, PageType,
     },
-    ContentsRenderer, ContinuationActionWrap, ContinuationEndpoint, MusicContinuationData,
+    ContentsRenderer, ContinuationEndpoint, MusicContinuationData,
     SimpleHeaderRenderer, Thumbnails, ThumbnailsWrap,
 };
 
@@ -34,6 +34,7 @@ pub(crate) enum ItemSection {
     #[serde(alias = "musicPlaylistShelfRenderer")]
     MusicShelfRenderer(MusicShelf),
     MusicCarouselShelfRenderer(MusicCarouselShelf),
+    #[allow(dead_code)]
     GridRenderer(GridRenderer),
     #[serde(other, deserialize_with = "deserialize_ignore_any")]
     None,
@@ -249,6 +250,7 @@ pub(crate) struct PlaylistPanelRenderer {
     /// Continuation token for fetching more radio items
     #[serde(default)]
     #[serde_as(as = "VecSkipError<_>")]
+    #[allow(dead_code)]
     pub continuations: Vec<MusicContinuationData>,
 }
 
@@ -333,28 +335,6 @@ impl From<MusicThumbnailRenderer> for Vec<model::Thumbnail> {
     }
 }
 
-/// Music list continuation response model
-#[serde_as]
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct MusicContinuation {
-    pub continuation_contents: Option<ContinuationContents>,
-    #[serde(default)]
-    #[serde_as(as = "VecSkipError<_>")]
-    pub on_response_received_actions: Vec<ContinuationActionWrap<MusicResponseItem>>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-#[allow(clippy::enum_variant_names)]
-pub(crate) enum ContinuationContents {
-    #[serde(alias = "musicPlaylistShelfContinuation")]
-    MusicShelfContinuation(MusicShelf),
-    SectionListContinuation(ContentsRenderer<ItemSection>),
-    PlaylistPanelContinuation(PlaylistPanelRenderer),
-    GridContinuation(GridRenderer),
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct MusicCarouselShelfHeader {
@@ -404,6 +384,7 @@ pub(crate) struct Grid {
 #[serde(rename_all = "camelCase")]
 pub(crate) struct GridRenderer {
     pub items: MapResult<Vec<MusicResponseItem>>,
+    #[allow(dead_code)]
     pub header: Option<GridHeader>,
     #[serde(default)]
     #[serde_as(as = "VecSkipError<_>")]
@@ -413,6 +394,7 @@ pub(crate) struct GridRenderer {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct GridHeader {
+    #[allow(dead_code)]
     pub grid_header_renderer: SimpleHeaderRenderer,
 }
 
@@ -580,25 +562,6 @@ impl MusicListMapper {
         self.map_response(MapResult { c: items, warnings })
     }
 
-    pub fn map_section_node(&mut self, section: &JsonNode<'_>) -> Option<MusicItemType> {
-        if let Ok(section) = section.deserialize::<ItemSection>() {
-            return self.map_item_section(section);
-        }
-        None
-    }
-
-    fn map_item_section(&mut self, section: ItemSection) -> Option<MusicItemType> {
-        match section {
-            ItemSection::MusicShelfRenderer(shelf) => {
-                self.map_response(shelf.contents);
-                None
-            }
-            ItemSection::MusicCarouselShelfRenderer(shelf) => self.map_response(shelf.contents),
-            ItemSection::GridRenderer(grid) => self.map_response(grid.items),
-            ItemSection::None => None,
-        }
-    }
-
     /// Map a ListMusicItem (album/playlist item, search result)
     fn map_list_item(&mut self, item: ListMusicItem) -> Result<Option<MusicItemType>, String> {
         let mut columns = item.flex_columns.into_iter();

src/client/response/playlist.rs

@@ -4,7 +4,7 @@ use serde_with::{serde_as, DefaultOnError, VecSkipError};
 use crate::serializer::text::{AttributedText, Text, TextComponent, TextComponents};
 
 use super::{
-    url_endpoint::OnTapWrap, ContentRenderer, ContentsRenderer, ImageView,
+    url_endpoint::OnTapWrap, ContentRenderer, ImageView,
     PageHeaderRendererContent, PhMetadataView, TextBox, ThumbnailsWrap,
 };
 
@@ -47,39 +47,6 @@ pub(crate) struct Byline {
     pub playlist_byline_renderer: TextBox,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct Sidebar {
-    pub playlist_sidebar_renderer: ContentsRenderer<SidebarItemPrimary>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct SidebarItemPrimary {
-    pub playlist_sidebar_primary_info_renderer: SidebarPrimaryInfoRenderer,
-}
-
-#[serde_as]
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct SidebarPrimaryInfoRenderer {
-    pub description: Option<TextComponents>,
-    pub thumbnail_renderer: PlaylistThumbnailRenderer,
-    /// - `"495", " videos"`
-    /// - `"3,310,996 views"`
-    /// - `"Last updated on ", "Aug 7, 2022"`
-    #[serde_as(as = "Vec<Text>")]
-    pub stats: Vec<String>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct PlaylistThumbnailRenderer {
-    // the alternative field name is used by YTM playlists
-    #[serde(alias = "playlistCustomThumbnailRenderer")]
-    pub playlist_video_thumbnail_renderer: ThumbnailsWrap,
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct PageHeaderRendererInner {