2024.1a minor bugfixes

DoubleDee73 · Jan 25, 2024 · 0ba69e0 · 0ba69e0
1 parent 4c314ee
commit 0ba69e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/yass/YassSongList.java b/src/yass/YassSongList.java
@@ -2356,7 +2356,6 @@ public void setSelectionGenre(String genre) {
      * @param tags The new selectionGenre value
      */
     public void setSelectionTags(String tags, boolean isSelected) {
-        System.out.println("setSelectionTags " + tags);
         int[] rows = getSelectedRows();
         boolean changed = false;
         for (int row : rows) {
@@ -3210,7 +3209,6 @@ public synchronized void storeSongDetails(YassSong s, YassTable t) {
                 t.setAudio(s.getMP3());
             }
             t.setTags(s.getTags());
-
             String tmp = prop.getProperty("temp-dir");
             String title = YassSong.toFilename(s.getTitle());
             String artist = YassSong.toFilename(s.getArtist());

diff --git a/src/yass/YassTable.java b/src/yass/YassTable.java
@@ -965,6 +965,9 @@ public boolean setTags(String tag) {
             return true;
         }
         if (r == null) {
+            if (StringUtils.isEmpty(tag)) {
+                return false;
+            }
             r = new YassRow("#", TAGS.getTagName(), tag, "", "");
             YassRow v = tm.getCommentRow(GENRE);
             if (v == null) {
@@ -4194,6 +4197,7 @@ public int insertRowsAt(String trstring, int startRow, boolean before) {
             int rowCounter = before ? 0 : 1;
             int pasteBeat = -1;
             int currentBeat = 0;
+            int lengthInt = 0;
             boolean hasPageBreak = false;
             for (String line : lines) {
                 String[] currentRow = line.split("\t");
@@ -4207,7 +4211,7 @@ public int insertRowsAt(String trstring, int startRow, boolean before) {
                 String txt = currentRow.length > 4 ? currentRow[4] : "";
                 txt = txt.replace(' ', YassRow.SPACE);
                 int beatInt = Integer.parseInt(beat);
-                int lengthInt = StringUtils.isNumeric(length) ? Integer.parseInt(length) : 0;
+                lengthInt = StringUtils.isNumeric(length) ? Integer.parseInt(length) : 0;
                 boolean isSep = type.equals("-");
                 if (isSep && length.length() > 0) {
                     length = Integer.toString(lengthInt + startBeat);
@@ -4223,7 +4227,8 @@ public int insertRowsAt(String trstring, int startRow, boolean before) {
                     if (pasteBeat == -1) {
                         pasteBeat = existingRowsToAppend.get(0).getBeatInt() - 1;
                     } else {
-                        pasteBeat = pasteBeat + ((existingRowsToAppend.get(0).getBeatInt() - pasteBeat) / 2);
+                        int lastNoteEnding = currentBeat + lengthInt;
+                        pasteBeat = lastNoteEnding + ((existingRowsToAppend.get(0).getBeatInt() - lastNoteEnding) / 2);
                     }
                     tm.addRow(new YassRow("-", Integer.toString(pasteBeat), StringUtils.EMPTY, StringUtils.EMPTY,
                                           StringUtils.EMPTY));