Merge pull request #3276 from ampache/master

5.4.0

bin/cli

@@ -25,6 +25,7 @@ declare(strict_types=1);
 
 use Ampache\Config\ConfigContainerInterface;
 use Ampache\Module\Cli;
+use Ampache\Repository\Model\User;
 use Psr\Container\ContainerInterface;
 
 define('NO_SESSION', '1');
@@ -34,6 +35,9 @@ define('OUTDATED_DATABASE_OK', 1);
 /** @var ContainerInterface $dic */
 $dic = require __DIR__ . '/../src/Config/Init.php';
 
+// set a global in case it's needed
+$GLOBALS['user'] = new User(-1);
+
 // Init App with name and version
 $app = new Ahc\Cli\Application(
     'Ampache CLI',

composer.json

@@ -91,16 +91,16 @@
         "scn/phptal": "^3.0",
         "shrikeh/teapot": "^2.3",
         "swisnl/jquery-contextmenu": "2.1.*",
-        "symfony/event-dispatcher": "^3.0",
+        "symfony/event-dispatcher": "^4.4.20",
         "symfony/http-foundation": "^3.0",
-        "symfony/process": "^3.0",
+        "symfony/process": "^4.4.20",
         "symfony/routing": "^3.0",
         "tightenco/collect": "5.2.*",
         "vakata/jstree": "3.*",
         "xdan/datetimepicker": "2.*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "2.19.*",
+        "friendsofphp/php-cs-fixer": "3.*",
         "mikey179/vfsstream": "^1.6",
         "mockery/mockery": "^1.3",
         "phpunit/phpunit": "^9",

docs/API-advanced-search.md

@@ -98,7 +98,7 @@ Select the type of search based on the type of data you are searching for. (song
 | playlist_name            | Playlist Name             | text              |        song,album,artist         |
 | comment                  | Comment                   | text              |               song               |
 | lyrics                   | Lyrics                    | text              |               song               |
-| file                     | Filename                  | text              |            song,video            |
+| file                     | Filename                  | text              |      song,album,artist,video     |
 | bitrate                  | Bitrate                   | numeric           |               song               |
 | added                    | Added                     | date              |               song               |
 | updated                  | Updated                   | date              |               song               |

docs/CHANGELOG.md

@@ -1,5 +1,51 @@
 # CHANGELOG
 
+## Ampache 5.4.0-release
+
+### Added
+
+* Translation Updates May 2022
+* Search
+  * Add `file` to album and artist search
+* CLI
+  * New argument for run:updateCatalog `-f|--find` Find missing files and print a list of filenames
+  * New argument for cleanup:sortSongs `-f|--files` Rename files and keep them in the current folder
+  * New argument for cleanup:sortSongs `-l|--limit` Limit how many moves to allow before stopping
+  * New argument for cleanup:sortSongs `[catalogName]` Name of Catalog (optional)
+* Database 540002:
+  * Index `title` with `enabled` on `song` table to speed up searching
+  * Index `album` table columns; `catalog`, `album_artist`, `original_year`, `release_type`, `release_status`, `mbid`, `mbid_group`
+  * Index `object_type` with `date` in `object_count` table
+
+### Changed
+
+* Moved to php-cs-fixer 3
+* Update from tags now shows an 'Error' status if there was an issues reading the file
+
+### Fixed
+
+* SQL for random artist with mapping
+* SQL for servers < 5.0.0 might try to insert into a missing table
+* Respect grouping for song_count searches
+* Autoplay in xbmc localplay and conform to localplay api
+* Ungrouped albums were forced into groups
+* Artists array should overwrite artist_mbid arrays that are smaller
+* Some empty globals relating to user
+* More work on the forked Jplayer playlist code when using `play last`
+* DAAP play urls
+* Single disk download links on group pages
+* CLI
+  * cleanup:sortSongs was broken (It actually works again)
+  * cleanup:sortSongs removes incomplete copied files after failure
+
+## API 5.4.0
+
+### Added
+
+* advanced_search
+  * Add `file` to album and artist search
+
+
 ## Ampache 5.3.3-release
 
 ### Added
@@ -15,8 +61,8 @@
 
 * Default art_search_limit raised to 15
 * web_player shuffle improvements
- * Current selected track will become the first track and everything else shuffled below it
- * Playlist isn't automatically played so if a song was playing, it will continue to play
+  * Current selected track will become the first track and everything else shuffled below it
+  * Playlist isn't automatically played so if a song was playing, it will continue to play
 
 ### Fixed
 

docs/examples/inotifywait.sh

@@ -16,14 +16,29 @@
 #    delete_self   file or directory was deleted
 #    unmount       file system containing file or directory unmounted
 
-# catalog_update.inc options:
-#    -h help
-#    -n Catalog Name
-#    -f File Path
-#    -c Clean File
-#    -v Verify File
-#    -a Add File
-#    -g Gather Art
+# cli command run:updateCatalog
+#
+# Perform catalog actions for all files of a catalog. If no options are given, the defaults actions -ceag are assumed
+#
+# Usage: run:updateCatalog [OPTIONS...] [ARGUMENTS...]
+#
+# Arguments:
+#   [catalogName]    Name of Catalogue (optional)
+#   [catalogType]    Type of Catalogue (optional)
+#
+# Options:
+#   [-a|--add]            Adds new media files to the database
+#   [-g|--art]            Gathers media Art
+#   [-c|--cleanup]        Removes missing files from the database
+#   [-f|--find]           Find missing files and print a list of filenames
+#   [-h|--help]           Show help
+#   [-i|--import]         Adds new media files and imports playlist files
+#   [-m|--memorylimit]    Temporarily deactivates PHP memory limit
+#   [-o|--optimize]       Optimises database tables
+#   [-u|--update]         Update local object metadata using external plugins
+#   [-v|--verbosity]      Verbosity level
+#   [-e|--verify]         Reads your files and updates the database to match changes
+#   [-V|--version]        Show version
 
 # music file extensions to look for
 declare -a arr=("mp3" "mpc" "m4p" "m4a" "aac" "ogg" "oga" "wav" "aif" "aiff" "rm" "wma" "asf" "flac" "opus" "spx" "ra" "ape" "shn" "wv")