Skip to content

Refresh the AP pool after stopping the receiver #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devgianlu merged 4 commits into from
Feb 8, 2022
Merged

Refresh the AP pool after stopping the receiver #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b3d639
Annotate onPlaybackFailed Exception parameter as NotNull
iscle Feb 7, 2022
6ee3ba4
Add Excepction class name and message to onPlaybackFailed json event
iscle Feb 7, 2022
078a196
Remove redundant try-with-resources block
iscle Feb 7, 2022
09569b7
Refresh the AP pool after stopping the receiver
iscle Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/src/main/java/xyz/gianlu/librespot/api/handlers/EventsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,11 @@ public void onPlaybackResumed(@NotNull Player player, long trackTime) {
}

@Override
public void onPlaybackFailed(@NotNull Player player, Exception e) {
public void onPlaybackFailed(@NotNull Player player, @NotNull Exception e) {
JsonObject obj = new JsonObject();
obj.addProperty("event", "playbackFailed");
obj.addProperty("exception", e.getMessage());
obj.addProperty("exception", e.getClass().getCanonicalName());
obj.addProperty("message", e.getMessage());
dispatch(obj);
}

Expand Down
22 changes: 10 additions & 12 deletions lib/src/main/java/xyz/gianlu/librespot/core/ApResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,18 @@ private void request(@NotNull String... types) throws IOException {
try (Response response = client.newCall(request).execute()) {
ResponseBody body = response.body();
if (body == null) throw new IOException("No body");
try (Reader reader = body.charStream()) {
JsonObject obj = JsonParser.parseReader(reader).getAsJsonObject();
HashMap<String, List<String>> map = new HashMap<>();
for (String type : types)
map.put(type, getUrls(obj, type));

synchronized (pool) {
pool.putAll(map);
poolReady = true;
pool.notifyAll();
}
JsonObject obj = JsonParser.parseReader(body.charStream()).getAsJsonObject();
HashMap<String, List<String>> map = new HashMap<>();
for (String type : types)
map.put(type, getUrls(obj, type));

LOGGER.info("Loaded aps into pool: " + pool);
synchronized (pool) {
pool.putAll(map);
poolReady = true;
pool.notifyAll();
}

LOGGER.info("Loaded aps into pool: " + pool);
}
}

Expand Down
6 changes: 3 additions & 3 deletions lib/src/main/java/xyz/gianlu/librespot/core/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,13 +718,13 @@ private void reconnect() {
}

try {
apResolver.refreshPool();

if (conn != null) {
conn.socket.close();
receiver.stop();
conn.socket.close();
}

apResolver.refreshPool();

conn = ConnectionHolder.create(apResolver.getRandomAccesspoint(), inner.conf);
connect();
authenticatePartial(Authentication.LoginCredentials.newBuilder()
Expand Down
6 changes: 3 additions & 3 deletions player/src/main/java/xyz/gianlu/librespot/player/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ public interface EventsListener {

void onPlaybackResumed(@NotNull Player player, long trackTime);

void onPlaybackFailed(@NotNull Player player, Exception e);
void onPlaybackFailed(@NotNull Player player, @NotNull Exception e);

void onTrackSeeked(@NotNull Player player, long trackTime);

Expand Down Expand Up @@ -1005,7 +1005,7 @@ public void onPlaybackResumed(@NotNull Player player, long trackTime) {
}

@Override
public void onPlaybackFailed(@NotNull Player player, Exception e) {
public void onPlaybackFailed(@NotNull Player player, @NotNull Exception e) {
}

@Override
Expand Down Expand Up @@ -1082,7 +1082,7 @@ void playbackResumed() {
executorService.execute(() -> l.onPlaybackResumed(Player.this, trackTime));
}

void playbackFailed(Exception ex) {
void playbackFailed(@NotNull Exception ex) {
for (EventsListener l : new ArrayList<>(listeners))
executorService.execute(() -> l.onPlaybackFailed(Player.this, ex));
}
Expand Down
2 changes: 1 addition & 1 deletion player/src/main/java/xyz/gianlu/librespot/player/ShellEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void onPlaybackResumed(@NotNull Player player, long trackTime) {
}

@Override
public void onPlaybackFailed(@NotNull Player player, Exception e) {
public void onPlaybackFailed(@NotNull Player player, @NotNull Exception e) {
exec(conf.onPlaybackFailed, "EXCEPTION=" + e.getClass().getCanonicalName(), "MESSAGE=" + e.getMessage());
}

Expand Down