From 989b60e0599580ff95e553a084f5827b0fd473e1 Mon Sep 17 00:00:00 2001
From: Sybil <sybil.deboin@gmail.com>
Date: Tue, 16 Sep 2014 20:26:52 +0200
Subject: [PATCH] Soundcloud player is handling errors (missing tracks...).
---
app/assets/javascripts/.music_player.js.swo | Bin 12288 -> 12288 bytes
app/assets/javascripts/music_player.js | 16 ++++++++++------
app/views/channels/show_channel.html.erb | 2 +-
app/views/channels/show_user.html.erb | 2 +-
app/views/layouts/application.html.erb | 2 +-
app/views/musics/.index.html.erb.swo | Bin 12288 -> 0 bytes
app/views/musics/index.html.erb | 2 +-
app/views/musics/show.html.erb | 2 +-
app/views/tags/.show.html.erb.swp | Bin 12288 -> 0 bytes
app/views/tags/show.html.erb | 2 +-
10 files changed, 16 insertions(+), 12 deletions(-)
delete mode 100644 app/views/musics/.index.html.erb.swo
delete mode 100644 app/views/tags/.show.html.erb.swp
diff --git a/app/assets/javascripts/.music_player.js.swo b/app/assets/javascripts/.music_player.js.swo
index 193c93e3a4cf5249702f8e9d0d3a895f5a1ce0e7..3923fc6d4a7152bd70fd678cf79b994730b4b4b1 100644
GIT binary patch
delta 558
zcmZojXh;xEG6?hZRWR2xVPIfj5MW>^Z;%MtyixQwKV#ZvL4nWwybD<w7(&@0l4+X-
z6|x!QrgJbb7;rE!$Z;?*aB(m&uy8Oi{A6cfIK<AtFo~UkA%&fRA&#AaA%dNOA&ecO
zU5cH7;XE4yLpK`(Lp~b=LnIpmLm(Rig9{r2gAE%4g9#f00~;Fy!wc4p8`m*y?ohF2
zoV-w7wVt7tK|w)ZzgE*4Oe-jW_zDUN3dN}<A({APb5rw6OEik}OY>5abMi}5V5(7Q
zkXazp!Ga133NTs$B&gsFl2!oO3bPk13>O76P_=-CKsuldg~?0RRpkk*(Xqy&hM|@L
zBnrYHSAatSWG+~^79<ObH-_5D4Z5O}m#b?rDJV={pr!|+E~uFbDk!Ap6sIawGeGnx
zC`>lc5fM^Q$V^kvNG&SLFVa+~R$x$2m@KF!F<D-nV{(*+6^D)jL~8O34LO$b@^Zb+
I+cdn`0jNK2$p8QV
delta 292
zcmZojXh;xEG6?hZRWR2xVPIfj5MW@4m@FQ$ZlmaLe#WHDf&!oUdH=F9Ff3$;NG5F-
zRLEwun$5w$V8Ow_z|6tGaFv~b;XFG7!%}tzh9&F_42#$y%GKE!7;4!W7}D7o7&O@!
z7z$Y#82+(r+<1v;bBBsG<KzHU#mN`cwWaj+gPryAU2~ICQ#5i*i!+nsON(-J6si>x
zCl{*PO)gXof+<zPt+ccxKfWL*u@b6Wc%qURb1ehI<acU1Y_*!!3<?U952z?kj!@;D
td`#VRvXMrVlBR-!f<iTef<jqhkpkRe1zQEBjFOUqVk>?9&D%7**a66;PyGM@
diff --git a/app/assets/javascripts/music_player.js b/app/assets/javascripts/music_player.js
index 6b6df22..851c1f7 100644
--- a/app/assets/javascripts/music_player.js
+++ b/app/assets/javascripts/music_player.js
@@ -87,12 +87,16 @@ function soundcloud_listener() {
function soundcloud_player() {
player_destroy();
- var music_url = "https://soundcloud.com/"+music_info.data().url;
- SC.oEmbed(music_url, { auto_play: true , maxheight: 120, maxwidth: 1000 }, function(oEmbed) {
- player = oEmbed.html.replace('visual=true&','');
- player = $('#player_block').html(player);
+ var music_url = "https://www.soundcloud.com/"+music_info.data().url;
+ SC.oEmbed(music_url, { auto_play: true , maxheight: 120, maxwidth: 1000 }, function(oEmbed, error) {
+ if (error) {
+ next_music();
+ }
+ else {
+ player = oEmbed.html.replace('visual=true&','');
+ player = $('#player_block').html(player);
+ setTimeout(soundcloud_listener, 2000 );
+ }
});
- setTimeout(soundcloud_listener, 2000 );
-
}
diff --git a/app/views/channels/show_channel.html.erb b/app/views/channels/show_channel.html.erb
index ea696e1..edc617a 100644
--- a/app/views/channels/show_channel.html.erb
+++ b/app/views/channels/show_channel.html.erb
@@ -7,7 +7,7 @@
if music.type == "youtube"
track = music.url.sub(/.*v=/,'')
elsif music.type == "soundcloud"
- track = music.url.sub(/https:\/\/soundcloud\.com\//,'')
+ track = music.url.sub(/https:\/\/(www\.)?soundcloud\.com\//,'')
end %>">
<span class="music_id"><%= music.id %></span>
<span class="music_chan"><%= music.channel.chan %></span>
diff --git a/app/views/channels/show_user.html.erb b/app/views/channels/show_user.html.erb
index ea696e1..edc617a 100644
--- a/app/views/channels/show_user.html.erb
+++ b/app/views/channels/show_user.html.erb
@@ -7,7 +7,7 @@
if music.type == "youtube"
track = music.url.sub(/.*v=/,'')
elsif music.type == "soundcloud"
- track = music.url.sub(/https:\/\/soundcloud\.com\//,'')
+ track = music.url.sub(/https:\/\/(www\.)?soundcloud\.com\//,'')
end %>">
<span class="music_id"><%= music.id %></span>
<span class="music_chan"><%= music.channel.chan %></span>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 38a3231..280a739 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,7 +14,7 @@
</body>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<script src="https://www.youtube.com/iframe_api"></script>
-<script src="https://connect.soundcloud.com/sdk.js"></script>
+<script src="https://connect.soundcloud.com/sdk-2.0.0.js"></script>
<script src="https://w.soundcloud.com/player/api.js"></script>
</html>
diff --git a/app/views/musics/.index.html.erb.swo b/app/views/musics/.index.html.erb.swo
deleted file mode 100644
index a7022bc50a3d652a8beb4988133347be7f1ba119..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12288
zcmYc?2=nw+FxN9-U|?VnU|@JXO*~{b$1fH;K?a86%B0L3kT?MxQk+<jk)4@JNNpY1
zK>hI4q=1~nN~io1{ltO-{j$u|@?!nm(&EhIV*Sj#l++5njFQ|Oz0{&40``tdkA}c#
z2oM<pr6p;)7Q76`Mur9;9m-0I3c^C6Am%6@4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7$G50QozVi&%nUI1of{7lx9Suq1;hwGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhl-hCpHp1H(if28O>pkokXD|Nl2X1H)~828Lby3=Grx85r{T85qL(85s2W
z85kJ&85l0}F);M<F)&o{F)+CBF)*<3F)*CwWnie}WneJmWnfU}WnhrzWnd8Hg_!*Z
zWd0BgpHU}|hQMeDjE2By2#kinXb6mkz-S1JhQMeD43iMBQMFYlNKDVnODsuMaDXg9
zR#3HLu+cBgv13qBuu)Y=%}W7^C@3f>*y!hEf<(dW;)29Hh2)&X;$mARu*Ue})V!3`
zA|*SJp<ofc<c!3;ywn^$h)jHDQL=)nosB+7D;{%764Q&3O#$)sauW-xYf5SqO7uz+
z(`)sz@-y=^lynr7G>I}Xvm_@K#Ym6<5l#Vl09hZ15AqO*CdT5-6lC3*ppZoMJ}4*^
zpkb^83loT-f<j4AVsf^EtpX%4ON(;!ic6C;^fO9I3W}{_^kejk^Gowml5_G)Q)2Xz
z^K)bL^>x(MH5p*~L3C<Pab_CSgp$gFR0UgG1to+&B^1Rtt<=*hv&A$U)8NYd(vs4o
zR3!ztu_=iqiMpjlIkrlmWPvJNkds)MS_F}S_z~<vRXcS3nJLJMz`+PrVv~~zON7Ze
rnaSCSNja(UIhlFc#b5<Cs<2e8mztQIp^%cVPy@E929&04K#3dxxV#Z>
diff --git a/app/views/musics/index.html.erb b/app/views/musics/index.html.erb
index ea696e1..edc617a 100644
--- a/app/views/musics/index.html.erb
+++ b/app/views/musics/index.html.erb
@@ -7,7 +7,7 @@
if music.type == "youtube"
track = music.url.sub(/.*v=/,'')
elsif music.type == "soundcloud"
- track = music.url.sub(/https:\/\/soundcloud\.com\//,'')
+ track = music.url.sub(/https:\/\/(www\.)?soundcloud\.com\//,'')
end %>">
<span class="music_id"><%= music.id %></span>
<span class="music_chan"><%= music.channel.chan %></span>
diff --git a/app/views/musics/show.html.erb b/app/views/musics/show.html.erb
index 78e787c..c7b3e6a 100644
--- a/app/views/musics/show.html.erb
+++ b/app/views/musics/show.html.erb
@@ -6,7 +6,7 @@
if music.type == "youtube"
track = music.url.sub(/.*v=/,'')
elsif music.type == "soundcloud"
- track = music.url.sub(/https:\/\/soundcloud\.com\//,'')
+ track = music.url.sub(/https:\/\/(www\.)?soundcloud\.com\//,'')
end %>">
<span class="music_id"><%= @music.id %></span>
<span class="music_title"><%= @music.title%></span>
diff --git a/app/views/tags/.show.html.erb.swp b/app/views/tags/.show.html.erb.swp
deleted file mode 100644
index 84869f8ddadad2521ef884c44e34ea0f13766bf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12288
zcmYc?2=nw+FxN9-U|?VnU|^7(E*>(C=^cxmAOk~jWm0AiNSpu;DNZcN$j(e9q_z%h
zpniC2Qb0~(rBi;1equp^epzN}d9i*;VtTQDaYlZ*UPei7j$Ud}5&=s`rAI?xGz5qb
zfzpyRT?<|YV<STYkS1j%MFnA@P!MwzkA}c#2#kinXb6mkz-S1JhQMeDjE2By2#k;r
zC@ElMsAphcV1oKr6iPFq(NOLvH5vk=Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?1VbP(g@K`mhk@Y_4`luy*8l&_&%kh-pMhZ)KLf*beg=j-eg=kceg+18eg*~x
zeg=lid<+b|d<+Z~d<+aOd<+aMd<+byc^Mcgc^McCc^Megc^Md_c^Mc)c^Me~Le2jL
zvSSE_(WsM0Ltr!nMnhmU1V%$(Gz3ONU^E0qLtr!nhCv9}sM;zNB&KKPC6=TrIOLWV
zXC@absM;~u=$Gc$F(@e5s4Ar9rGP{f6ciL}^m8&nqF{D$L1Lala!z7#v8@tVV|;OH
zUP@|_k{!rUu!vrAMq*xGYK|U6CO)$$SwYp#MjxaVk2#=~(8#8M_<FgC1=TerH3}tq
zC5h>^dRh6Ic^XPO3QC$pnV4CUlZs*_NPq~ZfINV#55xy~2t*TOab^m#?o3cfqIw?`
zlnT%=R)U2IL{LGYq$n{tTftTV5}2h$IeNvVNgDbYB_##LRx$c9`o;OBc`3;``K2i_
zddc~@G5Y#C>gt*dF#RApHK#Z;4QfJ3WkITft*wF*LZ1?fVw_g$X_eVxnvH32WqxT%
zX;P|^0^Hb?#F9ka(xMz&B~Y?J6)wn0tV}I}$UyuEcA=^ry8g@*WJTa$getMg$%G}s
t<ebdp?8Ky;)cBmtyzFAI0vlCWs@6+QOwLe9$ycZW+f)Ne(>9<)4giCz5G?=z
diff --git a/app/views/tags/show.html.erb b/app/views/tags/show.html.erb
index 18488d2..08e0be1 100644
--- a/app/views/tags/show.html.erb
+++ b/app/views/tags/show.html.erb
@@ -7,7 +7,7 @@
if music.type == "youtube"
track = music.url.sub(/.*v=/,'')
elsif music.type == "soundcloud"
- track = music.url.sub(/https:\/\/soundcloud\.com\//,'')
+ track = music.url.sub(/https:\/\/(www\.)?soundcloud\.com\//,'')
end %>">
<span class="music_id"><%= music.id %></span>
<span class="music_chan"><%= music.channel.chan %></span>
--
GitLab