Merge pull request #1 from LibreTime/master

Update
This commit is contained in:
Codenift 2019-10-25 21:35:10 -04:00 committed by GitHub
commit 9b5108f424
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 770 additions and 982 deletions

30
.github/lock.yml vendored Normal file
View file

@ -0,0 +1,30 @@
# Configuration for Lock Threads - https://github.com/dessant/lock-threads
# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 365
# Skip issues and pull requests created before a given timestamp. Timestamp must
# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
skipCreatedBefore: false
# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
exemptLabels: []
# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: false
# Comment to post before locking. Set to `false` to disable
lockComment: >
This thread has been automatically locked since there has not been
any recent activity after it was closed. Please open a new issue for
related bugs.
Please chat to us on [discourse](https://discourse.libretime.org/) or
ask for help on our [chat](https://chat.libretime.org/) if you have any
questions or need further assistance with this issue.
# Assign `resolved` as the reason for locking. Set to `false` to disable
setLockReason: true
# Limit to only `issues` or `pulls`
# only: issues

58
.github/stale.yml vendored Normal file
View file

@ -0,0 +1,58 @@
# Configuration for probot-stale - https://github.com/probot/stale
# Number of days of inactivity before an Issue or Pull Request becomes stale (5 months)
daysUntilStale: 150
# Number of days of inactivity before an Issue or Pull Request with the stale label is closed. (1 month)
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 30
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- pinned
- security
- "[Status] Maybe Later"
- "3.0-release-blocker"
# Set to true to ignore issues in a project (defaults to false)
exemptProjects: false
# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: true
# Set to true to ignore issues with an assignee (defaults to false)
exemptAssignees: true
# Label to use when marking as stale
staleLabel: stale
# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
activity in the last 5 months. It will be closed if no activity occurs in
the next month.
Please chat to us on [discourse](https://discourse.libretime.org/) or
ask for help on our [chat](https://chat.libretime.org/) if you have any
questions or need further support with getting this issue resolved.
You may also label an issue as *pinned* if you would like to make sure
that it does not get closed by this bot.
# Comment to post when removing the stale label.
# unmarkComment: >
# Your comment here.
# Comment to post when closing a stale Issue or Pull Request.
closeComment: >
This issue has been autmatically closed after is was marked as stale and
did not receive any further inputs.
Feel free to let us know on [discourse](https://discourse.libretime.org/) or
ask for help on our [chat](https://chat.libretime.org/) if you feel this
issue should not have been closed.
Thank you for your contributions.
# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30

View file

@ -1,401 +0,0 @@
<?xml version="1.0"?>
<projectProfile type="default" version="1.10">
<projectDirectory>
<projectProfileFile filesystemName=".zfproject.xml"/>
<applicationDirectory classNamePrefix="Application_">
<apisDirectory enabled="false"/>
<configsDirectory>
<applicationConfigFile type="ini"/>
</configsDirectory>
<controllersDirectory>
<controllerFile controllerName="Index">
<actionMethod actionName="index"/>
<actionMethod actionName="main"/>
</controllerFile>
<controllerFile controllerName="Error">
<actionMethod actionName="denied"/>
</controllerFile>
<controllerFile controllerName="Playlist">
<actionMethod actionName="index"/>
<actionMethod actionName="new"/>
<actionMethod actionName="metadata"/>
<actionMethod actionName="edit"/>
<actionMethod actionName="addItem"/>
<actionMethod actionName="moveItem"/>
<actionMethod actionName="deleteItem"/>
<actionMethod actionName="setCue"/>
<actionMethod actionName="setFade"/>
<actionMethod actionName="delete"/>
<actionMethod actionName="deleteActive"/>
<actionMethod actionName="close"/>
<actionMethod actionName="setPlaylistFades"/>
</controllerFile>
<controllerFile controllerName="Library">
<actionMethod actionName="index"/>
<actionMethod actionName="contextMenu"/>
<actionMethod actionName="delete"/>
<actionMethod actionName="contents"/>
<actionMethod actionName="editFileMd"/>
<actionMethod actionName="getFileMetadata"/>
</controllerFile>
<controllerFile controllerName="Plupload">
<actionMethod actionName="index"/>
<actionMethod actionName="upload"/>
<actionMethod actionName="plupload"/>
</controllerFile>
<controllerFile controllerName="Search">
<actionMethod actionName="index"/>
<actionMethod actionName="newfield"/>
<actionMethod actionName="display"/>
<actionMethod actionName="newgroup"/>
</controllerFile>
<controllerFile controllerName="Login">
<actionMethod actionName="index"/>
<actionMethod actionName="logout"/>
</controllerFile>
<controllerFile controllerName="Schedule">
<actionMethod actionName="index"/>
<actionMethod actionName="eventFeed"/>
<actionMethod actionName="moveShow"/>
<actionMethod actionName="resizeShow"/>
<actionMethod actionName="deleteShow"/>
<actionMethod actionName="makeContextMenu"/>
<actionMethod actionName="scheduleShow"/>
<actionMethod actionName="clearShow"/>
<actionMethod actionName="findPlaylists"/>
<actionMethod actionName="removeGroup"/>
<actionMethod actionName="scheduleShowDialog"/>
<actionMethod actionName="showList"/>
<actionMethod actionName="getShowData"/>
<actionMethod actionName="showContentDialog"/>
<actionMethod actionName="editShow"/>
<actionMethod actionName="addShow"/>
<actionMethod actionName="cancelShow"/>
<actionMethod actionName="cancelCurrentShow"/>
</controllerFile>
<controllerFile controllerName="Api">
<actionMethod actionName="index"/>
</controllerFile>
<controllerFile controllerName="User">
<actionMethod actionName="index"/>
<actionMethod actionName="addUser"/>
<actionMethod actionName="getHosts"/>
<actionMethod actionName="getUserDataTableInfo"/>
<actionMethod actionName="getUserData"/>
<actionMethod actionName="removeUser"/>
</controllerFile>
<controllerFile controllerName="SidePlaylist">
<actionMethod actionName="index"/>
</controllerFile>
<controllerFile controllerName="Nowplaying">
<actionMethod actionName="index"/>
<actionMethod actionName="getDataGridData"/>
<actionMethod actionName="livestream"/>
<actionMethod actionName="dayView"/>
</controllerFile>
<controllerFile controllerName="Preference">
<actionMethod actionName="index"/>
<actionMethod actionName="update"/>
</controllerFile>
<controllerFile controllerName="Dashboard">
<actionMethod actionName="index"/>
<actionMethod actionName="help"/>
</controllerFile>
<controllerFile controllerName="Recorder">
<actionMethod actionName="index"/>
<actionMethod actionName="getShowSchedule"/>
</controllerFile>
</controllersDirectory>
<formsDirectory>
<formFile formName="Login"/>
<formFile formName="PlaylistMetadata"/>
<formFile formName="AdvancedSearch"/>
<formFile formName="AdvancedSearchRow"/>
<formFile formName="EditAudioMD"/>
<formFile formName="AddShow"/>
<formFile formName="ScheduleShow"/>
<formFile formName="AddUser"/>
<formFile formName="AdvancedSearchGroup"/>
<formFile formName="AddShowWhen"/>
<formFile formName="AddShowWho"/>
<formFile formName="AddShowStyle"/>
<formFile formName="AddShowWhat"/>
<formFile formName="AddShowRepeats"/>
<formFile formName="Preferences"/>
<formFile formName="AddShowRR"/>
<formFile formName="AddShowRebroadcastDates"/>
<formFile formName="AddShowAbsoluteRebroadcastDates"/>
<formFile formName="SoundcloudPreferences"/>
<formFile formName="GeneralPreferences"/>
<formFile formName="WatchedDirPreferences"/>
</formsDirectory>
<layoutsDirectory enabled="false"/>
<modelsDirectory>
<modelFile modelName="Nowplaying"/>
<modelFile modelName="Preference"/>
<modelFile modelName="DateHelper"/>
</modelsDirectory>
<modulesDirectory enabled="false"/>
<viewsDirectory>
<viewScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Index">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Error">
<viewScriptFile forActionName="error"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Library">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="new"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="metadata"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="edit"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Library">
<viewScriptFile forActionName="contextMenu"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Library">
<viewScriptFile forActionName="delete"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Library">
<viewScriptFile forActionName="contents"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Index">
<viewScriptFile forActionName="main"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="addItem"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="moveItem"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="deleteItem"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="setCue"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="setFade"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="delete"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="deleteActive"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Index">
<viewScriptFile forActionName="newfield"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Index">
<viewScriptFile forActionName="display"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Plupload">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Plupload">
<viewScriptFile forActionName="upload"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Plupload">
<viewScriptFile forActionName="plupload"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Search">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Search">
<viewScriptFile forActionName="newfield"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Search">
<viewScriptFile forActionName="display"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Login">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Login">
<viewScriptFile forActionName="logout"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="eventFeed"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Error">
<viewScriptFile forActionName="denied"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="moveShow"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="resizeShow"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Api">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="deleteShow"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="makeContextMenu"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="scheduleShow"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="clearShow"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="User">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="User">
<viewScriptFile forActionName="addUser"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="close"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Library">
<viewScriptFile forActionName="editFileMd"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Search">
<viewScriptFile forActionName="newgroup"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="findPlaylists"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="removeGroup"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="scheduleShowDialog"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Nowplaying">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Nowplaying">
<viewScriptFile forActionName="getDataGridData"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="User">
<viewScriptFile forActionName="getHosts"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Nowplaying">
<viewScriptFile forActionName="livestream"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="showList"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="getShowData"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="showContentDialog"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Preference">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Preference">
<viewScriptFile forActionName="update"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Library">
<viewScriptFile forActionName="getFileMetadata"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Nowplaying">
<viewScriptFile forActionName="dayView"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="User">
<viewScriptFile forActionName="getUserDataTableInfo"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="User">
<viewScriptFile forActionName="getUserData"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="User">
<viewScriptFile forActionName="removeUser"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Playlist">
<viewScriptFile forActionName="setPlaylistFades"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="editShow"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="addShow"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Dashboard">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Dashboard">
<viewScriptFile forActionName="help"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="cancelShow"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Recorder">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Recorder">
<viewScriptFile forActionName="getShowSchedule"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Schedule">
<viewScriptFile forActionName="cancelCurrentShow"/>
</viewControllerScriptsDirectory>
</viewScriptsDirectory>
<viewHelpersDirectory/>
<viewFiltersDirectory enabled="false"/>
</viewsDirectory>
<bootstrapFile filesystemName="Bootstrap.php"/>
</applicationDirectory>
<dataDirectory enabled="false">
<cacheDirectory enabled="false"/>
<searchIndexesDirectory enabled="false"/>
<localesDirectory enabled="false"/>
<logsDirectory enabled="false"/>
<sessionsDirectory enabled="false"/>
<uploadsDirectory enabled="false"/>
</dataDirectory>
<docsDirectory>
<file filesystemName="README.txt"/>
</docsDirectory>
<libraryDirectory>
<zfStandardLibraryDirectory enabled="false"/>
</libraryDirectory>
<publicDirectory>
<publicStylesheetsDirectory enabled="false"/>
<publicScriptsDirectory enabled="false"/>
<publicImagesDirectory enabled="false"/>
<publicIndexFile filesystemName="index.php"/>
<htaccessFile filesystemName=".htaccess"/>
</publicDirectory>
<projectProvidersDirectory enabled="false"/>
<temporaryDirectory enabled="false"/>
<testsDirectory>
<testPHPUnitConfigFile filesystemName="phpunit.xml"/>
<testApplicationDirectory>
<testApplicationBootstrapFile filesystemName="bootstrap.php"/>
<testApplicationControllerDirectory>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
<testApplicationControllerFile/>
</testApplicationControllerDirectory>
</testApplicationDirectory>
<testLibraryDirectory>
<testLibraryBootstrapFile filesystemName="bootstrap.php"/>
</testLibraryDirectory>
</testsDirectory>
</projectDirectory>
</projectProfile>

11
Vagrantfile vendored
View file

@ -14,7 +14,12 @@ Vagrant.configure("2") do |config|
config.vm.network "forwarded_port", guest: 8888, host:8888
# make sure we are using nfs (doesn't work out of the box with debian)
config.vm.synced_folder ".", "/vagrant", type: "nfs"
nfsPath = "."
# macOS Catalina support
if Dir.exist?("/System/Volumes/Data")
nfsPath = "/System/Volumes/Data" + Dir.pwd
end
config.vm.synced_folder nfsPath, "/vagrant", type: "nfs"
# private network for nfs
config.vm.network "private_network", ip: "192.168.10.100"
@ -46,11 +51,11 @@ Vagrant.configure("2") do |config|
provision_libretime(os, "debian.sh", installer_args)
end
config.vm.define "debian-stretch" do |os|
os.vm.box = "bento/debian-9.6"
os.vm.box = "bento/debian-9"
provision_libretime(os, "debian.sh", installer_args)
end
config.vm.define "debian-buster" do |os|
os.vm.box = "generic/debian10"
os.vm.box = "bento/debian-10"
provision_libretime(os, "debian.sh", installer_args)
end
config.vm.define "centos" do |os|

View file

@ -590,7 +590,7 @@ class ApiController extends Zend_Controller_Action
//default
foreach ($md as $key => $value) {
if ($key == 'MDATA_KEY_ARTWORK' && !is_null($value)) {
FileDataHelper::renderImage($fp . $md['MDATA_KEY_ARTWORK'].'-1024.jpg');
FileDataHelper::renderImage($fp . $md['MDATA_KEY_ARTWORK'].'-512.jpg');
}
}
} elseif ($return === "artwork-32") {
@ -617,12 +617,6 @@ class ApiController extends Zend_Controller_Action
FileDataHelper::renderImage($fp . $md['MDATA_KEY_ARTWORK'].'-512.jpg');
}
}
} elseif ($return === "artwork-1024") {
foreach ($md as $key => $value) {
if ($key == 'MDATA_KEY_ARTWORK' && !is_null($value)) {
FileDataHelper::renderImage($fp . $md['MDATA_KEY_ARTWORK'].'-1024.jpg');
}
}
} elseif ($return === "json") {
$data =json_encode($md);
echo $data;

File diff suppressed because it is too large Load diff

View file

@ -96,15 +96,15 @@ offers the option to choose a different operation system according to you needs.
| OS | Command | Comment |
| ------ | ------------------- | ------- |
| Debian 10 | `vagrant up debian-buster` | Install on Debian Buster. |
| Debian 9.6 | `vagrant up debian-stretch` | Install on current Debian Stretch. |
| Ubuntu 18.04 | `vagrant up ubuntu-bionic` | Experimental install on current Ubuntu Bionic Beaver. |
| Debian 9 | `vagrant up debian-stretch` | Install on current Debian Stretch. Needs manual intervention due to Liquidsoap 1.3.3. |
| Ubuntu 18.04 | `vagrant up ubuntu-bionic` | Install on current Ubuntu Bionic Beaver. |
| Ubuntu 16.04 | `vagrant up ubuntu-xenial` | Install on Ubuntu Xenial Xerus. |
| CentOS | `vagrant up centos` | Extremely experimental install on 7.3 with native systemd support and activated SELinux. Needs manual intervention due to Liquidsoap 1.3.3. |
## Troubleshooting
If anything fails during the initial provisioning step you can try running `vagrant provision`
to rerun the installer.
to re-run the installer.
If you only want to re-run parts of the installer, use `--provision-with install`. The
If you only want to re-run parts of the installer, use `--provision-with $step`. The
supported steps are `prepare`, `install`, `install-mkdocs` and `start-mkdocs`.