Skip to content

Switch from JSON::XS::VersionOneAndTwo to JSON::XS #89

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

Open
mavit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch from JSON::XS::VersionOneAndTwo to JSON::XS #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.410.1
- drop JSON::XS::VersionOneAndTwo

0.410.0
- add yt-dlp update (credits @https://github.com/ElFishi)

Expand Down
4 changes: 2 additions & 2 deletions plugin/API.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use strict;

use Digest::MD5 qw(md5_hex);
use File::Spec::Functions qw(catdir);
use JSON::XS::VersionOneAndTwo;
use JSON::XS qw(decode_json);
use List::Util qw(min max);
use URI::Escape qw(uri_escape uri_escape_utf8);
use MIME::Base64 qw(decode_base64);
Expand Down Expand Up @@ -148,7 +148,7 @@ sub _call {
Slim::Networking::SimpleAsyncHTTP->new(
sub {
my $response = shift;
my $result = eval { from_json($response->content) };
my $result = eval { decode_json($response->content) };

if ($@) {
$log->error(Data::Dump::dump($response)) unless main::DEBUGLOG && $log->is_debug;
Expand Down
6 changes: 3 additions & 3 deletions plugin/Oauth2.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use Slim::Utils::Prefs;
use Slim::Utils::Log;
use Slim::Utils::Cache;
use Slim::Utils::Strings qw(string cstring);
use JSON::XS::VersionOneAndTwo;
use JSON::XS qw(decode_json);

my $log = logger('plugin.youtube');
my $prefs = preferences('plugin.youtube');
Expand All @@ -33,7 +33,7 @@ sub getToken {
my $http = Slim::Networking::SimpleAsyncHTTP->new(
sub {
my $response = shift;
my $result = eval { from_json($response->content) };
my $result = eval { decode_json($response->content) };

if ($@) {
$log->error(Data::Dump::dump($response)) unless main::DEBUGLOG && $log->is_debug;
Expand Down Expand Up @@ -80,7 +80,7 @@ sub getCode {
my $http = Slim::Networking::SimpleAsyncHTTP->new(
sub {
my $response = shift;
my $result = eval { from_json($response->content) };
my $result = eval { decode_json($response->content) };

if ($@) {
$log->error(Data::Dump::dump($response)) unless main::DEBUGLOG && $log->is_debug;
Expand Down
1 change: 0 additions & 1 deletion plugin/Plugin.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use base qw(Slim::Plugin::OPMLBased);

use List::Util qw(first);
use Encode qw(encode decode);
use JSON::XS::VersionOneAndTwo;
use HTML::Entities;
use File::Spec;
use File::Spec::Functions;
Expand Down