Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a status page to Library and Playlists pages. #315

Merged
merged 8 commits into from
Oct 1, 2021
Merged

Adds a status page to Library and Playlists pages. #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cb0a43
Batching (#318)
xou816 Sep 22, 2021
ef8d767
#306: improve appstream summary
xou816 Sep 22, 2021
9015e77
Bump tokio from 1.10.0 to 1.11.0
dependabot[bot] Sep 6, 2021
8fe9eac
#129: clear saved credentials when login fails (#320)
xou816 Sep 23, 2021
9140ff4
#311: parse track=null (#319)
xou816 Sep 23, 2021
e9263aa
Adds status pages to Library and Saved Playlists.
Diegovsky Sep 23, 2021
2b40df8
Made changes according to the review.
Diegovsky Sep 29, 2021
815a6e1
Re-ran `spot-pot`, added getters to the models.
Diegovsky Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ package = "futures"
version = "0.3.16"

[dependencies.serde]
version = "^1.0.128"
version = "^1.0.130"
features = ["derive"]

[dependencies.serde_json]
version = "^1.0.66"
version = "^1.0.68"

[dependencies.isahc]
version = "^1.2.0"
Expand All @@ -61,10 +61,10 @@ gdk-pixbuf = "^0.14.0"
libadwaita = "0.1.0-alpha-2"
ref_filter_map = "^1.0.1"
regex = "^1.4.6"
async-std = "^1.9.0"
async-std = "^1.10.0"
form_urlencoded = "^1.0.1"
zbus = "^2.0.0-beta.3"
zvariant = "^2.8.0"
zvariant_derive = "^2.5.0"
thiserror = "^1.0.26"
thiserror = "^1.0.29"
lazy_static = "^1.4.0"
70 changes: 35 additions & 35 deletions cargo-sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,15 @@
},
{
"type": "file",
"url": "https://static.crates.io/crates/async-std/async-std-1.9.0.crate",
"sha256": "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341",
"url": "https://static.crates.io/crates/async-std/async-std-1.10.0.crate",
"sha256": "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952",
"dest": "cargo/vendor",
"dest-filename": "async-std-1.9.0.crate"
"dest-filename": "async-std-1.10.0.crate"
},
{
"type": "file",
"url": "data:%7B%22package%22%3A%20%22d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/async-std-1.9.0",
"url": "data:%7B%22package%22%3A%20%22f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/async-std-1.10.0",
"dest-filename": ".cargo-checksum.json"
},
{
Expand Down Expand Up @@ -3433,41 +3433,41 @@
},
{
"type": "file",
"url": "https://static.crates.io/crates/serde/serde-1.0.128.crate",
"sha256": "1056a0db1978e9dbf0f6e4fca677f6f9143dc1c19de346f22cac23e422196834",
"url": "https://static.crates.io/crates/serde/serde-1.0.130.crate",
"sha256": "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913",
"dest": "cargo/vendor",
"dest-filename": "serde-1.0.128.crate"
"dest-filename": "serde-1.0.130.crate"
},
{
"type": "file",
"url": "data:%7B%22package%22%3A%20%221056a0db1978e9dbf0f6e4fca677f6f9143dc1c19de346f22cac23e422196834%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/serde-1.0.128",
"url": "data:%7B%22package%22%3A%20%22f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/serde-1.0.130",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "file",
"url": "https://static.crates.io/crates/serde_derive/serde_derive-1.0.128.crate",
"sha256": "13af2fbb8b60a8950d6c72a56d2095c28870367cc8e10c55e9745bac4995a2c4",
"url": "https://static.crates.io/crates/serde_derive/serde_derive-1.0.130.crate",
"sha256": "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b",
"dest": "cargo/vendor",
"dest-filename": "serde_derive-1.0.128.crate"
"dest-filename": "serde_derive-1.0.130.crate"
},
{
"type": "file",
"url": "data:%7B%22package%22%3A%20%2213af2fbb8b60a8950d6c72a56d2095c28870367cc8e10c55e9745bac4995a2c4%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/serde_derive-1.0.128",
"url": "data:%7B%22package%22%3A%20%22d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/serde_derive-1.0.130",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "file",
"url": "https://static.crates.io/crates/serde_json/serde_json-1.0.66.crate",
"sha256": "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127",
"url": "https://static.crates.io/crates/serde_json/serde_json-1.0.68.crate",
"sha256": "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8",
"dest": "cargo/vendor",
"dest-filename": "serde_json-1.0.66.crate"
"dest-filename": "serde_json-1.0.68.crate"
},
{
"type": "file",
"url": "data:%7B%22package%22%3A%20%22336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/serde_json-1.0.66",
"url": "data:%7B%22package%22%3A%20%220f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/serde_json-1.0.68",
"dest-filename": ".cargo-checksum.json"
},
{
Expand Down Expand Up @@ -3810,28 +3810,28 @@
},
{
"type": "file",
"url": "https://static.crates.io/crates/thiserror/thiserror-1.0.26.crate",
"sha256": "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2",
"url": "https://static.crates.io/crates/thiserror/thiserror-1.0.29.crate",
"sha256": "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88",
"dest": "cargo/vendor",
"dest-filename": "thiserror-1.0.26.crate"
"dest-filename": "thiserror-1.0.29.crate"
},
{
"type": "file",
"url": "data:%7B%22package%22%3A%20%2293119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/thiserror-1.0.26",
"url": "data:%7B%22package%22%3A%20%22602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/thiserror-1.0.29",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "file",
"url": "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.26.crate",
"sha256": "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745",
"url": "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.29.crate",
"sha256": "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c",
"dest": "cargo/vendor",
"dest-filename": "thiserror-impl-1.0.26.crate"
"dest-filename": "thiserror-impl-1.0.29.crate"
},
{
"type": "file",
"url": "data:%7B%22package%22%3A%20%22060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/thiserror-impl-1.0.26",
"url": "data:%7B%22package%22%3A%20%22bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/thiserror-impl-1.0.29",
"dest-filename": ".cargo-checksum.json"
},
{
Expand Down Expand Up @@ -3875,15 +3875,15 @@
},
{
"type": "file",
"url": "https://static.crates.io/crates/tokio/tokio-1.10.0.crate",
"sha256": "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b",
"url": "https://static.crates.io/crates/tokio/tokio-1.11.0.crate",
"sha256": "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce",
"dest": "cargo/vendor",
"dest-filename": "tokio-1.10.0.crate"
"dest-filename": "tokio-1.11.0.crate"
},
{
"type": "file",
"url": "data:%7B%22package%22%3A%20%2201cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/tokio-1.10.0",
"url": "data:%7B%22package%22%3A%20%22b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce%22%2C%20%22files%22%3A%20%7B%7D%7D",
"dest": "cargo/vendor/tokio-1.11.0",
"dest-filename": ".cargo-checksum.json"
},
{
Expand Down
21 changes: 15 additions & 6 deletions data/dev.alextren.Spot.appdata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,27 @@
<id>dev.alextren.Spot</id>
<url type="homepage">https://github.com/xou816/spot</url>
<name>Spot</name>
<summary>Spotify Client for the GNOME desktop</summary>
<summary>Listen to music on Spotify</summary>
<launchable type="desktop-id">dev.alextren.Spot.desktop</launchable>
<metadata_license>CC0-1.0</metadata_license>
<project_license>MIT</project_license>
<content_rating type="oars-1.1" />
<requires>
<display_length compare="ge">360</display_length>
</requires>
<recommends>
<control>keyboard</control>
<control>pointing</control>
<control>touch</control>
</recommends>
<!-- see https://puri.sm/posts/specify-form-factors-in-your-librem-5-apps/ -->
<custom>
<value key="Purism::form_factor">workstation</value>
<value key="Purism::form_factor">mobile</value>
</custom>
<description>
<p>
Spotify Client for the GNOME desktop. <b>Requires a premium account.</b>
Listen to music on Spotify. <b>Requires a premium account.</b>
</p>
<p>Current features:</p>
<ul>
Expand Down Expand Up @@ -245,8 +258,4 @@
</description>
</release>
</releases>
<custom>
<value key="Purism::form_factor">workstation</value>
<value key="Purism::form_factor">mobile</value>
</custom>
</component>
32 changes: 26 additions & 6 deletions po/spot.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: spot\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-08-19 10:05+0200\n"
"POT-Creation-Date: 2021-10-01 11:43-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -79,7 +79,7 @@ msgid "Add to {}"
msgstr ""

#. translators: This notification shows up right after login if the password could not be stored in the keyring (that is, GNOME's keyring aka seahorse, or any other libsecret compliant secret store).
#: src/app/components/login/login_model.rs:52
#: src/app/components/login/login_model.rs:56
msgid "Could not save password. Make sure the session keyring is unlocked."
msgstr ""

Expand Down Expand Up @@ -147,15 +147,25 @@ msgid "Connection restored"
msgstr ""

#. Title of the section that shows 5 of the top tracks for an artist, as defined by Spotify.
#: src/app/components/artist_details/artist_details.ui:42
#: src/app/components/artist_details/artist_details.ui:40
msgid "Top tracks"
msgstr ""

#. Title of the sections that contains all releases from an artist (both singles and albums).
#: src/app/components/artist_details/artist_details.ui:73
#: src/app/components/artist_details/artist_details.ui:71
msgid "Releases"
msgstr ""

#. A title that is shown when the user has not saved any albums.
#: src/app/components/library/library.ui:26
msgid "You have no saved albums."
msgstr ""

#. A description of what happens when the user has saved albums.
#: src/app/components/library/library.ui:27
msgid "Your library will be shown here."
msgstr ""

#. Login window title -- shouldn't be too long, but must mention Premium (a premium account is required).
#: src/app/components/login/login.ui:45
msgid "Login to Spotify Premium"
Expand All @@ -181,12 +191,22 @@ msgstr ""
msgid "Log in"
msgstr ""

#. A title that is shown when the user has not saved any playlists.
#: src/app/components/saved_playlists/saved_playlists.ui:26
msgid "You have no saved playlists."
msgstr ""

#. A description of what happens when the user has saved playlists.
#: src/app/components/saved_playlists/saved_playlists.ui:27
msgid "Your playlists will be shown here."
msgstr ""

#. This is the title of a section of the search results
#: src/app/components/search/search.ui:68
#: src/app/components/search/search.ui:66
msgid "Albums"
msgstr ""

#. This is the title of a section of the search results
#: src/app/components/search/search.ui:101
#: src/app/components/search/search.ui:99
msgid "Artists"
msgstr ""
Loading