Merge branch 'api6'

lachlan-00 · lachlan-00 · commit c69f2c8a6440 · 2024-10-08T09:37:19.000+10:00
diff --git a/docs/json-responses/get_indexes (playlist with include).json b/docs/json-responses/get_indexes (playlist with include).json
@@ -6,6 +6,10 @@
             "id": "smart_21",
             "name": "admin - 02\/23\/2021 14:36:44",
             "owner": "admin",
+            "user": {
+                "id": "2",
+                "username": "admin"
+            },
             "items": [
                 {
                     "id": "76",
@@ -27,6 +31,10 @@
             "id": "smart_14",
             "name": "Album 1* (System)",
             "owner": "System",
+            "user": {
+                "id": "-1",
+                "username": "System"
+            },
             "items": [
                 {
                     "id": "79",
@@ -52,6 +60,10 @@
             "id": "smart_13",
             "name": "Album 2* (System)",
             "owner": "System",
+            "user": {
+                "id": "-1",
+                "username": "System"
+            },
             "items": [
                 {
                     "id": "90",
@@ -113,6 +125,10 @@
             "id": "smart_12",
             "name": "Album 3* (System)",
             "owner": "System",
+            "user": {
+                "id": "-1",
+                "username": "System"
+            },
             "items": [
                 {
                     "id": "78",
diff --git a/docs/json-responses/get_indexes (playlist).json b/docs/json-responses/get_indexes (playlist).json
@@ -6,6 +6,10 @@
             "id": "smart_21",
             "name": "admin - 02\/23\/2021 14:36:44",
             "owner": "admin",
+            "user": {
+                "id": "2",
+                "username": "admin"
+            },
             "items": 1,
             "type": "public",
             "art": "https:\/\/music.com.au\/image.php?object_id=21&object_type=search",
@@ -22,6 +26,10 @@
             "id": "smart_14",
             "name": "Album 1* (System)",
             "owner": "System",
+            "user": {
+                "id": "-1",
+                "username": "System"
+            },
             "items": 2,
             "type": "public",
             "art": "https:\/\/music.com.au\/image.php?object_id=14&object_type=search",
@@ -38,6 +46,10 @@
             "id": "smart_13",
             "name": "Album 2* (System)",
             "owner": "System",
+            "user": {
+                "id": "-1",
+                "username": "System"
+            },
             "items": 11,
             "type": "public",
             "art": "https:\/\/music.com.au\/image.php?object_id=13&object_type=search",
@@ -54,6 +66,10 @@
             "id": "smart_12",
             "name": "Album 3* (System)",
             "owner": "System",
+            "user": {
+                "id": "-1",
+                "username": "System"
+            },
             "items": 8,
             "type": "public",
             "art": "https:\/\/music.com.au\/image.php?object_id=12&object_type=search",
diff --git a/docs/json-responses/handshake.json b/docs/json-responses/handshake.json
@@ -1,6 +1,6 @@
 {
     "auth": "cfj3f237d563f479f5223k23189dbb34",
-    "api": "6.6.1",
+    "api": "6.6.2",
     "session_expire": "2022-08-17T06:21:00+00:00",
     "update": "2023-05-18T07:13:57+00:00",
     "add": "2021-08-03T00:04:14+00:00",
diff --git a/docs/json-responses/index (artist with include).json b/docs/json-responses/index (artist with include).json
@@ -2,25 +2,25 @@
     "artist": {
         "16": [
             {
-                "id": null,
+                "id": 10,
                 "type": "album"
             }
         ],
         "27": [
             {
-                "id": null,
+                "id": 12,
                 "type": "album"
             }
         ],
         "34": [
             {
-                "id": null,
+                "id": 12,
                 "type": "album"
             }
         ],
         "36": [
             {
-                "id": null,
+                "id": 21,
                 "type": "album"
             }
         ]
diff --git a/docs/json-responses/ping (no auth).json b/docs/json-responses/ping (no auth).json
@@ -1,5 +1,5 @@
 {
-    "server": "6.6.1",
-    "version": "6.6.1",
+    "server": "6.6.2",
+    "version": "6.6.2",
     "compatible": "350001"
 }
diff --git a/docs/json-responses/ping.json b/docs/json-responses/ping.json
@@ -1,10 +1,10 @@
 {
     "session_expire": "2022-08-17T06:21:00+00:00",
-    "server": "6.6.1",
-    "version": "6.6.1",
+    "server": "6.6.2",
+    "version": "6.6.2",
     "compatible": "350001",
     "auth": "cfj3f237d563f479f5223k23189dbb34",
-    "api": "6.6.1",
+    "api": "6.6.2",
     "update": "2023-05-18T07:13:57+00:00",
     "add": "2021-08-03T00:04:14+00:00",
     "clean": "2021-08-03T00:05:54+00:00",
diff --git a/docs/json-responses/playlist.json b/docs/json-responses/playlist.json
@@ -2,6 +2,10 @@
     "id": "65",
     "name": "documentation json",
     "owner": "user",
+    "user": {
+        "id": "2",
+        "username": "user"
+    },
     "items": 45,
     "type": "public",
     "art": "https:\/\/music.com.au\/image.php?object_id=65&object_type=playlist",
@@ -12,5 +16,5 @@
     "rating": null,
     "averagerating": null,
     "md5": null,
-    "last_update": 1721613838
+    "last_update": 1727689090
 }
diff --git a/docs/json-responses/playlist_create.json b/docs/json-responses/playlist_create.json
@@ -2,6 +2,10 @@
     "id": "65",
     "name": "renamejson",
     "owner": "user",
+    "user": {
+        "id": "2",
+        "username": "user"
+    },
     "items": 0,
     "type": "private",
     "art": "https:\/\/music.com.au\/image.php?object_id=65&object_type=playlist",
@@ -12,5 +16,5 @@
     "rating": null,
     "averagerating": null,
     "md5": null,
-    "last_update": 1721613835
+    "last_update": 1727689088
 }
diff --git a/docs/json-responses/playlists.json b/docs/json-responses/playlists.json
@@ -6,6 +6,10 @@
             "id": "65",
             "name": "documentation json",
             "owner": "user",
+            "user": {
+                "id": "2",
+                "username": "user"
+            },
             "items": 0,
             "type": "public",
             "art": "https:\/\/music.com.au\/image.php?object_id=65&object_type=playlist",
@@ -16,7 +20,7 @@
             "rating": null,
             "averagerating": null,
             "md5": null,
-            "last_update": 1721613835
+            "last_update": 1727689088
         }
     ]
 }
diff --git a/docs/json-responses/search_group (all).json b/docs/json-responses/search_group (all).json
@@ -788,6 +788,10 @@
                 "id": "3",
                 "name": "random - admin - private",
                 "owner": "admin",
+                "user": {
+                    "id": "2",
+                    "username": "admin"
+                },
                 "items": 43,
                 "type": "private",
                 "art": "https:\/\/music.com.au\/image.php?object_id=3&object_type=playlist",
@@ -804,6 +808,10 @@
                 "id": "2",
                 "name": "random - admin - public",
                 "owner": "admin",
+                "user": {
+                    "id": "2",
+                    "username": "admin"
+                },
                 "items": 43,
                 "type": "public",
                 "art": "https:\/\/music.com.au\/image.php?object_id=2&object_type=playlist",
@@ -820,6 +828,10 @@
                 "id": "4",
                 "name": "random - user - private (user)",
                 "owner": "user",
+                "user": {
+                    "id": "1",
+                    "username": "user"
+                },
                 "items": 43,
                 "type": "private",
                 "art": "https:\/\/music.com.au\/image.php?object_id=4&object_type=playlist",
@@ -836,6 +848,10 @@
                 "id": "65",
                 "name": "renamejson",
                 "owner": "user",
+                "user": {
+                    "id": "2",
+                    "username": "user"
+                },
                 "items": 0,
                 "type": "private",
                 "art": "https:\/\/music.com.au\/image.php?object_id=65&object_type=playlist",
@@ -846,7 +862,7 @@
                 "rating": null,
                 "averagerating": null,
                 "md5": null,
-                "last_update": 1721613835
+                "last_update": 1727689088
             }
         ],
         "podcast": [
diff --git a/docs/json-responses/user_playlists.json b/docs/json-responses/user_playlists.json
@@ -6,6 +6,10 @@
             "id": "3",
             "name": "random - admin - private",
             "owner": "admin",
+            "user": {
+                "id": "2",
+                "username": "admin"
+            },
             "items": 43,
             "type": "private",
             "art": "https:\/\/music.com.au\/image.php?object_id=3&object_type=playlist",
@@ -22,6 +26,10 @@
             "id": "2",
             "name": "random - admin - public",
             "owner": "admin",
+            "user": {
+                "id": "2",
+                "username": "admin"
+            },
             "items": 43,
             "type": "public",
             "art": "https:\/\/music.com.au\/image.php?object_id=2&object_type=playlist",
@@ -38,6 +46,10 @@
             "id": "65",
             "name": "renamejson",
             "owner": "user",
+            "user": {
+                "id": "2",
+                "username": "user"
+            },
             "items": 0,
             "type": "private",
             "art": "https:\/\/music.com.au\/image.php?object_id=65&object_type=playlist",
@@ -48,7 +60,7 @@
             "rating": null,
             "averagerating": null,
             "md5": null,
-            "last_update": 1721613835
+            "last_update": 1727689088
         }
     ]
 }
diff --git a/docs/json-responses/user_smartlists.json b/docs/json-responses/user_smartlists.json
@@ -6,6 +6,10 @@
             "id": "smart_21",
             "name": "admin - 02\/23\/2021 14:36:44",
             "owner": "admin",
+            "user": {
+                "id": "2",
+                "username": "admin"
+            },
             "items": 0,
             "type": "public",
             "art": "https:\/\/music.com.au\/image.php?object_id=21&object_type=search",
diff --git a/docs/xml-responses/handshake.xml b/docs/xml-responses/handshake.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
   <auth><![CDATA[cfj3f237d563f479f5223k23189dbb34]]></auth>
-  <api><![CDATA[6.6.1]]></api>
+  <api><![CDATA[6.6.2]]></api>
   <session_expire><![CDATA[2022-08-17T04:34:55+00:00]]></session_expire>
   <update><![CDATA[2023-05-18T07:13:57+00:00]]></update>
   <add><![CDATA[2021-08-03T00:04:14+00:00]]></add>
diff --git a/docs/xml-responses/ping (No Auth).xml b/docs/xml-responses/ping (No Auth).xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
-  <server><![CDATA[6.3.0]]></server>
-  <version><![CDATA[6.3.0]]></version>
+  <server><![CDATA[6.6.1]]></server>
+  <version><![CDATA[6.6.1]]></version>
   <compatible><![CDATA[350001]]></compatible>
 </root>
diff --git a/docs/xml-responses/ping (no auth).xml b/docs/xml-responses/ping (no auth).xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
-  <server><![CDATA[6.6.1]]></server>
-  <version><![CDATA[6.6.1]]></version>
+  <server><![CDATA[6.6.2]]></server>
+  <version><![CDATA[6.6.2]]></version>
   <compatible><![CDATA[350001]]></compatible>
 </root>
diff --git a/docs/xml-responses/ping.xml b/docs/xml-responses/ping.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
   <session_expire><![CDATA[2022-08-17T04:34:55+00:00]]></session_expire>
-  <server><![CDATA[6.6.1]]></server>
-  <version><![CDATA[6.6.1]]></version>
+  <server><![CDATA[6.6.2]]></server>
+  <version><![CDATA[6.6.2]]></version>
   <compatible><![CDATA[350001]]></compatible>
   <auth><![CDATA[cfj3f237d563f479f5223k23189dbb34]]></auth>
-  <api><![CDATA[6.6.1]]></api>
+  <api><![CDATA[6.6.2]]></api>
   <update><![CDATA[2023-05-18T07:13:57+00:00]]></update>
   <add><![CDATA[2021-08-03T00:04:14+00:00]]></add>
   <clean><![CDATA[2021-08-03T00:05:54+00:00]]></clean>
diff --git a/docs/xml-responses/playlist.xml b/docs/xml-responses/playlist.xml
@@ -5,6 +5,9 @@
   <playlist id="66">
     <name><![CDATA[documentation xml]]></name>
     <owner><![CDATA[user]]></owner>
+    <user id="2">
+      <username><![CDATA[user]]></username>
+    </user>
     <items>45</items>
     <type>public</type>
     <art><![CDATA[https://music.com.au/image.php?object_id=66&object_type=playlist]]></art>
@@ -15,6 +18,6 @@
     <rating/>
     <averagerating/>
     <md5/>
-    <last_update>1721613852</last_update>
+    <last_update>1727689113</last_update>
   </playlist>
 </root>
diff --git a/docs/xml-responses/playlist_create.xml b/docs/xml-responses/playlist_create.xml
@@ -5,6 +5,9 @@
   <playlist id="66">
     <name><![CDATA[renamexml]]></name>
     <owner><![CDATA[user]]></owner>
+    <user id="2">
+      <username><![CDATA[user]]></username>
+    </user>
     <items>0</items>
     <type>private</type>
     <art><![CDATA[https://music.com.au/image.php?object_id=66&object_type=playlist]]></art>
@@ -15,6 +18,6 @@
     <rating/>
     <averagerating/>
     <md5/>
-    <last_update>1721613850</last_update>
+    <last_update>1727689104</last_update>
   </playlist>
 </root>
diff --git a/docs/xml-responses/playlists.xml b/docs/xml-responses/playlists.xml
diff --git a/docs/xml-responses/user_playlists.xml b/docs/xml-responses/user_playlists.xml
diff --git a/docs/xml-responses/user_smartlists.xml b/docs/xml-responses/user_smartlists.xml
diff --git a/requirements.txt b/requirements.txt
diff --git a/src/ampache.py b/src/ampache.py

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"auth": "cfj3f237d563f479f5223k23189dbb34",`
`3`		`- "api": "6.6.1",`
	`3`	`+ "api": "6.6.2",`
`4`	`4`	`"session_expire": "2022-08-17T06:21:00+00:00",`
`5`	`5`	`"update": "2023-05-18T07:13:57+00:00",`
`6`	`6`	`"add": "2021-08-03T00:04:14+00:00",`
Original file line number	Diff line number	Diff line change
`@@ -2,25 +2,25 @@`
`2`	`2`	`"artist": {`
`3`	`3`	`"16": [`
`4`	`4`	`{`
`5`		`- "id": null,`
	`5`	`+ "id": 10,`
`6`	`6`	`"type": "album"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"27": [`
`10`	`10`	`{`
`11`		`- "id": null,`
	`11`	`+ "id": 12,`
`12`	`12`	`"type": "album"`
`13`	`13`	`}`
`14`	`14`	`],`
`15`	`15`	`"34": [`
`16`	`16`	`{`
`17`		`- "id": null,`
	`17`	`+ "id": 12,`
`18`	`18`	`"type": "album"`
`19`	`19`	`}`
`20`	`20`	`],`
`21`	`21`	`"36": [`
`22`	`22`	`{`
`23`		`- "id": null,`
	`23`	`+ "id": 21,`
`24`	`24`	`"type": "album"`
`25`	`25`	`}`
`26`	`26`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "server": "6.6.1",`
`3`		`- "version": "6.6.1",`
	`2`	`+ "server": "6.6.2",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"compatible": "350001"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@`
`6`	`6`	`"id": "65",`
`7`	`7`	`"name": "documentation json",`
`8`	`8`	`"owner": "user",`
	`9`	`+ "user": {`
	`10`	`+ "id": "2",`
	`11`	`+ "username": "user"`
	`12`	`+ },`
`9`	`13`	`"items": 0,`
`10`	`14`	`"type": "public",`
`11`	`15`	`"art": "https:\/\/music.com.au\/image.php?object_id=65&object_type=playlist",`
`@@ -16,7 +20,7 @@`
`16`	`20`	`"rating": null,`
`17`	`21`	`"averagerating": null,`
`18`	`22`	`"md5": null,`
`19`		`- "last_update": 1721613835`
	`23`	`+ "last_update": 1727689088`
`20`	`24`	`}`
`21`	`25`	`]`
`22`	`26`	`}`