Skip to content

Commit

Permalink
🚚 Change name to Muse
Browse files Browse the repository at this point in the history
  • Loading branch information
cristianpb committed Apr 26, 2020
1 parent 3828f35 commit 0b4fbeb
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 44 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ jobs:
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
publish_branch: gh-pages
publish_dir: ./__sapper__/export/apollo
publish_dir: ./__sapper__/export/muse
- name: Build python package
run: |
export APP_VERSION=$(git describe --tags --always --abbrev=0)
sed -i -E "s/version = (.*)/version = ${APP_VERSION:1}/" setup.cfg
sed -i -E "s/version\": \"(.*)\"/version\": \"${APP_VERSION:1}\"/" package.json;
cp -r ./__sapper__/export/apollo/* mopidy_apollo/static
cp -r ./__sapper__/export/muse/* mopidy_muse/static
python3 -m pip install --upgrade setuptools wheel
python3 setup.py sdist bdist_wheel
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
release_name: Release ${{ github.ref }}
draft: false
prerelease: false
- run: cp dist/Mopidy-Apollo*.tar.gz ./dist/Mopidy-Apollo.tar.gz
- run: cp dist/Mopidy-Muse*.tar.gz ./dist/Mopidy-Muse.tar.gz
if: startsWith(github.event.ref, 'refs/tags')
- name: Upload Release Asset
if: startsWith(github.event.ref, 'refs/tags')
Expand All @@ -86,8 +86,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./dist/Mopidy-Apollo.tar.gz
asset_name: Mopidy-Apollo.tar.gz
asset_path: ./dist/Mopidy-Muse.tar.gz
asset_name: Mopidy-Muse.tar.gz
asset_content_type: application/gzip
- uses: stefanzweifel/[email protected]
if: startsWith(github.event.ref, 'refs/tags')
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ RUN apt-get install -y \
RUN pip3 install Mopidy-TuneIn Mopidy-Local

##########################################################
FROM base as apollo
FROM base as muse
ARG app_path

# Base dir /app
WORKDIR /$app_path

COPY mopidy_apollo/mopidy.conf /root/.config/mopidy.conf
COPY mopidy_muse/mopidy.conf /root/.config/mopidy.conf
COPY setup.py ./
COPY setup.cfg ./
COPY LICENSE ./
COPY MANIFEST.in ./
COPY README.md ./
COPY pyproject.toml ./
ADD ./mopidy_apollo ./mopidy_apollo
ADD ./mopidy_muse ./mopidy_muse
RUN pip3 install -e .

EXPOSE 6680
Expand Down
6 changes: 3 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
recursive-include mopidy_apollo/static *
recursive-include mopidy_apollo *.py
include mopidy_apollo/ext.conf
recursive-include mopidy_muse/static *
recursive-include mopidy_muse *.py
include mopidy_muse/ext.conf
include pyproject.toml
include LICENSE
include MANIFEST.in
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export APP=mopidy-apollo
export APP=mopidy-muse
export APP_PATH := $(shell pwd)
export APP_VERSION := $(shell git describe --tags --always --abbrev=0)
export APP_VERSION_CUT=$(subst v,,$(APP_VERSION))
Expand All @@ -12,20 +12,20 @@ export HOST_SNAPCAST_TEMP=/tmp/snapcast-mopidy
up:
docker-compose up --build

build:
build-docker:
docker-compose build

__sapper__/export/apollo:
__sapper__/export/muse:
npm run export

build-html: __sapper__/export/apollo
build-html: __sapper__/export/muse

build-python: build-html
sed -i -E "s/version = (.*)/version = ${APP_VERSION_CUT}/" setup.cfg;
sed -i -E "s/version\": \"(.*)\"/version\": \"${APP_VERSION_CUT}\"/" package.json;
docker run --rm \
-v ${APP_PATH}/__sapper__/export/apollo:/${APP}/mopidy_apollo/static \
-v ${APP_PATH}/mopidy_apollo/mopidy.conf:/root/.config/mopidy/mopidy.conf \
-v ${APP_PATH}/__sapper__/export/muse:/${APP}/mopidy_muse/static \
-v ${APP_PATH}/mopidy_muse/mopidy.conf:/root/.config/mopidy/mopidy.conf \
-v ${HOST_MUSIC_DIRECTORY}:/var/lib/mopidy/media \
-v ${HOST_PLAYLIST_DIRECTORY}:/var/lib/mopidy/playlists \
-v ${HOST_SNAPCAST_TEMP}:/tmp \
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Apollo <img src="https://cristianpb.github.io/apollo/icon.png" align="right" width="200" />
# Muse <img src="https://cristianpb.github.io/muse/icon.png" align="right" width="200" />

![PyPI](https://img.shields.io/pypi/v/Mopidy-Apollo) ![PyPI - Downloads](https://img.shields.io/pypi/dm/Mopidy-Apollo?label=PyPi%20downloads) [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fcristianpb%2Fapollo%2Fbadge%3Fref%3Dmaster&style=flat)](https://actions-badge.atrox.dev/cristianpb/apollo/goto?ref=master)
![PyPI](https://img.shields.io/pypi/v/Mopidy-Muse) ![PyPI - Downloads](https://img.shields.io/pypi/dm/Mopidy-Muse?label=PyPi%20downloads) [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fcristianpb%2Fmuse%2Fbadge%3Fref%3Dmaster&style=flat)](https://actions-badge.atrox.dev/cristianpb/muse/goto?ref=master)

A mopidy player with snapcast support

Expand All @@ -17,28 +17,28 @@ A mopidy player with snapcast support
* Sapper for multiple pages and server side rendering
* Github Actions CI/CD workflow for build and publish

Checkout a detailled description at [this blog post](https://cristianpb.github.io/blog/mopidy-apollo)
Checkout a detailled description at [this blog post](https://cristianpb.github.io/blog/mopidy-muse)

<p align="center">
<img width="901" height="450" src="https://cristianpb.github.io/assets/img/mopidy-apollo/main.png" alt="Mopidy-Apollo homepage">
<img width="901" height="450" src="https://cristianpb.github.io/assets/img/mopidy-muse/main.png" alt="Mopidy-Muse homepage">
</p>

## Installation

Install by running:

```bash
python3 -m pip install Mopidy-Apollo
python3 -m pip install Mopidy-Muse
```

Before starting Mopidy, you must add configuration for Mopidy-Apollo to your Mopidy configuration file:
Before starting Mopidy, you must add configuration for Mopidy-Muse to your Mopidy configuration file:

```conf
[apollo]
[muse]
enabled = true
```

## Project resources

* [Source code](https://github.com/cristianpb/apollo)
* [Issue tracker](https://github.com/cristianpb/apollo/issues)
* [Source code](https://github.com/cristianpb/muse)
* [Issue tracker](https://github.com/cristianpb/muse/issues)
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ services:
build:
context: .
dockerfile: Dockerfile
target: apollo
target: muse
args:
app_path: /${APP}
depends_on:
- snapserver
ports:
- 6680:6680
volumes:
- ./__sapper__/export/apollo:/${APP}/mopidy_apollo/static
- ./mopidy_apollo/mopidy.conf:/root/.config/mopidy/mopidy.conf
- ./__sapper__/export/muse:/${APP}/mopidy_muse/static
- ./mopidy_muse/mopidy.conf:/root/.config/mopidy/mopidy.conf
- ${HOST_MUSIC_DIRECTORY}:/var/lib/mopidy/music
- ${HOST_PLAYLIST_DIRECTORY}:/var/lib/mopidy/playlists
- ${HOST_SNAPCAST_TEMP}:/tmp
6 changes: 3 additions & 3 deletions mopidy_apollo/__init__.py → mopidy_muse/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

from mopidy import config, ext

__version__ = pkg_resources.get_distribution("Mopidy-Apollo").version
__version__ = pkg_resources.get_distribution("Mopidy-Muse").version

class Extension(ext.Extension):

dist_name = "Mopidy-Apollo"
ext_name = "apollo"
dist_name = "Mopidy-Muse"
ext_name = "muse"
version = __version__

def get_default_config(self):
Expand Down
2 changes: 1 addition & 1 deletion mopidy_apollo/ext.conf → mopidy_muse/ext.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[apollo]
[muse]
enabled = true
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "Mopidy-Apollo",
"name": "Mopidy-Muse",
"description": "Mopidy web interface with snapcast support",
"version": "0.0.7",
"scripts": {
"dev": "sapper dev",
"build": "sapper build --legacy",
"export": "sapper export --legacy --basepath apollo",
"export": "sapper export --legacy --basepath muse",
"start": "node __sapper__/build",
"cy:run": "cypress run",
"cy:open": "cypress open",
Expand Down
8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[metadata]
name = Mopidy-Apollo
name = Mopidy-Muse
version = 0.0.7
url = https://github.com/cristianpb/apollo
url = https://github.com/cristianpb/muse
author = Cristian Brokate
license = Apache License, Version 2.0
license_file = LICENSE
Expand Down Expand Up @@ -58,11 +58,11 @@ exclude =

[options.entry_points]
mopidy.ext =
apollo = mopidy_apollo:Extension
muse = mopidy_muse:Extension


[flake8]
application-import-names = mopidy_apollo, tests
application-import-names = mopidy_muse, tests
max-line-length = 80
select =
# Regular flake8 rules
Expand Down
4 changes: 2 additions & 2 deletions src/routes/index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{:else}
<div class="card-image has-text-centered">
<figure class="image is-1by1">
<img src="{process.env.NODE_ENV === 'development' ? '' : '/apollo'}/icon.svg" alt="Placeholder image" width="128" height="128">
<img src="{process.env.NODE_ENV === 'development' ? '' : '/muse'}/icon.svg" alt="Placeholder image" width="128" height="128">
</figure>
</div>
{/if}
Expand Down Expand Up @@ -111,7 +111,7 @@

<div class="columns">
<div class="column has-text-centered">
<a href="https://github.com/cristianpb/apollo">
<a href="https://github.com/cristianpb/muse">
Version - __VERSION__
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const dev = NODE_ENV === 'development';

polka() // You can also use Express
.use(
dev ? '/' : '/apollo',
dev ? '/' : '/muse',
compression({ threshold: 0 }),
sirv('static', { dev }),
sapper.middleware()
Expand Down
4 changes: 2 additions & 2 deletions static/manifest.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"background_color": "#ffffff",
"theme_color": "#333333",
"name": "Mopidy-Apollo",
"short_name": "Mopidy-Apollo",
"name": "Mopidy-Muse",
"short_name": "Mopidy-Muse",
"display": "minimal-ui",
"start_url": "/",
"icons": [
Expand Down

0 comments on commit 0b4fbeb

Please sign in to comment.