Remove jump / audio analysis feature (#562)

* Remove jump / audio analysis feature

* Move smithy files to another module

* workflows

Author: kubukoz

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
         run: sbt '++ ${{ matrix.scala }}' test
 
       - name: Compress target directories
-        run: tar cf targets.tar target app/.jvm/target app/.native/target project/target
+        run: tar cf targets.tar app/.jvm/target target app/.native/target smithy-models/.native/target smithy-models/.jvm/target project/target
 
       - name: Upload target directories
         uses: actions/upload-artifact@v4

README.md

@@ -44,11 +44,9 @@ Usage:
     spotify-next skip
     spotify-next drop
     spotify-next forward
-    spotify-next jump
     spotify-next s
     spotify-next d
     spotify-next f
-    spotify-next j
     spotify-next repl
 
 spotify-next: Gather great music.
@@ -68,16 +66,12 @@ Subcommands:
         Drop current track from the current playlist and skip to the next track
     forward
         Fast forward the current track by a percentage of its length (10% by default)
-    jump
-        Fast forward the current track to the next section
     s
         Alias for `skip`
     d
         Alias for `drop`
     f
         Alias for `forward`
-    j
-        Alias for `jump`
     repl
         Run application in interactive mode
 ```

app/src/main/scala/com/kubukoz/next/Analysis.scala

@@ -32,7 +32,6 @@ enum Choice {
     percentage: Int
   )
 
-  case JumpSection
   case Switch
   case Move
 }
@@ -53,11 +52,9 @@ object Choice {
         ),
         Opts.subcommand("switch", "Switch device (Spotify/Sonos)")(Opts(Switch)),
         Opts.subcommand("move", "Move song to playlist A")(Opts(Move)),
-        Opts.subcommand("jump", "Fast forward the current track to the next section")(Opts(JumpSection)),
         Opts.subcommand("s", "Alias for `skip`")(Opts(SkipTrack)),
         Opts.subcommand("d", "Alias for `drop`")(Opts(DropTrack)),
         Opts.subcommand("f", "Alias for `forward`")(ffOpts),
-        Opts.subcommand("j", "Alias for `jump`")(Opts(JumpSection)),
         Opts.subcommand("w", "Alias for `switch`")(Opts(Switch)),
         Opts.subcommand("m", "Alias for `move`")(Opts(Move))
       )

app/src/main/scala/com/kubukoz/next/Main.scala

@@ -13,9 +13,7 @@ import cats.implicits.*
 import com.kubukoz.next.Spotify.DeviceInfo
 import com.kubukoz.next.api.sonos
 import com.kubukoz.next.sonos.SonosApi
-import com.kubukoz.next.sonos.SonosApiGen
 import com.kubukoz.next.spotify.SpotifyApi
-import com.kubukoz.next.spotify.SpotifyApiGen
 import com.kubukoz.next.util.Config
 import com.kubukoz.next.util.Config.Token
 import com.kubukoz.next.util.middlewares
@@ -107,8 +105,8 @@ object Program {
     val spotifyBaseUri = com.kubukoz.next.api.spotify.baseUri
 
     for {
-      given SpotifyApi[F] <- SimpleRestJsonBuilder(SpotifyApiGen).client[F](spotifyClient).uri(spotifyBaseUri).make.liftTo[F]
-      given SonosApi[F]   <- SimpleRestJsonBuilder(SonosApiGen).client[F](sonosClient).uri(sonos.baseUri).make.liftTo[F]
+      given SpotifyApi[F] <- SimpleRestJsonBuilder(SpotifyApi).client[F](spotifyClient).uri(spotifyBaseUri).make.liftTo[F]
+      given SonosApi[F]   <- SimpleRestJsonBuilder(SonosApi).client[F](sonosClient).uri(sonos.baseUri).make.liftTo[F]
       result              <- makeSpotifyInternal[F]
     } yield result
   }
@@ -128,7 +126,6 @@ object Program {
 
     for {
       given Spotify.Playback[F] <- SpotifyChoice.choose[F].map(Spotify.Playback.makeFromChoice[F])
-      given Analysis[F]         <- Analysis.cached(Analysis.instance[F])
     } yield Spotify.instance[F]
   }
 

app/src/main/scala/com/kubukoz/next/Program.scala

@@ -21,7 +21,6 @@ object Runner {
     case Choice.SkipTrack      => Spotify[F].skipTrack
     case Choice.DropTrack      => Spotify[F].dropTrack
     case Choice.FastForward(p) => Spotify[F].fastForward(p)
-    case Choice.JumpSection    => Spotify[F].jumpSection
     case Choice.Switch         => Spotify[F].switch
     case Choice.Move           => Spotify[F].move
   }

app/src/main/scala/com/kubukoz/next/Runner.scala

@@ -2,7 +2,6 @@ package com.kubukoz.next
 
 import cats.FlatMap
 import cats.MonadError
-import cats.data.OptionT
 import cats.effect.Concurrent
 import cats.implicits.*
 import com.kubukoz.next.client.spotify.Item
@@ -26,7 +25,6 @@ trait Spotify[F[_]] {
     percentage: Int
   ): F[Unit]
 
-  def jumpSection: F[Unit]
   def switch: F[Unit]
   def move: F[Unit]
 }
@@ -59,7 +57,7 @@ object Spotify {
 
   import Error.*
 
-  def instance[F[_]: Playback: UserOutput: Concurrent: SpotifyApi: Switch: Analysis: ConfigLoader]: Spotify[F] =
+  def instance[F[_]: Playback: UserOutput: Concurrent: SpotifyApi: Switch: ConfigLoader]: Spotify[F] =
     new Spotify[F] {
       private val getPlayer = SpotifyApi[F].getPlayer().map(Player.fromApiPlayer)
 
@@ -129,38 +127,6 @@ object Spotify {
                 Playback[F].seek(desiredProgress)
           }
 
-      def jumpSection: F[Unit] = getPlayer
-        .flatMap(requireTrack)
-        .flatMap { player =>
-          val track = player.item
-
-          val currentLength = player.progress
-
-          Analysis[F]
-            .getAnalysis(track.uri)
-            .flatMap { analysis =>
-              analysis
-                .sections
-                .zipWithIndex
-                .find { case (section, _) => section.startSeconds.seconds > (currentLength + 1.second) }
-                .traverse { case (section, index) =>
-                  val percentage = (section.startSeconds.seconds * 100 / track.duration).toInt
-
-                  UserOutput[F].print(
-                    UserMessage.Jumping(
-                      sectionNumber = index + 1,
-                      sectionsTotal = analysis.sections.length,
-                      percentTotal = percentage
-                    )
-                  ) *>
-                    Playback[F].seek(section.startSeconds.seconds)
-                }
-                .pipe(OptionT(_))
-                .getOrElseF(UserOutput[F].print(UserMessage.TooCloseToEnd) *> Playback[F].seek(0.millis))
-            }
-        }
-        .void
-
       val switch: F[Unit] = Switch[F].switch
 
       val move: F[Unit] = getPlayer.flatMap(requireContext).flatMap(requireTrack).flatMap { player =>

app/src/main/scala/com/kubukoz/next/Spotify.scala

@@ -60,12 +60,6 @@ enum UserMessage {
     target: PlaybackTarget
   )
 
-  case Jumping(
-    sectionNumber: Int,
-    sectionsTotal: Int,
-    percentTotal: Int
-  )
-
   case Seeking(
     desiredProgressPercent: Int
   )
@@ -152,12 +146,10 @@ object UserOutput {
             .name}" (${player.item.uri.toFullUri}) to playlist ${targetPlaylist.playlist}"""
       case TooCloseToEnd                              => "Too close to song's ending, rewinding to beginning"
       case Seeking(desiredProgressPercent)            => show"Seeking to $desiredProgressPercent%"
-      case Jumping(sectionNumber, sectionsTotal, percentTotal) =>
-        show"Jumping to section $sectionNumber/$sectionsTotal ($percentTotal%)"
-      case CheckingSonos                                       => show"Checking if Sonos API is available at $sonosBaseUrl..."
-      case SonosNotFound                                       => "Sonos not found, using fallback"
-      case NoDevices                                           => "No Spotify devices found, can't switch playback"
-      case SwitchingPlayback(target)                           =>
+      case CheckingSonos                              => show"Checking if Sonos API is available at $sonosBaseUrl..."
+      case SonosNotFound                              => "Sonos not found, using fallback"
+      case NoDevices                                  => "No Spotify devices found, can't switch playback"
+      case SwitchingPlayback(target)                  =>
         val targetString = target match {
           case PlaybackTarget.Spotify(device) => show"Spotify (${device.name}, ID: ${device.id.map(_.value)})"
           case PlaybackTarget.Sonos(group)    => show"Sonos (${group.name}, ID: ${group.id})"

app/src/main/scala/com/kubukoz/next/UserMessage.scala

@@ -116,8 +116,23 @@ val front = project
   .dependsOn(core)
  */
 
+lazy val smithyModels = crossProject(JVMPlatform, NativePlatform)
+  .crossType(CrossType.Pure)
+  .in(file("smithy-models"))
+  .settings(
+    commonSettings,
+    libraryDependencies ++= Seq(
+      "com.disneystreaming.smithy4s" %%% "smithy4s-core" % smithy4sVersion.value
+    )
+  )
+  .enablePlugins(Smithy4sCodegenPlugin)
+  .settings(
+    Compile / smithy4sInputDirs := Seq((ThisBuild / baseDirectory).value / "smithy-models" / "src" / "main" / "smithy")
+  )
+
 val app = crossProject(JVMPlatform, NativePlatform)
   .crossType(CrossType.Pure)
+  .dependsOn(smithyModels)
   .settings(commonSettings)
   .settings(
     libraryDependencies ++= Seq(
@@ -139,10 +154,6 @@ val app = crossProject(JVMPlatform, NativePlatform)
   )
   .settings(name := "spotify-next")
   .enablePlugins(BuildInfoPlugin)
-  .settings(
-    Compile / smithy4sInputDirs := Seq((ThisBuild / baseDirectory).value / "app" / "src" / "main" / "smithy")
-  )
-  .enablePlugins(Smithy4sCodegenPlugin)
   .jvmConfigure(
     _.settings(
       libraryDependencies ++= Seq(
@@ -162,4 +173,4 @@ val root =
   project
     .in(file("."))
     .enablePlugins(NoPublishPlugin)
-    .aggregate(app.componentProjects.map(p => p: ProjectReference): _*)
+    .aggregate(List(app, smithyModels).flatMap(_.componentProjects).map(p => p: ProjectReference): _*)

build.sbt

@@ -8,13 +8,11 @@ function _sn() {
     'skip:Skip to next track without any changes'
     'drop:Drop current track from the current playlist and skip to the next track'
     'forward:Fast forward the current track by a percentage of its length (10% by default)'
-    'jump:Fast forward the current track to the next section'
     'switch:Switch device (Spotify/Sonos)'
     'move:Move song to playlist A'
     's:alias for `skip`'
     'd:alias for `drop`'
     'f:alias for `forward`'
-    'j:alias for `jump`'
     'w:alias for `switch`'
     'm:alias for `move`'
     'repl:Run application in interactive mode'
@@ -42,10 +40,6 @@ function _sn() {
       _arguments -C $help
       ;;
 
-    jump)
-      _arguments -C $help
-      ;;
-
     move)
       _arguments -C $help
       ;;

completions.zsh

@@ -1,11 +1,14 @@
 {
-  "version": "1.0",
-  "sources": ["app/src/main/smithy"],
-  "maven": {
-    "dependencies": [
-      "com.disneystreaming.alloy:alloy-core:0.3.13",
-      "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.31"
+    "version" : "1.0",
+    "sources" : [
+        "smithy-models/src/main/smithy"
     ],
-    "repositories": []
-  }
-}
+    "maven" : {
+        "dependencies" : [
+            "com.disneystreaming.alloy:alloy-core:0.3.13",
+            "com.disneystreaming.smithy4s:smithy4s-protocol:0.18.31"
+        ],
+        "repositories" : [
+        ]
+    }
+}

smithy-build.json

@@ -12,7 +12,6 @@ service SpotifyApi {
         NextTrack
         Seek
         RemoveTrack
-        GetAudioAnalysis
         TransferPlayback
         GetAvailableDevices
         GetPlayer
@@ -95,31 +94,6 @@ structure Track {
     uri: String
 }
 
-@http(method: "GET", uri: "/v1/audio-analysis/{trackId}")
-@readonly
-operation GetAudioAnalysis {
-    input := {
-        @httpLabel
-        @required
-        trackId: String
-    }
-
-    output := {
-        @required
-        sections: Sections
-    }
-}
-
-list Sections {
-    member: Section
-}
-
-structure Section {
-    @required
-    @jsonName("start")
-    startSeconds: Double
-}
-
 @http(method: "GET", uri: "/v1/me/player")
 @readonly
 operation GetPlayer {