@@ -70,16 +70,16 @@ pub(crate) fn create_comments(
70
70
}
71
71
72
72
let comment = format ! ( "{k}={v}" ) ;
73
+ let comment_bytes = comment. as_bytes ( ) ;
73
74
74
- let comment_b = comment. as_bytes ( ) ;
75
- let bytes_len = comment_b. len ( ) ;
75
+ let Ok ( bytes_len) = u32:: try_from ( comment_bytes. len ( ) ) else {
76
+ err ! ( TooMuchData ) ;
77
+ } ;
76
78
77
- if u32:: try_from ( bytes_len as u64 ) . is_ok ( ) {
78
- * count += 1 ;
79
+ * count += 1 ;
79
80
80
- packet. write_all ( & ( bytes_len as u32 ) . to_le_bytes ( ) ) ?;
81
- packet. write_all ( comment_b) ?;
82
- }
81
+ packet. write_u32 :: < LittleEndian > ( bytes_len) ?;
82
+ packet. write_all ( comment_bytes) ?;
83
83
}
84
84
85
85
Ok ( ( ) )
@@ -88,22 +88,22 @@ pub(crate) fn create_comments(
88
88
fn create_pictures (
89
89
packet : & mut impl Write ,
90
90
count : & mut u32 ,
91
- pictures : & mut dyn Iterator < Item = ( Picture , PictureInformation ) > ,
91
+ pictures : & mut dyn Iterator < Item = ( & Picture , PictureInformation ) > ,
92
92
) -> Result < ( ) > {
93
93
const PICTURE_KEY : & str = "METADATA_BLOCK_PICTURE=" ;
94
94
95
95
for ( pic, info) in pictures {
96
96
let picture = pic. as_flac_bytes ( info, true ) ;
97
97
98
- let bytes_len = picture. len ( ) + PICTURE_KEY . len ( ) ;
98
+ let Ok ( bytes_len) = u32:: try_from ( picture. len ( ) + PICTURE_KEY . len ( ) ) else {
99
+ err ! ( TooMuchData ) ;
100
+ } ;
99
101
100
- if u32:: try_from ( bytes_len as u64 ) . is_ok ( ) {
101
- * count += 1 ;
102
+ * count += 1 ;
102
103
103
- packet. write_u32 :: < LittleEndian > ( bytes_len as u32 ) ?;
104
- packet. write_all ( PICTURE_KEY . as_bytes ( ) ) ?;
105
- packet. write_all ( & picture) ?;
106
- }
104
+ packet. write_u32 :: < LittleEndian > ( bytes_len) ?;
105
+ packet. write_all ( PICTURE_KEY . as_bytes ( ) ) ?;
106
+ packet. write_all ( & picture) ?;
107
107
}
108
108
109
109
Ok ( ( ) )
@@ -189,8 +189,6 @@ where
189
189
II : Iterator < Item = ( & ' a str , & ' a str ) > ,
190
190
IP : Iterator < Item = ( & ' a Picture , PictureInformation ) > ,
191
191
{
192
- const PICTURE_KEY : & str = "METADATA_BLOCK_PICTURE=" ;
193
-
194
192
let mut new_comment_packet = Cursor :: new ( Vec :: new ( ) ) ;
195
193
196
194
new_comment_packet. write_all ( comment_signature) ?;
0 commit comments