Add seek command (supersedes #344) #674
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge with upstream
# Conflicts: # src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java # src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java
Closed
…feature/seeking � Conflicts: � src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java � src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java � src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java
|
What still needs to be done before this can be merged? |
|
I'd also like to know what else we need for this to be working |
4 tasks
…feature/seeking � Conflicts: � src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java � src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java
MichailiK
commented
Apr 9, 2022
|
Still waiting for this to be merged. |
|
@jagrosh will this be merged? |
…feature/seeking # Conflicts: # src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java # src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java # src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java # src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java
MichailiK
commented
Mar 8, 2024
src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java
Outdated
Show resolved
Hide resolved
src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java
Outdated
Show resolved
Hide resolved
DaniDipp
added a commit
to Team-Sneakymouse/MusicBot
that referenced
this pull request
Jul 13, 2024
commit 8733899 Author: John Grosh <john.a.grosh@gmail.com> Date: Wed Jul 10 17:35:50 2024 -0400 Update bug-report.yml commit e5fd05e Author: Moritz Bender <35152647+Morilli@users.noreply.github.com> Date: Wed Jul 10 13:19:13 2024 +0200 Update dependencies to fix youtube issues (jagrosh#1609) commit 6a5a9c7 Author: John Grosh <john.a.grosh@gmail.com> Date: Fri May 10 17:43:49 2024 -0400 Change playlist page count (jagrosh#1542) * change playlist page count * make the value configurable * small refactor commit 8557f7a Author: Michaili K <git@michaili.dev> Date: Fri May 10 21:36:43 2024 +0200 Log track exceptions in the audio handler (jagrosh#1558) commit 48e62f1 Author: Michaili K <git@michaili.dev> Date: Fri May 10 21:32:30 2024 +0200 Revert "Always self-deafen (jagrosh#1491)" (jagrosh#1551) This reverts commit a7807b9. commit 6f12c33 Author: John Grosh <john.a.grosh@gmail.com> Date: Fri May 10 15:23:30 2024 -0400 custom eval engine (jagrosh#1530) commit 0afb3db Author: Michaili K <git@michaili.dev> Date: Fri May 10 20:19:11 2024 +0200 Switch to lavalink's new YouTube audio source manager (jagrosh#1552) * Switch to new lavalink's new YouTube audio source manager * Add back setPlaylistPageCount call for the youtube audio source manager * Manually add all the individual audio sources EXCEPT for old youtube * Remove unused import * Upgrade lavaplayer-youtube-source to 1.0.3 * Upgrade lavaplayer-youtube-source to 1.0.4 commit 81322ef Author: Michaili K <git@michaili.dev> Date: Fri May 10 20:14:28 2024 +0200 Add seek command (supersedes jagrosh#344) (jagrosh#674) * Add seek command * Combine nested if statements * Put the seek command in correct place to keep alphabetical order * Add license header * Brackets on next line * Restructure if-statements * Check for permissions with DJCommand#checkDJPermission * Make regex slightly smaller * Optimize imports * Output length of current track if requested seek time is invalid * Restate seeked point when seeked successfully * Add empty newline at end of file to keep consistency * Create TimeUtil class for parsing and formatting time * Move FormatUtil#formatTime to TimeUtil, and refactor * Apply requested changes (Pass 2) * Seek based on current position in track * Apply requested changes (Pass 3) * Add javadoc param * Apply requested changes (Pass 4) * Fix merge * Avoid reassigning parameter (Codacy) * Rework timestamp parsing * Refactor timestamp parsing * Apply requested changes (Pass 5) * Add examples in help * Apply requested changes (Pass 6) * Fix missing import * Keep track of start timestamp & add "unit" times * Fix my abdominal merge with QueuedTrack * Use RequestMetadata to store start timestamp * Store request info in request metadata * Add regex to try getting a timestamp from the url * Require RequestMetadata for QueuedTracks * Add some unit tests for unit seeking * Add docs & examples --------- Co-authored-by: Whew., Inc <22574706+Whew-Inc@users.noreply.github.com>
DaniDipp
added a commit
to Team-Sneakymouse/MusicBot
that referenced
this pull request
Jul 13, 2024
commit 8733899 Author: John Grosh <john.a.grosh@gmail.com> Date: Wed Jul 10 17:35:50 2024 -0400 Update bug-report.yml commit e5fd05e Author: Moritz Bender <35152647+Morilli@users.noreply.github.com> Date: Wed Jul 10 13:19:13 2024 +0200 Update dependencies to fix youtube issues (jagrosh#1609) commit 6a5a9c7 Author: John Grosh <john.a.grosh@gmail.com> Date: Fri May 10 17:43:49 2024 -0400 Change playlist page count (jagrosh#1542) * change playlist page count * make the value configurable * small refactor commit 8557f7a Author: Michaili K <git@michaili.dev> Date: Fri May 10 21:36:43 2024 +0200 Log track exceptions in the audio handler (jagrosh#1558) commit 48e62f1 Author: Michaili K <git@michaili.dev> Date: Fri May 10 21:32:30 2024 +0200 Revert "Always self-deafen (jagrosh#1491)" (jagrosh#1551) This reverts commit a7807b9. commit 6f12c33 Author: John Grosh <john.a.grosh@gmail.com> Date: Fri May 10 15:23:30 2024 -0400 custom eval engine (jagrosh#1530) commit 0afb3db Author: Michaili K <git@michaili.dev> Date: Fri May 10 20:19:11 2024 +0200 Switch to lavalink's new YouTube audio source manager (jagrosh#1552) * Switch to new lavalink's new YouTube audio source manager * Add back setPlaylistPageCount call for the youtube audio source manager * Manually add all the individual audio sources EXCEPT for old youtube * Remove unused import * Upgrade lavaplayer-youtube-source to 1.0.3 * Upgrade lavaplayer-youtube-source to 1.0.4 commit 81322ef Author: Michaili K <git@michaili.dev> Date: Fri May 10 20:14:28 2024 +0200 Add seek command (supersedes jagrosh#344) (jagrosh#674) * Add seek command * Combine nested if statements * Put the seek command in correct place to keep alphabetical order * Add license header * Brackets on next line * Restructure if-statements * Check for permissions with DJCommand#checkDJPermission * Make regex slightly smaller * Optimize imports * Output length of current track if requested seek time is invalid * Restate seeked point when seeked successfully * Add empty newline at end of file to keep consistency * Create TimeUtil class for parsing and formatting time * Move FormatUtil#formatTime to TimeUtil, and refactor * Apply requested changes (Pass 2) * Seek based on current position in track * Apply requested changes (Pass 3) * Add javadoc param * Apply requested changes (Pass 4) * Fix merge * Avoid reassigning parameter (Codacy) * Rework timestamp parsing * Refactor timestamp parsing * Apply requested changes (Pass 5) * Add examples in help * Apply requested changes (Pass 6) * Fix missing import * Keep track of start timestamp & add "unit" times * Fix my abdominal merge with QueuedTrack * Use RequestMetadata to store start timestamp * Store request info in request metadata * Add regex to try getting a timestamp from the url * Require RequestMetadata for QueuedTracks * Add some unit tests for unit seeking * Add docs & examples --------- Co-authored-by: Whew., Inc <22574706+Whew-Inc@users.noreply.github.com>
DaniDipp
added a commit
to Team-Sneakymouse/MusicBot
that referenced
this pull request
Jul 13, 2024
commit 8733899 Author: John Grosh <john.a.grosh@gmail.com> Date: Wed Jul 10 17:35:50 2024 -0400 Update bug-report.yml commit e5fd05e Author: Moritz Bender <35152647+Morilli@users.noreply.github.com> Date: Wed Jul 10 13:19:13 2024 +0200 Update dependencies to fix youtube issues (jagrosh#1609) commit 6a5a9c7 Author: John Grosh <john.a.grosh@gmail.com> Date: Fri May 10 17:43:49 2024 -0400 Change playlist page count (jagrosh#1542) * change playlist page count * make the value configurable * small refactor commit 8557f7a Author: Michaili K <git@michaili.dev> Date: Fri May 10 21:36:43 2024 +0200 Log track exceptions in the audio handler (jagrosh#1558) commit 48e62f1 Author: Michaili K <git@michaili.dev> Date: Fri May 10 21:32:30 2024 +0200 Revert "Always self-deafen (jagrosh#1491)" (jagrosh#1551) This reverts commit a7807b9. commit 6f12c33 Author: John Grosh <john.a.grosh@gmail.com> Date: Fri May 10 15:23:30 2024 -0400 custom eval engine (jagrosh#1530) commit 0afb3db Author: Michaili K <git@michaili.dev> Date: Fri May 10 20:19:11 2024 +0200 Switch to lavalink's new YouTube audio source manager (jagrosh#1552) * Switch to new lavalink's new YouTube audio source manager * Add back setPlaylistPageCount call for the youtube audio source manager * Manually add all the individual audio sources EXCEPT for old youtube * Remove unused import * Upgrade lavaplayer-youtube-source to 1.0.3 * Upgrade lavaplayer-youtube-source to 1.0.4 commit 81322ef Author: Michaili K <git@michaili.dev> Date: Fri May 10 20:14:28 2024 +0200 Add seek command (supersedes jagrosh#344) (jagrosh#674) * Add seek command * Combine nested if statements * Put the seek command in correct place to keep alphabetical order * Add license header * Brackets on next line * Restructure if-statements * Check for permissions with DJCommand#checkDJPermission * Make regex slightly smaller * Optimize imports * Output length of current track if requested seek time is invalid * Restate seeked point when seeked successfully * Add empty newline at end of file to keep consistency * Create TimeUtil class for parsing and formatting time * Move FormatUtil#formatTime to TimeUtil, and refactor * Apply requested changes (Pass 2) * Seek based on current position in track * Apply requested changes (Pass 3) * Add javadoc param * Apply requested changes (Pass 4) * Fix merge * Avoid reassigning parameter (Codacy) * Rework timestamp parsing * Refactor timestamp parsing * Apply requested changes (Pass 5) * Add examples in help * Apply requested changes (Pass 6) * Fix missing import * Keep track of start timestamp & add "unit" times * Fix my abdominal merge with QueuedTrack * Use RequestMetadata to store start timestamp * Store request info in request metadata * Add regex to try getting a timestamp from the url * Require RequestMetadata for QueuedTracks * Add some unit tests for unit seeking * Add docs & examples --------- Co-authored-by: Whew., Inc <22574706+Whew-Inc@users.noreply.github.com>
ElerWohlmuthFH
pushed a commit
to ElerWohlmuthFH/MusicBot
that referenced
this pull request
Sep 20, 2024
* Add seek command * Combine nested if statements * Put the seek command in correct place to keep alphabetical order * Add license header * Brackets on next line * Restructure if-statements * Check for permissions with DJCommand#checkDJPermission * Make regex slightly smaller * Optimize imports * Output length of current track if requested seek time is invalid * Restate seeked point when seeked successfully * Add empty newline at end of file to keep consistency * Create TimeUtil class for parsing and formatting time * Move FormatUtil#formatTime to TimeUtil, and refactor * Apply requested changes (Pass 2) * Seek based on current position in track * Apply requested changes (Pass 3) * Add javadoc param * Apply requested changes (Pass 4) * Fix merge * Avoid reassigning parameter (Codacy) * Rework timestamp parsing * Refactor timestamp parsing * Apply requested changes (Pass 5) * Add examples in help * Apply requested changes (Pass 6) * Fix missing import * Keep track of start timestamp & add "unit" times * Fix my abdominal merge with QueuedTrack * Use RequestMetadata to store start timestamp * Store request info in request metadata * Add regex to try getting a timestamp from the url * Require RequestMetadata for QueuedTracks * Add some unit tests for unit seeking * Add docs & examples --------- Co-authored-by: Whew., Inc <22574706+Whew-Inc@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request...
Description
Allows DJs and user that added the track to perform a seek on a playing track
Purpose
Example: Going to a specific timestamp in a song compilation.
Relevant Issue(s)
This PR supersedes PR #344, as the author whew-inc stated that they will no longer be working on their pull request, I have decided to pick up on it
Currently, I am working on the change requests in #344.
playcommand as well as in playlists; youtube has a format for this and jmusicbot should probably adapt that same format)And, because YouTube's time parameter can either be just seconds or
1h2m3s