#4 - bug fix

.travis.yml

@@ -1,8 +1,8 @@
 language: scala
 scala:
-  - 2.12.4
+  - 2.13.8
 jdk:
-  - oraclejdk11
+  - oraclejdk17
 
 after_success:
   - sbt clean

build.sh

@@ -18,7 +18,8 @@ if [[ $ARCH == 'arm64' ]]; then
       --platform linux/amd64,linux/arm64 \
       -t mbari/vampire-squid:${VCS_REF} \
       -t mbari/vampire-squid:latest \
-      --push .
+      --push . && \
+    docker pull mbari/vampire-squid:${VCS_REF}
 else
     docker build --build-arg BUILD_DATE=$BUILD_DATE \
                  --build-arg VCS_REF=$VCS_REF \

src/main/scala/org/mbari/vars/vam/controllers/MediaController.scala

@@ -112,7 +112,9 @@ class MediaController(val daoFactory: JPADAOFactory) extends BaseController {
 
           val video = vDao.findByName(videoName) match {
             // if a duration if provided, make sure it matches the existing duration
-            case Some(v) if (duration.map(d => d.toMillis().equals(v.duration.toMillis())).getOrElse(true))=>
+            case Some(v) if (
+                duration.map(d => d.toMillis().equals(v.duration.toMillis())).getOrElse(true) &&
+                start.equals(v.start))=>
               v.addVideoReference(vr)
               v
             case None =>
@@ -134,7 +136,7 @@ class MediaController(val daoFactory: JPADAOFactory) extends BaseController {
             case _ => 
               throw new IllegalArgumentException(
                 s"A video with name $videoName " +
-                  s"exists, but it has a different duration than the one you provided"
+                  s"exists, but it has a different duration and/or start time than the one you provided."
               )
           }