Skip to content

Commit

Permalink
Merge 87f0375 into ff8043d
Browse files Browse the repository at this point in the history
  • Loading branch information
@aidewoode
aidewoode committed May 13, 2024
2 parents ff8043d + 87f0375 commit 8baf46d
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 16 deletions.
1 change: 1 addition & 0 deletions .dockerignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/.direnv
/.gems
/.pg_data
/docs

yarn-error.log
Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) Aidewoode <aidewoode@gmail.com>
Copyright (c) Ed Chao <aidewoode@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
23 changes: 8 additions & 15 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Black Candy is a self hosted music streaming server built with [Rails](https://r

Please visit <https://demo.blackcandy.org> and use demo user (email: admin@admin.com, password: foobar) to login. And feel free to try it.

> **Notice:** This demo user does not have administrator privileges. So you cannot experience all the features in Black Candy. And all music in the demo is under non-commercial licences. You can check their [licences](https://github.com/blackcandy-org/black_candy#licences-of-the-music-in-demo).
> **Notice:** This demo user does not have administrator privileges. So you cannot experience all the features in Black Candy. And all music in the demo are from [Free Music Archive](https://freemusicarchive.org/). You can check their [licenses](https://github.com/blackcandy-org/blackcandy/blob/master/docs/demo_music_licenses.md).
## Installation
> ⚠️ **Notice:** This installation instruction is for edge version, which means the docker image is build base on master branch. Because upcoming major version of Black Candy is going to have a lot of infrastructure changes. So the installation process will have a lot of difference.
Expand All @@ -34,7 +34,13 @@ docker run -p 3000:3000 ghcr.io/blackcandy-org/blackcandy:edge
That's all. Now, you can access either http://localhost:3000 or http://host-ip:3000 in a browser, and use initial admin user to login (email: admin@admin.com, password: foobar).

## Mobile App
Black Candy now has an iOS app in beta. You can visit [here](https://testflight.apple.com/join/TwMUVmDl) and join TestFlight to give it a try. Because this iOS app still in beta, you need use the edge version of Black Candy.
Black Candy now has an iOS and Android apps in beta.

For iOS app, you can visit [here](https://testflight.apple.com/join/TwMUVmDl) and join TestFlight to try it.

For Android app, you can download the APK from the assets of the latest beta [release](https://github.com/blackcandy-org/android/releases) to give it a try.

Because the mobile apps still in beta, you need use the edge version of Black Candy.

## Configuration

Expand Down Expand Up @@ -183,19 +189,6 @@ $ rails lint:all

Black Candy support get artist and album image from Discogs API. You can create a API token from Discogs and set Discogs token on Setting page to enable it.

## Licences Of The Music In Demo

- Kurt Vile - Live at WFMU on Talk's Cheap 8/11/2008 (licensed under [Attribution-NonCommercial-ShareAlike 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/))

- Wooden Shjips - Live at ATP NY 2008 (licensed under [Attribution-Noncommercial-No Derivative Works 3.0 United States](http://creativecommons.org/licenses/by-nc-nd/3.0/us/))

- Ty Segall - Live at WFMU on The Cherry Blossom Clinic with Terre T June 25, 2011 (licensed under [Attribution-Noncommercial-No Derivative Works 3.0 United States](http://creativecommons.org/licenses/by-nc-nd/3.0/us/))

- Thee Oh Sees - Peanut Butter Oven EP (licensed under [Attribution-Noncommercial-Share Alike 3.0 United States](http://creativecommons.org/licenses/by-nc-sa/3.0/us/))

If you like their music, you can buy their albums to support them.


## Sponsorship

This project is supported by:
Expand Down
47 changes: 47 additions & 0 deletions docs/demo_music_licenses.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Licenses Of The Music In Demo

All music in demo are downloaded from [Free Music Archive](https://freemusicarchive.org/), if you like their music please consider to support the artists. And the details of the licenses are listed below:

- [**Contenido**](https://freemusicarchive.org/music/Arrizabalaga_Bravo_Laginestra_Martinez/Contenido) by [Arrizabalaga, Bravo, Laginestra, Martinez](https://freemusicarchive.org/music/Arrizabalaga_Bravo_Laginestra_Martinez/) is licensed under a [Public Domain Mark 1.0](https://creativecommons.org/publicdomain/mark/1.0/).

- [**Quoin EP**](https://freemusicarchive.org/music/Axletree/Quoin_EP) by [Axletree](https://freemusicarchive.org/music/Axletree/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**Nfamoudou-Boudougou**](https://freemusicarchive.org/music/Breuss_Arrizabalaga_Quintet/Nfamoudou-Boudougou) by [Breuss Arrizabalaga Quintet](https://freemusicarchive.org/music/Breuss_Arrizabalaga_Quintet/) is licensed under a [PD](https://creativecommons.org/licenses/publicdomain/).

- [**Wild Heart**](https://freemusicarchive.org/music/Bryan_Mathys/Wild_Heart) by [Bryan Mathys](https://freemusicarchive.org/music/Bryan_Mathys/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**Be Love Not Fear**](https://freemusicarchive.org/music/MC_Cullah/Be_Fear_Not_Love) by [Cullah](https://freemusicarchive.org/music/MC_Cullah/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**Cullahmity**](https://freemusicarchive.org/music/MC_Cullah/Cullahmity) by [Cullah](https://freemusicarchive.org/music/MC_Cullah/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**Le Marathon de la Vie**](https://freemusicarchive.org/music/Frederic_Lardon/Le_Marathon_de_la_Vie) by [Frederic Lardon](https://freemusicarchive.org/music/Frederic_Lardon/) is licensed under a [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/).

- [**Everything Hurts**](https://freemusicarchive.org/music/holiznacc0/everything-hurts) by [HoliznaCC0](https://freemusicarchive.org/music/holiznacc0/) is licensed under a [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/).

- [**Antipatico**](https://freemusicarchive.org/music/J_Hacha_de_Zola/Antipatico_1380) by [J Hacha De Zola](https://freemusicarchive.org/music/J_Hacha_de_Zola/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**Smoke Factory**](https://freemusicarchive.org/music/Jahzzar/Smoke_Factory) by [Jahzzar](https://freemusicarchive.org/music/Jahzzar/) is licensed under a [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/).

- [**The Maddening Parade**](https://freemusicarchive.org/music/Jesse_Spillane/The_Maddening_Parade) by [Jesse Spillane](https://freemusicarchive.org/music/Jesse_Spillane/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**3**](https://freemusicarchive.org/music/Katy_Kirby/Katy_Kirby) by [Katy Kirby](https://freemusicarchive.org/music/Katy_Kirby/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**Vinegar and Honey**](https://freemusicarchive.org/music/Kelly_Latimore/Vinegar_and_Honey) by [Kelly Latimore](https://freemusicarchive.org/music/Kelly_Latimore/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**Just Had To Let You Know**](https://freemusicarchive.org/music/Lorenzos_Music/Just_Had_To_Let_You_Know) by [Lorenzo's Music](https://freemusicarchive.org/music/Lorenzos_Music/) is licensed under a [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/).

- [**This Isn't Magic It Is Just Music**](https://freemusicarchive.org/music/Pierce_Murphy/This_Isnt_Magic_It_Is_Just_Music) by [Pierce Murphy](https://freemusicarchive.org/music/Pierce_Murphy/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**Punk Rock Opera, Vol. II**](https://freemusicarchive.org/music/Punk_Rock_Opera/Punk_Rock_Opera_Vol_II) by [Punk Rock Opera](https://freemusicarchive.org/music/Punk_Rock_Opera/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**End of Line**](https://freemusicarchive.org/music/Quantum_Jazz/End_of_Line) by [Quantum Jazz](https://freemusicarchive.org/music/Quantum_Jazz/) is licensed under a [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/).

- [**The Politics of Desire**](https://freemusicarchive.org/music/Revolution_Void/The_Politics_of_Desire) by [Revolution Void](https://freemusicarchive.org/music/Revolution_Void/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**This Small Town**](https://freemusicarchive.org/music/Scott_Jacobs/This_Small_Town) by [Scott Jacobs](https://freemusicarchive.org/music/Scott_Jacobs/) is licensed under a [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/).

- [**Live At Blues Alley**](https://freemusicarchive.org/music/US_Army_Blues/Live_At_Blues_Alley) by [U.S. Army Blues](https://freemusicarchive.org/music/US_Army_Blues/) is licensed under a [Public Domain Mark 1.0](https://creativecommons.org/publicdomain/mark/1.0/).

- [**The Lasso of Time**](https://freemusicarchive.org/music/Unheard_Music_Concepts/The_Lasso_of_Time) by [Unheard Music Concepts](https://freemusicarchive.org/music/Unheard_Music_Concepts/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

- [**(Jazz Funk) Huh? Vol. 3**](https://freemusicarchive.org/music/van-loon/jazz-funk-huh-vol-3) by [Van Loon](https://freemusicarchive.org/music/van-loon/) is licensed under a [CC BY](https://creativecommons.org/licenses/by/4.0/).

0 comments on commit 8baf46d

Please sign in to comment.