Skip to content

Commit

Permalink
app is being renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
wdehoog committed Jul 7, 2018
1 parent b06c10c commit b4dbfd2
Show file tree
Hide file tree
Showing 13 changed files with 557 additions and 20 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The app hopes to become a Spotify 'controller'. You can browse/search albums, ar
Right now for authentication is done using [O2](https://github.com/pipacs/o2)
and for the API code from [spotify-web-api-js](https://github.com/JMPerez/spotify-web-api-js) is used.

O2 and spotify-web-api-js have their own license. For playspot it is MIT.
O2 and spotify-web-api-js have their own license. For hutspot it is MIT.

Currently you also need avahi. I have build it on [OBS](http://repo.merproject.org/obs/home:/wdehoog:/hutspot/sailfish_latest_armv7hl/).

Expand All @@ -19,7 +19,7 @@ Due to the issues below this app is not for the faint of heart. Don't use it unl
* I honestly have no clue how this O2 is supposed to work. When to refresh what?

### Playing tracks
* Device discovery is problematic. Spotify does not know all your devices. The official app and application discover them using Zeroconf. Using avahi playspot tries the same. They are discovered but the Spotify server needs to be told they exist and I have no de how to do that.
* Device discovery is problematic. Spotify does not know all your devices. The official app and application discover them using Zeroconf. Using avahi hutspot tries the same. They are discovered but the Spotify server needs to be told they exist and I have no de how to do that.
* I managed to [build Librespot](https://gist.github.com/wdehoog/d83d75564ebc77a985384950af44ee7c) and it even sometimes occurs on the list of devices so it can be used to play tracks. When logging in (passing credentials to librespot at startup) the Spotify server knows about it for a short time.

## Building
Expand Down
8 changes: 4 additions & 4 deletions playspot.desktop → hutspot.desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[Desktop Entry]
Type=Application
X-Nemo-Application-Type=silica-qt5
Icon=playspot
Exec=playspot
Name=playspot
Icon=hutspot
Exec=hutspot
Name=hutspot
# translation example:
# your app name in German locale (de)
#
# Remember to comment out the following line, if you do not want to use
# a different app name in German locale (de).
Name[de]=playspot
Name[de]=hutspot
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
16 changes: 8 additions & 8 deletions playspot.pro
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# - translation filenames have to be changed

# The name of your application
TARGET = playspot
TARGET = hutspot

CONFIG += sailfishapp

Expand All @@ -31,19 +31,19 @@ SOURCES += src/playspot.cpp \
DISTFILES += qml/playspot.qml \
qml/cover/CoverPage.qml \
qml/pages/FirstPage.qml \
rpm/playspot.changes.in \
rpm/playspot.changes.run.in \
rpm/playspot.spec \
rpm/playspot.yaml \
translations/*.ts \
playspot.desktop \
qml/pages/Search.qml \
qml/components/SearchResultListItem.qml \
qml/pages/MyStuff.qml \
qml/pages/Album.qml \
qml/pages/Playlist.qml \
qml/pages/Artist.qml \
icons/256x256/playspot.png
icons/256x256/playspot.png \
rpm/hutspot.yaml \
rpm/hutspot.spec \
rpm/hutspot.changes.in \
rpm/hutspot.changes.run.in \
hutspot.desktop

SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256

Expand All @@ -55,7 +55,7 @@ CONFIG += sailfishapp_i18n
# planning to localize your app, remember to comment out the
# following TRANSLATIONS line. And also do not forget to
# modify the localized app name in the the .desktop file.
TRANSLATIONS += translations/playspot-de.ts
#TRANSLATIONS += translations/hutspot-de.ts

HEADERS += \
src/o2/o0abstractstore.h \
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions rpm/playspot.spec → rpm/hutspot.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Generated by: spectacle version 0.27
#

Name: playspot
Name: hutspot

# >> macros
# << macros
Expand All @@ -12,14 +12,14 @@ Name: playspot
%{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Spotify Player for SailfishOS
Summary: Spotify Controller for SailfishOS
Version: 0.1
Release: 1
Group: Qt/Qt
License: LICENSE
URL: http://example.org/
Source0: %{name}-%{version}.tar.bz2
Source100: playspot.yaml
Source100: hutspot.yaml
Requires: sailfishsilica-qt5 >= 0.10.9
Requires: avahi
Requires: libavahi-client3
Expand Down
7 changes: 5 additions & 2 deletions rpm/playspot.yaml → rpm/hutspot.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Name: playspot
Summary: Spotify Player for SailfishOS
Name: hutspot
Summary: Spotify controller for SailfishOS
Version: 0.1
Group: Applications/Multimedia
URL: https://github.com/wdehoog/playspot
License: MIT
Release: 1
# The contents of the Group field should be one of the groups listed here:
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
Expand Down
2 changes: 1 addition & 1 deletion src/spotify.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void Spotify::doO2Auth(const QString &scope) {
store->setGroupKey("spotify");
o2Spotify->setStore(store);

o2Spotify->setReplyContent("<html><body><h1>Playspot: authorization redirected</h1><br><h1>You can close this window and return to the App.</h1></body></html>");
o2Spotify->setReplyContent("<html><body><h1>Hutspot: authorization redirected</h1><br><h1>You can close this window and return to the App.</h1></body></html>");

// Connect signals
connect(o2Spotify, SIGNAL(linkedChanged()), this, SLOT(onLinkedChanged()));
Expand Down
Loading

0 comments on commit b4dbfd2

Please sign in to comment.