Merge hotfix-3-0-0-rc-10 (#493)

RocketMan · Dec 11, 2024 · fa2f433 · fa2f433
1 parent 8c4a6ca
commit fa2f433
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 24 deletions.
diff --git a/api/Albums.php b/api/Albums.php
@@ -120,7 +120,8 @@ public static function fromRecord($rec, $wantTracks = true) {
         $res = new JsonResource("album", $rec["tag"]);
         $res->links()->set(new Link("self", Engine::getBaseUrl()."album/".$rec["tag"]));
         foreach(self::FIELDS as $field) {
-            if(!array_key_exists($field, $rec))
+            $tfield = $field == "coll" ? "iscoll" : $field;
+            if(!array_key_exists($tfield, $rec))
                 continue;
 
             switch($field) {

diff --git a/api/OffsetPaginationTrait.php b/api/OffsetPaginationTrait.php
@@ -31,6 +31,7 @@
 use Enm\JsonApi\Exception\NotAllowedException;
 use Enm\JsonApi\Model\Document\Document;
 use Enm\JsonApi\Model\Request\RequestInterface;
+use Enm\JsonApi\Model\Resource\JsonResource;
 use Enm\JsonApi\Model\Resource\Link\Link;
 use Enm\JsonApi\Model\Resource\Relationship\Relationship;
 use Enm\JsonApi\Model\Resource\ResourceCollection;
@@ -143,11 +144,10 @@ protected function marshallReviews(array $records, $flags) {
             $relation->links()->set(new Link("related", Engine::getBaseUrl()."album/{$record["tag"]}/reviews"));
             $resource->relationships()->set($relation);
             if($flags & Albums::LINKS_REVIEWS_WITH_BODY) {
-                $reviews = Engine::api(IReview::class)->getReviews($record["id"], 1, "", Engine::session()->isAuth("u"), 1);
-                $record["airname"] = $reviews[0]["airname"] ?? $reviews[0]["realname"];
-                $record["review"] = $reviews[0]["review"];
-            }
-            $res = Reviews::fromRecord($record);
+                $review = Engine::api(IReview::class)->getReviews($record["id"], 1, "", Engine::session()->isAuth("u"), 1)[0];
+                $res = Reviews::fromRecord($review);
+            } else
+                $res = new JsonResource("review", $record["id"]);
             $res->metaInformation()->set("date", $record["reviewed"]);
             $relations->set($res);
 

diff --git a/api/Reviews.php b/api/Reviews.php
@@ -66,12 +66,9 @@ public static function fromRecord($rec) {
         $res = new JsonResource("review", $rec["id"]);
         $res->links()->set(new Link("self", Engine::getBaseUrl()."review/".$rec["id"]));
         foreach(self::FIELDS as $field) {
-            if(!array_key_exists($field, $rec))
-                continue;
-
             switch($field) {
             case "date":
-                $value = substr($rec["reviewed"], 0, 10);
+                $value = substr($rec["reviewed"] ?? $rec["created"], 0, 10);
                 break;
             case "airname":
                 $value = $rec["airname"] ?? $rec["realname"];

diff --git a/controllers/SSOCommon.php b/controllers/SSOCommon.php
@@ -3,7 +3,7 @@
  * Zookeeper Online
  *
  * @author Jim Mason <[email protected]>
- * @copyright Copyright (C) 1997-2023 Jim Mason <[email protected]>
+ * @copyright Copyright (C) 1997-2024 Jim Mason <[email protected]>
  * @link https://zookeeper.ibinx.com/
  * @license GPL-3.0
  *
@@ -141,14 +141,15 @@ public static function setupSSOByAccount($account) {
         }
         return $retval;
     }
-    
+
     public static function setupSSOByName($account, $name) {
-        $retval = false;
-        $row = Engine::api(IUser::class)->getUserByFullname($name);
-        if($row) {
-            Engine::api(IUser::class)->assignAccount($row["name"], $account);
-            $retval = self::setupSSOByAccount($account);
-        }
-        return $retval;
+        $api = Engine::api(IUser::class);
+        $row = $api->getUserByFullname($name);
+        if($row)
+            $api->assignAccount($row["name"], $account);
+        else
+            $api->createNewAccount($name, $account);
+
+        return self::setupSSOByAccount($account);
     }
 }
diff --git a/engine/impl/UserImpl.php b/engine/impl/UserImpl.php
@@ -3,7 +3,7 @@
  * Zookeeper Online
  *
  * @author Jim Mason <[email protected]>
- * @copyright Copyright (C) 1997-2022 Jim Mason <[email protected]>
+ * @copyright Copyright (C) 1997-2024 Jim Mason <[email protected]>
  * @link https://zookeeper.ibinx.com/
  * @license GPL-3.0
  *
@@ -50,7 +50,7 @@ public function getUserByAccount($account) {
     }
 
     public function getUserByFullname($fullname) {
-        $query = "SELECT * FROM users WHERE realname = ?";
+        $query = "SELECT * FROM users WHERE realname = ? AND ssoaccount IS NULL";
         $stmt = $this->prepare($query);
         $stmt->bindValue(1, $fullname);
         return $stmt->executeAndFetch();

diff --git a/ui/Editor.php b/ui/Editor.php
@@ -297,14 +297,35 @@ private function prefillTracks() {
                     !preg_match('|/spacer.gif$|', $result->cover_image) ?
                     $result->cover_image : null;
                 $infoUrl = self::DISCOGS_BASE . $result->uri;
-
                 $response = $discogs->get($result->resource_url);
                 $page = $response->getBody()->getContents();
                 $json = json_decode($page);
                 $seq = 0;
                 $tracks = [];
                 $addUrls = $this->getUrlAutofill();
                 foreach($json->tracklist as $track) {
+                    if($track->type_ == "index") {
+                        $title = !empty($track->title) &&
+                                preg_match('/^(.+?)(?:\s\(.+\))?$/', $track->title, $matches) ?
+                                "{$matches[1]}: " : '';
+
+                        foreach($track->sub_tracks as $track) {
+                            $entry = [];
+                            $entry["seq"] = ++$seq;
+                            $entry["oseq"] = trim($track->position);
+                            $entry["time"] = trim($track->duration);
+                            $entry["title"] = mb_substr($title . trim($track->title), 0, PlaylistEntry::MAX_FIELD_LENGTH);
+
+                            // strip optional numeric suffix from artist name
+                            if(!empty($track->artists) &&
+                                    preg_match('/^(.+?)(?:\s\(\d+\))?$/', $track->artists[0]->name, $matches))
+                                $entry["artist"] = mb_substr(trim($matches[1]), 0, PlaylistEntry::MAX_FIELD_LENGTH);
+
+                            $tracks[] = $entry;
+                        }
+                        continue;
+                    }
+
                     if($track->type_ != "track")
                         continue;
 
@@ -313,8 +334,11 @@ private function prefillTracks() {
                     $entry["oseq"] = trim($track->position);
                     $entry["time"] = trim($track->duration);
                     $entry["title"] = mb_substr(trim($track->title), 0, PlaylistEntry::MAX_FIELD_LENGTH);
-                    if($track->artists)
-                        $entry["artist"] = mb_substr(trim($track->artists[0]->name), 0, PlaylistEntry::MAX_FIELD_LENGTH);
+                    // strip optional numeric suffix from artist name
+                    if(!empty($track->artists) &&
+                            preg_match('/^(.+?)(?:\s\(\d+\))?$/', $track->artists[0]->name, $matches))
+                        $entry["artist"] = mb_substr(trim($matches[1]), 0, PlaylistEntry::MAX_FIELD_LENGTH);
+
                     if($addUrls && $json->videos) {
                         foreach($json->videos as $key => $video) {
                             if(mb_stripos($video->title, $entry['title']) !== false) {