[PR #606] [MERGED] Finish tokio migration #997

New issue

Closed

opened 2026-02-27 20:00:45 +03:00 by kerem · 0 comments

kerem commented

2026-02-27 20:00:45 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/librespot-org/librespot/pull/606
Author: @Johannesd3
Created: 2/21/2021
Status: ✅ Merged
Merged: 2/23/2021
Merged by: @ashthespy

Base: tokio_migration ← Head: tokio_connect_migration

📝 Commits (5)

daf7ecd Migrate librespot-connect to tokio 1.0
2c81aaa Implement MercurySender not as sink
1c4d57c Add shutdown to discovery server
007e653 Restore original blocking player behaviour
220061e Migrate application to tokio 1.0

📊 Changes

12 files changed (+1255 additions, -491 deletions)

View changed files

📝 Cargo.lock (+295 -83)
📝 Cargo.toml (+23 -7)
📝 connect/Cargo.toml (+4 -4)
📝 connect/src/discovery.rs (+55 -78)
📝 connect/src/spirc.rs (+129 -166)
📝 core/src/mercury/mod.rs (+31 -29)
📝 core/src/mercury/sender.rs (+17 -38)
📝 core/src/session.rs (+13 -2)
📝 playback/src/player.rs (+67 -67)
📝 src/lib.rs (+1 -1)
➕ src/main.rs (+600 -0)
📝 src/player_event_handler.rs (+20 -16)

📄 Description

This PR finishes the tokio migration. The application is working again - after all it was easier than I thought -, but I'm pretty sure it's not perfect yet.

I had to figure out how to make the player blocking again because there were some mysterious bugs in the async version (now it's again unimportant whether the sinks are Send, but it's nice to have).

@sashahilton00 @ashthespy How do we proceed? Before merging it into dev it should be tested more thoroughly, and I would like to do some refactoring.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/librespot-org/librespot/pull/606 **Author:** [@Johannesd3](https://github.com/Johannesd3) **Created:** 2/21/2021 **Status:** ✅ Merged **Merged:** 2/23/2021 **Merged by:** [@ashthespy](https://github.com/ashthespy) **Base:** `tokio_migration` ← **Head:** `tokio_connect_migration` --- ### 📝 Commits (5) - [`daf7ecd`](https://github.com/librespot-org/librespot/commit/daf7ecd23a26f124b91c915ee8f39cc3d30b0840) Migrate librespot-connect to tokio 1.0 - [`2c81aaa`](https://github.com/librespot-org/librespot/commit/2c81aaaf4e440a41ca5c2a37f0f760e70958951b) Implement MercurySender not as sink - [`1c4d57c`](https://github.com/librespot-org/librespot/commit/1c4d57c6da9631397021b822ef24624374648c68) Add shutdown to discovery server - [`007e653`](https://github.com/librespot-org/librespot/commit/007e653f3d2f3f84ab6c88c847ee84d2a35d7df1) Restore original blocking player behaviour - [`220061e`](https://github.com/librespot-org/librespot/commit/220061e1581dd1c6889f8d302b3f747f5a68c8d4) Migrate application to tokio 1.0 ### 📊 Changes **12 files changed** (+1255 additions, -491 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+295 -83) 📝 `Cargo.toml` (+23 -7) 📝 `connect/Cargo.toml` (+4 -4) 📝 `connect/src/discovery.rs` (+55 -78) 📝 `connect/src/spirc.rs` (+129 -166) 📝 `core/src/mercury/mod.rs` (+31 -29) 📝 `core/src/mercury/sender.rs` (+17 -38) 📝 `core/src/session.rs` (+13 -2) 📝 `playback/src/player.rs` (+67 -67) 📝 `src/lib.rs` (+1 -1) ➕ `src/main.rs` (+600 -0) 📝 `src/player_event_handler.rs` (+20 -16) </details> ### 📄 Description This PR finishes the tokio migration. The application is working again - after all it was easier than I thought -, but I'm pretty sure it's not perfect yet. I had to figure out how to make the player blocking again because there were some mysterious bugs in the async version (now it's again unimportant whether the sinks are Send, but it's nice to have). @sashahilton00 @ashthespy How do we proceed? Before merging it into dev it should be tested more thoroughly, and I would like to do some refactoring. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

kerem

2026-02-27 20:00:45 +03:00

closed this issue
added the
pull-request
label

kerem referenced this issue

2026-02-27 20:01:28 +03:00

[PR #997] [MERGED] Avoid crash when Avahi is not available #1178

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

starred/librespot#997

No description provided.

Rows
Columns