Skip to content

Commit 60aef26

Browse files
committed
fix bug: duplicate extension in file_name
1 parent d035e2e commit 60aef26

7 files changed

Lines changed: 20 additions & 22 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
99
-->
1010

1111
## [Unreleased]
12+
## [0.5.2] - 2025-03-14
13+
14+
- fix bug: duplicate extension in file_name
15+
1216
## [0.5.1] - 2025-03-14
1317

1418
- support audio

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bot/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "telegram_sync_bot"
3-
version = "0.5.1"
3+
version = "0.5.2"
44
edition = "2024"
55
authors = ["Louis <836250617@qq.com>"]
66
description = "A telegram bot to sync files to local server."

bot/src/handler/message.rs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ async fn handle(bot: Bot, dialogue: MyDialogue, msg: Message, storage: MyStorage
5555
}
5656
MediaKind::Video(video) => {
5757
let file_id = video.video.file.id;
58-
let file_name = format!(
58+
let file_name = video.video.file_name.unwrap_or(format!(
5959
"{}.{}",
60-
video.video.file_name.unwrap_or(file_id.clone()),
60+
file_id.clone(),
6161
video
6262
.video
6363
.mime_type
6464
.and_then(|m| m.suffix().map(|n| n.as_str().to_owned()))
6565
.unwrap_or("mp4".to_string())
66-
);
66+
));
6767
if video.media_group_id.is_some() {
6868
// break up the group
6969
let old = msg_id;
@@ -79,18 +79,15 @@ async fn handle(bot: Bot, dialogue: MyDialogue, msg: Message, storage: MyStorage
7979
}
8080
MediaKind::Audio(audio) => {
8181
let file_id = audio.audio.file.id;
82-
let file_name = format!(
82+
let file_name = audio.audio.file_name.unwrap_or(format!(
8383
"{}.{}",
84-
audio
85-
.audio
86-
.title
87-
.unwrap_or(audio.audio.file_name.unwrap_or(file_id.clone())),
84+
file_id.clone(),
8885
audio
8986
.audio
9087
.mime_type
9188
.and_then(|m| m.suffix().map(|n| n.as_str().to_owned()))
9289
.unwrap_or("mp3".to_string())
93-
);
90+
));
9491
if audio.media_group_id.is_some() {
9592
// break up the group
9693
let old = msg_id;
@@ -105,13 +102,8 @@ async fn handle(bot: Bot, dialogue: MyDialogue, msg: Message, storage: MyStorage
105102
Some((file_id, file_name))
106103
}
107104
MediaKind::Photo(photo) => {
108-
let file_id = photo
109-
.photo
110-
.into_iter()
111-
.max_by_key(|p| p.height)
112-
.unwrap()
113-
.file
114-
.id;
105+
let file = photo.photo.into_iter().max_by_key(|p| p.height).unwrap();
106+
let file_id = file.file.id;
115107
let file_name = format!("{}.jpg", file_id);
116108
if photo.media_group_id.is_some() {
117109
// break up the group

k8s/deployment.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ spec:
77
matchLabels:
88
app: sync-bot
99
replicas: 1
10+
strategy:
11+
type: Recreate
1012
template:
1113
metadata:
1214
labels:
@@ -31,7 +33,7 @@ spec:
3133
mountPath: /app/data
3234

3335
- name: bot
34-
image: localhost/bot:0.5.1
36+
image: localhost/bot:0.5.2
3537
imagePullPolicy: Never
3638
args:
3739
- run

k8s/pv.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ spec:
1111
persistentVolumeReclaimPolicy: Retain
1212
storageClassName: ""
1313
local:
14-
path: /run/media/louis/Btrfs/sync-bot
14+
path: /run/media/louis/Btrfs/sync-bot # Path to the data directory on the host
1515
nodeAffinity:
1616
required:
1717
nodeSelectorTerms:
1818
- matchExpressions:
1919
- key: kubernetes.io/hostname
2020
operator: In
2121
values:
22-
- louis
22+
- louis # Hostname of the node

sync-bot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
name: data
3232

3333
- name: bot
34-
image: bot:0.5.1
34+
image: bot:0.5.2
3535
args:
3636
- run
3737
- -d

0 commit comments

Comments
 (0)