added support for mic break in CSV import

RocketMan · Jan 19, 2025 · 752d90f · 752d90f
1 parent b890975
commit 752d90f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/ui/Playlists.php b/ui/Playlists.php
@@ -3,7 +3,7 @@
  * Zookeeper Online
  *
  * @author Jim Mason <[email protected]>
- * @copyright Copyright (C) 1997-2024 Jim Mason <[email protected]>
+ * @copyright Copyright (C) 1997-2025 Jim Mason <[email protected]>
  * @link https://zookeeper.ibinx.com/
  * @license GPL-3.0
  *
@@ -58,6 +58,7 @@ class Playlists extends MenuItem {
 
     private $action;
     private $subaction;
+    private $break;
 
     public function getSubactions($action) {
         return self::$subactions;
@@ -399,11 +400,28 @@ public function emitEditor() {
     }
 
     private function insertTrack($playlistId, $tag, $artist, $track, $album, $label, $spinTime) {
+        // $artist, $track, $album, and $label have already been trimmed
+        if(empty($artist) && empty($track) &&
+                empty($album) && empty($label)) {
+            // non-consecutive blank row inserts set separator
+            if(!$this->break) {
+                $entry = (new PlaylistEntry())->setSetSeparator();
+                if($spinTime)
+                    $entry->setCreated($spinTime->format(IPlaylist::TIME_FORMAT_SQL));
+                Engine::api(IPlaylist::class)->insertTrackEntry($playlistId, $entry, $status);
+                $this->break = true;
+            }
+            return;
+        }
+
         $id = 0;
         $status = '';
         // Run the query
         $success = Engine::api(IPlaylist::class)->insertTrack($playlistId,
                      $tag, $artist, $track, $album, $label, $spinTime, $id, $status);
+
+        if($success)
+            $this->break = false;
     }
 
     public function emitImportList() {
@@ -643,6 +661,13 @@ public function emitImportList() {
                              $timestamp);     // timestamp
                     $count++;
                     break;
+                case 1:
+                    // fgetcsv returns array with single null on blank line
+                    if(is_null($line[0])) {
+                        // set separator
+                        $this->insertTrack($playlist, 0, '', '', '', '', null);
+                    }
+                    break;
                 }
             }
             // echo "<B>Imported $count tracks.</B>\n";

diff --git a/ui/templates/default/list/import.html b/ui/templates/default/list/import.html
@@ -83,7 +83,7 @@ <h4>CSV Format</h4>
       <pre style='padding-left: 20px; white-space: normal;'><b>artist&nbsp; track&nbsp; album&nbsp; label</b> &nbsp;<i>or</i><br>
       <b>artist&nbsp; track&nbsp; album&nbsp; tag&nbsp;&nbsp; label</b> &nbsp;<i>or</i><br>
       <b>artist&nbsp; track&nbsp; album&nbsp; tag&nbsp;&nbsp; label&nbsp; timestamp</b></pre>
-      <p>where each column is optionally enclosed by the specified field enclosure character, and separated by a delimiter character.  If no delimiter is specified, tab is used.</p>
+      <p>where each column is optionally enclosed by the specified field enclosure character, and separated by a delimiter character.  If no delimiter is specified, tab is used.  An empty row inserts a mic break.</p>
       <p>Any file data not in this format will be ignored.</p>
     </div>
   </div>