Update to 0.3.2
This commit is contained in:
Richard Hughes
parent
5e738abf0c
commit
e715f1f032
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@
|
||||
/grilo-plugins-0.2.16.tar.xz
|
||||
/grilo-plugins-0.3.0.tar.xz
|
||||
/grilo-plugins-0.3.1.tar.xz
|
||||
/grilo-plugins-0.3.2.tar.xz
|
||||
|
||||
@ -1,145 +0,0 @@
|
||||
From 1546e677f4f0484402a2287f51f821b54fb345c3 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Tue, 22 Mar 2016 16:22:31 +0100
|
||||
Subject: [PATCH 1/2] jamendo: Fix "format not a string literal" error
|
||||
|
||||
---
|
||||
src/jamendo/grl-jamendo.c | 86 +++++++++++++++++++++++++++++++++++------------
|
||||
1 file changed, 65 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/src/jamendo/grl-jamendo.c b/src/jamendo/grl-jamendo.c
|
||||
index a58be4b..a0188ae 100644
|
||||
--- a/src/jamendo/grl-jamendo.c
|
||||
+++ b/src/jamendo/grl-jamendo.c
|
||||
@@ -139,10 +139,12 @@ typedef struct {
|
||||
gboolean cancelled;
|
||||
} XmlParseEntries;
|
||||
|
||||
+/* Note: you'll also need to update
|
||||
+ * grl_jamendo_source_browse() */
|
||||
struct Feeds {
|
||||
gchar *name;
|
||||
JamendoCategory cat;
|
||||
- gchar *url;
|
||||
+ const gchar *url;
|
||||
} feeds[] = {
|
||||
{ N_("Albums of the week"), JAMENDO_ALBUM_CAT,
|
||||
JAMENDO_GET_ALBUMS "&order=ratingweek_desc", },
|
||||
@@ -1174,10 +1176,46 @@ grl_jamendo_source_browse (GrlSource *source,
|
||||
|
||||
feed_id = atoi (container_split[1]);
|
||||
jamendo_keys = get_jamendo_keys (feeds[feed_id].cat);
|
||||
- url = g_strdup_printf (feeds[feed_id].url,
|
||||
- jamendo_keys,
|
||||
- page_size,
|
||||
- page_number);
|
||||
+ switch (feed_id) {
|
||||
+ case 0:
|
||||
+ url = g_strdup_printf (JAMENDO_GET_ALBUMS "&order=ratingweek_desc",
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number);
|
||||
+ break;
|
||||
+ case 1:
|
||||
+ url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=ratingweek_desc",
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number);
|
||||
+ break;
|
||||
+ case 2:
|
||||
+ url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=releasedate_desc",
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number);
|
||||
+ break;
|
||||
+ case 3:
|
||||
+ url = g_strdup_printf (JAMENDO_GET_ARTISTS "&order=rating_desc",
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number);
|
||||
+ break;
|
||||
+ case 4:
|
||||
+ url = g_strdup_printf (JAMENDO_GET_ALBUMS "&order=rating_desc",
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number);
|
||||
+ break;
|
||||
+ case 5:
|
||||
+ url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=rating_desc",
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number);
|
||||
+ break;
|
||||
+ default:
|
||||
+ g_assert_not_reached ();
|
||||
+ }
|
||||
g_free (jamendo_keys);
|
||||
} else {
|
||||
send_feeds (bs);
|
||||
@@ -1234,7 +1272,6 @@ grl_jamendo_source_query (GrlSource *source,
|
||||
gchar *term = NULL;
|
||||
gchar *url;
|
||||
gchar *jamendo_keys = NULL;
|
||||
- gchar *query = NULL;
|
||||
XmlParseEntries *xpe = NULL;
|
||||
guint page_size;
|
||||
guint page_number;
|
||||
@@ -1252,33 +1289,40 @@ grl_jamendo_source_query (GrlSource *source,
|
||||
goto send_error;
|
||||
}
|
||||
|
||||
+ grl_paging_translate (skip,
|
||||
+ count,
|
||||
+ 0,
|
||||
+ &page_size,
|
||||
+ &page_number,
|
||||
+ &page_offset);
|
||||
+
|
||||
jamendo_keys = get_jamendo_keys (category);
|
||||
switch (category) {
|
||||
case JAMENDO_ARTIST_CAT:
|
||||
- query = JAMENDO_SEARCH_ARTIST;
|
||||
+ url = g_strdup_printf (JAMENDO_SEARCH_ARTIST,
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number,
|
||||
+ term);
|
||||
break;
|
||||
case JAMENDO_ALBUM_CAT:
|
||||
- query = JAMENDO_SEARCH_ALBUM;
|
||||
+ url = g_strdup_printf (JAMENDO_SEARCH_ALBUM,
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number,
|
||||
+ term);
|
||||
break;
|
||||
case JAMENDO_TRACK_CAT:
|
||||
- query = JAMENDO_SEARCH_TRACK;
|
||||
+ url = g_strdup_printf (JAMENDO_SEARCH_TRACK,
|
||||
+ jamendo_keys,
|
||||
+ page_size,
|
||||
+ page_number,
|
||||
+ term);
|
||||
break;
|
||||
default:
|
||||
g_return_if_reached ();
|
||||
}
|
||||
|
||||
- grl_paging_translate (skip,
|
||||
- count,
|
||||
- 0,
|
||||
- &page_size,
|
||||
- &page_number,
|
||||
- &page_offset);
|
||||
-
|
||||
- url = g_strdup_printf (query,
|
||||
- jamendo_keys,
|
||||
- page_size,
|
||||
- page_number,
|
||||
- term);
|
||||
g_free (term);
|
||||
g_free (jamendo_keys);
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From 74740d264b57ef215b0968519f0766af0f46530a Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Tue, 22 Mar 2016 17:15:55 +0100
|
||||
Subject: [PATCH 2/2] tmdb: Fix "format not a string literal" error
|
||||
|
||||
---
|
||||
src/tmdb/grl-tmdb-request.c | 12 +++++-------
|
||||
1 file changed, 5 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/tmdb/grl-tmdb-request.c b/src/tmdb/grl-tmdb-request.c
|
||||
index 0f59158..14a687b 100644
|
||||
--- a/src/tmdb/grl-tmdb-request.c
|
||||
+++ b/src/tmdb/grl-tmdb-request.c
|
||||
@@ -382,30 +382,28 @@ grl_tmdb_request_new_details (const char *api_key,
|
||||
{
|
||||
GrlTmdbRequest *result;
|
||||
char *uri;
|
||||
- const char *template;
|
||||
|
||||
switch (detail) {
|
||||
case GRL_TMDB_REQUEST_DETAIL_MOVIE:
|
||||
- template = TMDB_API_CALL_MOVIE_INFO;
|
||||
+ uri = g_strdup_printf (TMDB_API_CALL_MOVIE_INFO, id);
|
||||
break;
|
||||
case GRL_TMDB_REQUEST_DETAIL_MOVIE_CAST:
|
||||
- template = TMDB_API_CALL_MOVIE_CAST;
|
||||
+ uri = g_strdup_printf (TMDB_API_CALL_MOVIE_CAST, id);
|
||||
break;
|
||||
case GRL_TMDB_REQUEST_DETAIL_MOVIE_IMAGES:
|
||||
- template = TMDB_API_CALL_MOVIE_IMAGES;
|
||||
+ uri = g_strdup_printf (TMDB_API_CALL_MOVIE_IMAGES, id);
|
||||
break;
|
||||
case GRL_TMDB_REQUEST_DETAIL_MOVIE_KEYWORDS:
|
||||
- template = TMDB_API_CALL_MOVIE_KEYWORDS;
|
||||
+ uri = g_strdup_printf (TMDB_API_CALL_MOVIE_KEYWORDS, id);
|
||||
break;
|
||||
case GRL_TMDB_REQUEST_DETAIL_MOVIE_RELEASE_INFO:
|
||||
- template = TMDB_API_CALL_MOVIE_RELEASE_INFO;
|
||||
+ uri = g_strdup_printf (TMDB_API_CALL_MOVIE_RELEASE_INFO, id);
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
break;
|
||||
}
|
||||
|
||||
- uri = g_strdup_printf (template, id);
|
||||
result = g_object_new (GRL_TMDB_REQUEST_TYPE,
|
||||
"api-key", api_key,
|
||||
"uri", uri,
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
%global goa_version 3.17.91
|
||||
|
||||
Name: grilo-plugins
|
||||
Version: 0.3.1
|
||||
Version: 0.3.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Plugins for the Grilo framework
|
||||
|
||||
@ -39,9 +39,6 @@ BuildRequires: json-glib-devel
|
||||
Requires: gnome-online-accounts%{_isa} >= %{goa_version}
|
||||
Requires: grilo%{_isa} >= %{grilo_version}
|
||||
|
||||
Patch0: 0001-jamendo-Fix-format-not-a-string-literal-error.patch
|
||||
Patch1: 0002-tmdb-Fix-format-not-a-string-literal-error.patch
|
||||
|
||||
%{?fedora:Requires: dleyna-server}
|
||||
%{?fedora:%global _enable_dleyna --enable-dleyna}
|
||||
|
||||
@ -72,8 +69,6 @@ This package contains plugins to get information from theses sources:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -121,6 +116,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*
|
||||
%{_libdir}/grilo-%{release_version}/*.so*
|
||||
|
||||
%changelog
|
||||
* Wed Jun 22 2016 Richard Hughes <rhughes@redhat.com> - 0.3.2-1
|
||||
- Update to 0.3.2
|
||||
|
||||
* Tue Mar 22 2016 Bastien Nocera <bnocera@redhat.com> 0.3.1-1
|
||||
- Update to 0.3.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user