Skip to content
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

Jump to bottom

Fix/improve track names sync with tags #65

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Fix/improve track names sync with tags #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ecc56a
Re-add accidentally removed onKeyPressed handler
Nianna Oct 11, 2024
092faa7
Refresh track names when tracks size changes or multiplayer tags are …
Nianna Oct 11, 2024
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
17 changes: 15 additions & 2 deletions src/main/java/com/github/nianna/karedi/song/Song.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.Objects;
import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.IntStream;

public class Song implements IntBounded, Problematic {
public static final double DEFAULT_BPM = 240;
Expand Down Expand Up @@ -153,14 +154,24 @@ private void onTagValueChanged(Tag tag) {
case GAP:
Converter.toInteger(tag.getValue()).ifPresent(value -> converter.setGap(value));
break;
case VERSION:
refreshTrackNames();
default:
}
});
if (MultiplayerTags.isANameTag(tag)) {
MultiplayerTags.getTrackNumber(tag).ifPresent(number -> renameTrack(number, tag.getValue()));
refreshTrackNames();
}
}

private void refreshTrackNames() {
IntStream.range(0, tracks.size())
.forEach(i -> {
String expectedKey = MultiplayerTags.getTagKeyForTrackNumber(i, getFormatSpecificationVersion());
renameTrack(i, getTagValue(expectedKey).orElse(""));
});
}

public void renameTrack(int index, String name) {
if (index < size()) {
if (Objects.equals(name, "")) {
Expand All @@ -177,6 +188,7 @@ public ObservableList<SongTrack> getTracks() {
public void setTracks(Collection<? extends SongTrack> tracksCollection) {
tracksCollection.forEach(track -> track.setSong(this));
tracks.addAll(tracksCollection);
refreshTrackNames();
}

public void addTrack(SongTrack track) {
Expand All @@ -190,10 +202,11 @@ public void addTrack(Integer index, SongTrack track) {
} else {
tracks.add(index, track);
}
refreshTrackNames();
}

public Optional<SongTrack> getDefaultTrack() {
if (tracks.size() > 0) {
if (!tracks.isEmpty()) {
return Optional.of(tracks.get(0));
}
return Optional.empty();
Expand Down
16 changes: 1 addition & 15 deletions src/main/java/com/github/nianna/karedi/txt/loader/SongLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import com.github.nianna.karedi.I18N;
import com.github.nianna.karedi.song.Song;
import com.github.nianna.karedi.song.tag.MultiplayerTags;
import com.github.nianna.karedi.song.tag.Tag;
import com.github.nianna.karedi.txt.parser.Parser;
import com.github.nianna.karedi.txt.parser.element.InvalidSongElementException;
import com.github.nianna.karedi.txt.parser.element.VisitableSongElement;
Expand Down Expand Up @@ -42,9 +40,7 @@ Song buildSong(List<String> lines) {
.map(this::parseLine)
.filter(Objects::nonNull)
.forEach(songBuilder::buildPart);
Song song = songBuilder.getResult();
extractTrackNamesFromTags(song);
return song;
return songBuilder.getResult();
}

private VisitableSongElement parseLine(String line) {
Expand All @@ -56,14 +52,4 @@ private VisitableSongElement parseLine(String line) {
}
}

private void extractTrackNamesFromTags(Song song) {
List<Tag> trackNameTags = song.getTags().stream()
.filter(MultiplayerTags::isANameTag)
.toList();
trackNameTags.forEach(tag -> renameTrack(song, tag));
}

private static void renameTrack(Song song, Tag tag) {
MultiplayerTags.getTrackNumber(tag).ifPresent(number -> song.renameTrack(number, tag.getValue()));
}
}
2 changes: 1 addition & 1 deletion src/main/resources/fxml/TagsTableLayout.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<?import javafx.scene.control.TableView?>

<TableView fx:id="table" disable="true" editable="true"
onMouseClicked="#onTableMouseClicked" xmlns="http://javafx.com/javafx/8.0.60"
onMouseClicked="#onTableMouseClicked" onKeyPressed="#onKeyPressed" xmlns="http://javafx.com/javafx/8.0.60"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.nianna.karedi.controller.TagsTableController">
<columns>
<TableColumn fx:id="keyColumn" onEditStart="#onKeyColumnEditStart"
Expand Down
Loading