**NOTE** no more channels

time to go.

.gitignore

@@ -18,7 +18,6 @@ logs/
 nbproject/
 node_modules/
 public/.maintenance
-public/channel/.htaccess
 public/play/.htaccess
 public/rest/.htaccess
 public/lib/components

README.md

@@ -85,8 +85,8 @@ Please see [the wiki](https://github.com/ampache/ampache/wiki/Installation) and
 
 If you are upgrading from an older version of Ampache we recommend
 moving the old directory out of the way, extracting the new copy in
-its place and then copying the old /config/ampache.cfg.php, /rest/.htaccess,
-/channel/.htaccess, and /play/.htaccess files if any.
+its place and then copying the old /config/ampache.cfg.php,
+/rest/.htaccess, and /play/.htaccess files if any.
 All database updates will be handled by Ampache.
 
 ## License

bin/cli

@@ -48,7 +48,6 @@ $app->add($dic->get(Cli\ComputeCacheCommand::class));
 $app->add($dic->get(Cli\CronProcessCommand::class));
 $app->add($dic->get(Cli\CacheProcessCommand::class));
 $app->add($dic->get(Cli\ArtSizeCalculationCommand::class));
-$app->add($dic->get(Cli\RunChannelCommand::class));
 $app->add($dic->get(Cli\PrintTagsCommand::class));
 $app->add($dic->get(Cli\SongCleanupCommand::class));
 $app->add($dic->get(Cli\SortFilesCommand::class));

docker/docker-setup.sh

@@ -1,9 +1,6 @@
 #!/bin/sh
 
 # create the htaccess files
-if [ ! -f ../public/channel/.htaccess ]; then
- cp ../public/channel/.htaccess.dist ../public/channel/.htaccess
-fi
 if [ ! -f ../public/play/.htaccess ]; then
  cp ../public/play/.htaccess.dist ../public/play/.htaccess
 fi

docs/RELEASE-PROCESS.md

@@ -65,11 +65,11 @@ read -p "Enter Ampache Version: " a_version
 * Create a zip package named "ampache-5.x.x_all.zip and add the entire ampache directory tree. (excluding git/development specific files)
 
 ```shell
-rm ../ampache-${a_version}_all.zip & zip -r -q -u -9 --exclude=./config/ampache.cfg.php --exclude=./docker/* --exclude=./.git/* --exclude=./.github/* --exclude=./.tx/* --exclude=./.idea/* --exclude=.gitignore --exclude=.gitattributes --exclude=.scrutinizer.yml --exclude=CNAME --exclude=.codeclimate.yml --exclude=.php* --exclude=.tgitconfig --exclude=.travis.yml --exclude=./public/rest/.htaccess.dist --exclude=./public/play/.htaccess.dist --exclude=./public/channel/.htaccess.dist ../ampache-${a_version}_all.zip ./
-rm ../ampache-${a_version}_all_php8.0.zip & zip -r -q -u -9 --exclude=./config/ampache.cfg.php --exclude=./docker/* --exclude=./.git/* --exclude=./.github/* --exclude=./.tx/* --exclude=./.idea/* --exclude=.gitignore --exclude=.gitattributes --exclude=.scrutinizer.yml --exclude=CNAME --exclude=.codeclimate.yml --exclude=.php* --exclude=.tgitconfig --exclude=.travis.yml --exclude=./public/rest/.htaccess.dist --exclude=./public/play/.htaccess.dist --exclude=./public/channel/.htaccess.dist ../ampache-${a_version}_all_php8.0.zip ./
+rm ../ampache-${a_version}_all.zip & zip -r -q -u -9 --exclude=./config/ampache.cfg.php --exclude=./docker/* --exclude=./.git/* --exclude=./.github/* --exclude=./.tx/* --exclude=./.idea/* --exclude=.gitignore --exclude=.gitattributes --exclude=.scrutinizer.yml --exclude=CNAME --exclude=.codeclimate.yml --exclude=.php* --exclude=.tgitconfig --exclude=.travis.yml --exclude=./public/rest/.htaccess.dist --exclude=./public/play/.htaccess.dist ../ampache-${a_version}_all.zip ./
+rm ../ampache-${a_version}_all_php8.0.zip & zip -r -q -u -9 --exclude=./config/ampache.cfg.php --exclude=./docker/* --exclude=./.git/* --exclude=./.github/* --exclude=./.tx/* --exclude=./.idea/* --exclude=.gitignore --exclude=.gitattributes --exclude=.scrutinizer.yml --exclude=CNAME --exclude=.codeclimate.yml --exclude=.php* --exclude=.tgitconfig --exclude=.travis.yml --exclude=./public/rest/.htaccess.dist --exclude=./public/play/.htaccess.dist ../ampache-${a_version}_all_php8.0.zip ./
 
-rm ../ampache-${a_version}_all_squashed.zip & zip -r -q -u -9 --exclude=./config/ampache.cfg.php --exclude=./docker/* --exclude=./.git/* --exclude=./.github/* --exclude=./.tx/* --exclude=./.idea/* --exclude=.gitignore --exclude=.gitattributes --exclude=.scrutinizer.yml --exclude=CNAME --exclude=.codeclimate.yml --exclude=.php* --exclude=.tgitconfig --exclude=.travis.yml --exclude=./rest/.htaccess.dist --exclude=./play/.htaccess.dist --exclude=./channel/.htaccess.dist ../ampache-${a_version}_all_squashed.zip ./
-rm ../ampache-${a_version}_all_squashed_php8.0.zip & zip -r -q -u -9 --exclude=./config/ampache.cfg.php --exclude=./docker/* --exclude=./.git/* --exclude=./.github/* --exclude=./.tx/* --exclude=./.idea/* --exclude=.gitignore --exclude=.gitattributes --exclude=.scrutinizer.yml --exclude=CNAME --exclude=.codeclimate.yml --exclude=.php* --exclude=.tgitconfig --exclude=.travis.yml --exclude=./rest/.htaccess.dist --exclude=./play/.htaccess.dist --exclude=./channel/.htaccess.dist ../ampache-${a_version}_all_squashed_php8.0.zip ./
+rm ../ampache-${a_version}_all_squashed.zip & zip -r -q -u -9 --exclude=./config/ampache.cfg.php --exclude=./docker/* --exclude=./.git/* --exclude=./.github/* --exclude=./.tx/* --exclude=./.idea/* --exclude=.gitignore --exclude=.gitattributes --exclude=.scrutinizer.yml --exclude=CNAME --exclude=.codeclimate.yml --exclude=.php* --exclude=.tgitconfig --exclude=.travis.yml --exclude=./rest/.htaccess.dist --exclude=./play/.htaccess.dist ../ampache-${a_version}_all_squashed.zip ./
+rm ../ampache-${a_version}_all_squashed_php8.0.zip & zip -r -q -u -9 --exclude=./config/ampache.cfg.php --exclude=./docker/* --exclude=./.git/* --exclude=./.github/* --exclude=./.tx/* --exclude=./.idea/* --exclude=.gitignore --exclude=.gitattributes --exclude=.scrutinizer.yml --exclude=CNAME --exclude=.codeclimate.yml --exclude=.php* --exclude=.tgitconfig --exclude=.travis.yml --exclude=./rest/.htaccess.dist --exclude=./play/.htaccess.dist ../ampache-${a_version}_all_squashed_php8.0.zip ./
 ```
 
 * Then unpack the exact zip and create a server to test basic functionality
@@ -181,7 +181,7 @@ After fixing up the paths you can commit then follow the regular release process
 * Copy everything from /public into the root on the ampache_squashed folder
 * find and replace for the following folders
 
-/admin, /channel, /daap, /play, /rest, /server, /upnp, /webdav
+/admin, /daap, /play, /rest, /server, /upnp, /webdav
 * find `$dic = require __DIR__ . '/../../src/Config/Init.php';`
 * replace `$dic = require __DIR__ . '/../src/Config/Init.php';`
 

public/browse.php

@@ -29,7 +29,6 @@
 use Ampache\Module\Application\Browse\ArtistAction;
 use Ampache\Module\Application\Browse\BroadcastAction;
 use Ampache\Module\Application\Browse\CatalogAction;
-use Ampache\Module\Application\Browse\ChannelAction;
 use Ampache\Module\Application\Browse\ClipAction;
 use Ampache\Module\Application\Browse\FileAction;
 use Ampache\Module\Application\Browse\LabelAction;
@@ -71,7 +70,6 @@
  LiveStreamAction::REQUEST_KEY => LiveStreamAction::class,
  TvShowAction::REQUEST_KEY => TvShowAction::class,
  LabelAction::REQUEST_KEY => LabelAction::class,
- ChannelAction::REQUEST_KEY => ChannelAction::class,
  BroadcastAction::REQUEST_KEY => BroadcastAction::class,
  VideoAction::REQUEST_KEY => VideoAction::class,
  PodcastAction::REQUEST_KEY => PodcastAction::class,