zoriya/Opus
1
0
Fork 0
mirror of https://github.com/zoriya/Opus.git synced 2025-12-06 06:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding a catch for unplayable songs (blocked in a country).

Browse Source
This commit is contained in:
Tristan Roux
2019-04-06 17:46:52 +02:00
parent e2611980a8
commit f227fcfa80
9 changed files with 98 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Opus/MainActivity.cs
View File

@@ -944,6 +944,18 @@ namespace Opus
snackBar.Show();
}
public void Unplayable(string msg)
{
if (msg.Contains("country"))
{
Snackbar snackBar = Snackbar.Make(FindViewById(Resource.Id.snackBar), Resource.String.country_blocked, Snackbar.LengthLong);
snackBar.View.FindViewById<TextView>(Resource.Id.snackbar_text).SetTextColor(Color.White);
snackBar.Show();
}
else
UnknowError();
}
public void NotStreamable(string title)
{
Snackbar snackBar = Snackbar.Make(FindViewById(Resource.Id.snackBar), title + Resource.String.not_streamable, Snackbar.LengthLong);

22
Opus/Opus.csproj
View File

@@ -94,17 +94,17 @@
<Reference Include="ExoPlayer.UI, Version=2.8.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.UI.2.8.8\lib\monoandroid81\ExoPlayer.UI.dll</HintPath>
</Reference>
<Reference Include="Google.Apis, Version=1.38.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.1.38.0\lib\netstandard2.0\Google.Apis.dll</HintPath>
<Reference Include="Google.Apis, Version=1.38.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.1.38.2\lib\netstandard2.0\Google.Apis.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.Auth, Version=1.38.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.Auth.1.38.0\lib\netstandard2.0\Google.Apis.Auth.dll</HintPath>
<Reference Include="Google.Apis.Auth, Version=1.38.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.Auth.1.38.2\lib\netstandard2.0\Google.Apis.Auth.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.Auth.PlatformServices, Version=1.38.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.Auth.1.38.0\lib\netstandard2.0\Google.Apis.Auth.PlatformServices.dll</HintPath>
<Reference Include="Google.Apis.Auth.PlatformServices, Version=1.38.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.Auth.1.38.2\lib\netstandard2.0\Google.Apis.Auth.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.Core, Version=1.38.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.Core.1.38.0\lib\netstandard2.0\Google.Apis.Core.dll</HintPath>
<Reference Include="Google.Apis.Core, Version=1.38.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.Core.1.38.2\lib\netstandard2.0\Google.Apis.Core.dll</HintPath>
</Reference>
<Reference Include="Google.Apis.YouTube.v3, Version=1.38.0.1488, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.YouTube.v3.1.38.0.1488\lib\netstandard2.0\Google.Apis.YouTube.v3.dll</HintPath>
@@ -171,7 +171,7 @@
<HintPath>..\packages\TagLib.Portable.1.0.4\lib\portable-net45+win+wpa81+wp8+MonoAndroid10+xamarinios10+MonoTouch10\TagLib.Portable.dll</HintPath>
</Reference>
<Reference Include="Validation, Version=2.4.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
<HintPath>..\packages\Validation.2.4.18\lib\netstandard1.3\Validation.dll</HintPath>
<HintPath>..\packages\Validation.2.4.22\lib\netstandard1.3\Validation.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Arch.Core.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
@@ -317,8 +317,8 @@
<Reference Include="Xamarin.GooglePlayServices.Tasks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.70.1501.0-preview2\lib\MonoAndroid80\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
</Reference>
<Reference Include="YoutubeExplode, Version=4.6.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\YoutubeExplode.4.6.6\lib\netstandard2.0\YoutubeExplode.dll</HintPath>
<Reference Include="YoutubeExplode, Version=4.6.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\YoutubeExplode.4.6.8\lib\netstandard2.0\YoutubeExplode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

25
Opus/Resources/Portable Class/MusicPlayer.cs
View File

@@ -555,7 +555,18 @@ namespace Opus.Resources.Portable_Class
song.IsParsed = false;
return song;
}
catch(YoutubeExplode.Exceptions.VideoUnplayableException ex)
{
Console.WriteLine("&Parse error: " + ex.Message);
MainActivity.instance.Unplayable(ex.Message);
if (MainActivity.instance != null)
MainActivity.instance.FindViewById<ProgressBar>(Resource.Id.ytProgress).Visibility = ViewStates.Gone;
song.IsParsed = false;
if (position != -1)
RemoveFromQueue(position); //Remove the song from the queue since it can't be played.
return song;
}
return song;
}
@@ -886,6 +897,20 @@ namespace Opus.Resources.Portable_Class
public static void RemoveFromQueue(int position)
{
if(CurrentID() == position)
{
if (position > 0)
currentID--;
else if (queue.Count > position - 1)
currentID++;
else
currentID = -1;
Player.instance?.RefreshPlayer();
Player.instance?.Ready();
Queue.instance?.RefreshCurrent();
}
queue.RemoveAt(position);
Home.instance?.NotifyQueueRemoved(position);
Queue.instance?.NotifyItemRemoved(position);

51
Opus/Resources/Resource.Designer.cs generated
View File

@@ -7219,8 +7219,8 @@ namespace Opus
// aapt resource value: 0x7f0d0130
public const int behavior = 2131558704;
// aapt resource value: 0x7f0d014d
public const int beta_available = 2131558733;
// aapt resource value: 0x7f0d014e
public const int beta_available = 2131558734;
// aapt resource value: 0x7f0d0081
public const int bottom_sheet_behavior = 2131558529;
@@ -7231,14 +7231,14 @@ namespace Opus
// aapt resource value: 0x7f0d012a
public const int cancel = 2131558698;
// aapt resource value: 0x7f0d0153
public const int cancelling = 2131558739;
// aapt resource value: 0x7f0d0154
public const int cancelling = 2131558740;
// aapt resource value: 0x7f0d00f3
public const int cant_delete = 2131558643;
// aapt resource value: 0x7f0d0150
public const int cant_play_non_youtube = 2131558736;
// aapt resource value: 0x7f0d0151
public const int cant_play_non_youtube = 2131558737;
// aapt resource value: 0x7f0d00b8
public const int cast = 2131558584;
@@ -7456,6 +7456,9 @@ namespace Opus
// aapt resource value: 0x7f0d0126
public const int completed = 2131558694;
// aapt resource value: 0x7f0d0148
public const int country_blocked = 2131558728;
// aapt resource value: 0x7f0d0112
public const int create_local = 2131558674;
@@ -7510,14 +7513,14 @@ namespace Opus
// aapt resource value: 0x7f0d00f1
public const int downloading = 2131558641;
// aapt resource value: 0x7f0d0151
public const int downloading_notification = 2131558737;
// aapt resource value: 0x7f0d0152
public const int downloading_notification = 2131558738;
// aapt resource value: 0x7f0d0124
public const int downloading_status = 2131558692;
// aapt resource value: 0x7f0d014e
public const int downloading_update = 2131558734;
// aapt resource value: 0x7f0d014f
public const int downloading_update = 2131558735;
// aapt resource value: 0x7f0d00d2
public const int edit_metadata = 2131558610;
@@ -7816,8 +7819,8 @@ namespace Opus
// aapt resource value: 0x7f0d013e
public const int not_log = 2131558718;
// aapt resource value: 0x7f0d0148
public const int not_streamable = 2131558728;
// aapt resource value: 0x7f0d0149
public const int not_streamable = 2131558729;
// aapt resource value: 0x7f0d00bc
public const int nothing = 2131558588;
@@ -7981,8 +7984,8 @@ namespace Opus
// aapt resource value: 0x7f0d00f2
public const int syncing = 2131558642;
// aapt resource value: 0x7f0d0152
public const int tap_details = 2131558738;
// aapt resource value: 0x7f0d0153
public const int tap_details = 2131558739;
// aapt resource value: 0x7f0d0137
public const int theme = 2131558711;
@@ -8017,23 +8020,23 @@ namespace Opus
// aapt resource value: 0x7f0d00bb
public const int up_next = 2131558587;
// aapt resource value: 0x7f0d014c
public const int up_to_date = 2131558732;
// aapt resource value: 0x7f0d014d
public const int up_to_date = 2131558733;
// aapt resource value: 0x7f0d0125
public const int up_to_date_status = 2131558693;
// aapt resource value: 0x7f0d014a
public const int update = 2131558730;
// aapt resource value: 0x7f0d014b
public const int update_message = 2131558731;
public const int update = 2131558731;
// aapt resource value: 0x7f0d0149
public const int update_no_internet = 2131558729;
// aapt resource value: 0x7f0d014c
public const int update_message = 2131558732;
// aapt resource value: 0x7f0d014f
public const int updating = 2131558735;
// aapt resource value: 0x7f0d014a
public const int update_no_internet = 2131558730;
// aapt resource value: 0x7f0d0150
public const int updating = 2131558736;
// aapt resource value: 0x7f0d003e
public const int v7_preference_off = 2131558462;

25
Opus/Resources/values-es/strings.xml
View File

@@ -23,11 +23,14 @@
<string name="minutes">minutos</string>
<string name="hour">hora</string>
<string name="hours">horas</string>
<string name="timer">Sleep timer</string>
<string name="open_youtube">Watch clip on youtube</string>
<!--Queue-->
<string name="playing">Reproducción en curso</string>
<string name="paused">Pausa</string>
<string name="removed_from_queue"> se ha eliminado de la cola.</string>
<string name="save_as_playlist">Save queue as playlist</string>
<!--Autoplay-->
<string name="autoplay">Lectura automática</string>
@@ -98,21 +101,16 @@
<string name="element">musica</string>
<string name="elements">musicas</string>
<string name="playlist_empty">Esta playlist esta vacia.</string>
<string name="remove_from_playlist">¿Eliminar %1$s de la playlist ?</string>
<!--%1$s will be replaced by the song name-->
<string name="remove_from_playlist">¿Eliminar %1$s de la playlist ?</string> <!--%1$s will be replaced by the song name-->
<string name="removed_from_playlist"> ha sido eliminado de la playlist.</string>
<string name="playlist_already_saved">Esta playlist ya ha sido añadida a su biblioteca.</string>
<string name="playlist_not_found">Ninguna playlist existe con este id o este url.</string>
<string name="playlist_add_song_not_found">la musica no se encontro en youtube, impossible de añadirla a una playlist youtube.</string>
<string name="delete_playlist">¿Quiere eliminar de la playlist \"%1$s\" ?</string>
<!--%1$s will be replaced by the playlist name-->
<string name="delete_playlist">¿Quiere eliminar de la playlist \"%1$s\" ?</string> <!--%1$s will be replaced by the playlist name-->
<string name="rename_playlist">Elija un nuevo nombre para esta playlist</string>
<string name="stop_syncing">¿Quiere parar de sincronizar la playlist \"%1s$\" ?</string>
<!--%1$s will be replaced by the playlist name-->
<string name="unfork_playlist">¿Quiere eliminar la playlist \"%1$s"\" de su biblioteca ?</string>
<!--%1$s will be replaced by the playlist name-->
<string name="add_playlist_msg">escribir la url o la id de la playlist que desea añadir</string>
<!--%1$s will be replaced by the playlist name-->
<string name="stop_syncing">¿Quiere parar de sincronizar la playlist \"%1s$\" ?</string> <!--%1$s will be replaced by the playlist name-->
<string name="unfork_playlist">¿Quiere eliminar la playlist \"%1$s"\" de su biblioteca ?</string> <!--%1$s will be replaced by the playlist name-->
<string name="add_playlist_msg">escribir la url o la id de la playlist que desea añadir</string> <!--%1$s will be replaced by the playlist name-->
<!--Add song to playlist-->
<string name="create_playlist">Crear una nueva playlist</string>
@@ -186,11 +184,10 @@
<string name="youtube_endpoint">El algoritmo youtube a cambiado, la aplicación no puede leer este video.Espere la proxima actualización.</string>
<string name="timout">Timout, compruebe su conexión internet.</string>
<string name="unknow">Un error desconozido est sucedió.</string>
<string name="not_streamable"> no pude ser reproducido, el audio no está disponible.</string>
<!--//A song title will be placed before this sentence-->
<string name="country_blocked">This song is not available in your country.</string>
<string name="not_streamable"> no pude ser reproducido, el audio no está disponible.</string> <!--A song title will be placed before this sentence-->
<string name="update_no_internet">No está conectado a internet, imposible de comprobar si existen actualizaciones.</string>
<string name="update">La versión %1$s está disponible</string>
<!--//%1$s will be replaced with the version number-->
<string name="update">La versión %1$s está disponible</string> <!--%1$s will be replaced with the version number-->
<string name="update_message">¿Una actualización está disponible, desea instalarla ahora?</string>
<string name="up_to_date">Ninguna Actualización disponible.</string>
<string name="beta_available">Une versión beta está disponible.</string>

6
Opus/Resources/values-fr/strings.xml
View File

@@ -30,7 +30,8 @@
<string name="playing">Lecture en cours</string>
<string name="paused">En pause</string>
<string name="removed_from_queue"> a été enlevé de la liste de lecture.</string>
<string name="save_as_playlist">Sauvegarder la liste de lecture dans une playlist</string>
<!--Autoplay-->
<string name="autoplay">Lecture automatique</string>
<string name="autoplay_desc">Ajoute automatiquement des musiques similaires</string>
@@ -65,8 +66,6 @@
<string name="more">PLUS</string>
<string name="queue">Liste de lecture</string>
<string name="featured">Mis en avant</string>
<string name="music_genres">Genres musicaux</string>
<string name="recommendation_explanation">utilisé pour vos recommandations</string>
<!--Browse tab-->
<string name="songs">Titres</string>
@@ -185,6 +184,7 @@
<string name="youtube_endpoint">L\'algorithme youtube a changé, l\'application ne peut plus lire cette vidéo. Attendez la prochaine mise a jour.</string>
<string name="timout">Timout, vérifier votre connection internet.</string>
<string name="unknow">Une erreur inconnue est survenue.</string>
<string name="country_blocked">Cette musique n'est pas disponible dans votre pays.</string>
<string name="not_streamable"> ne peut pas être lu, l\'audio n\'est pas disponible.</string> <!--//A song title will be placed before this sentence-->
<string name="update_no_internet">Vous n\'êtes pas connecté a internet, impossible de verifier si des mises à jour existent.</string>
<string name="update">La version %1$s est disponible</string> <!--//%1$s will be replaced with the version number-->

5
Opus/Resources/values/strings.xml
View File

@@ -66,8 +66,6 @@
<string name="more">MORE</string>
<string name="queue">Queue</string>
<string name="featured">Featured</string>
<string name="music_genres">Music Genres</string>
<string name="recommendation_explanation">used for your recommendation</string>
<!--Browse tab-->
<string name="songs">Songs</string>
@@ -186,6 +184,7 @@
<string name="youtube_endpoint">The way youtube play video has changed, the app can\'t play this video now. Wait for the next update.</string>
<string name="timout">Timout, check if you\'re still connected to internet.</string>
<string name="unknow">An unknown error has occured.</string>
<string name="country_blocked">This song is not available in your country.</string>
<string name="not_streamable"> can\'t be played. No audio streams are availables.</string> <!--A song title will be placed before this sentence-->
<string name="update_no_internet">You are not connected to internet, can\'t check for updates.</string>
<string name="update">The version %1$s is available</string> <!--//%1$s will be replaced with the version number-->
@@ -199,4 +198,4 @@
<string name="downloading_notification">Downloading:</string>
<string name="tap_details">Tap for more details</string>
<string name="cancelling">Cancelling...</string>
</resources>
</resources>

4
Opus/app.config
View File

@@ -16,11 +16,11 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Apis.Core" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.38.0.0" newVersion="1.38.0.0" />
<bindingRedirect oldVersion="0.0.0.0-1.38.2.0" newVersion="1.38.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Apis" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.38.0.0" newVersion="1.38.0.0" />
<bindingRedirect oldVersion="0.0.0.0-1.38.2.0" newVersion="1.38.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="PInvoke.BCrypt" publicKeyToken="9e300f9f87f04a7a" culture="neutral" />

10
Opus/packages.config
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AngleSharp" version="0.9.11" targetFramework="monoandroid90" />
<package id="Google.Apis" version="1.38.0" targetFramework="monoandroid90" />
<package id="Google.Apis.Auth" version="1.38.0" targetFramework="monoandroid90" />
<package id="Google.Apis.Core" version="1.38.0" targetFramework="monoandroid90" />
<package id="Google.Apis" version="1.38.2" targetFramework="monoandroid90" />
<package id="Google.Apis.Auth" version="1.38.2" targetFramework="monoandroid90" />
<package id="Google.Apis.Core" version="1.38.2" targetFramework="monoandroid90" />
<package id="Google.Apis.YouTube.v3" version="1.38.0.1488" targetFramework="monoandroid90" />
<package id="Karamunting.Android.AnderWeb.DiscreteSeekBar" version="1.0.1.1" targetFramework="monoandroid81" />
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="monoandroid81" />
@@ -69,7 +69,7 @@
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid81" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid81" />
<package id="TagLib.Portable" version="1.0.4" targetFramework="monoandroid81" />
<package id="Validation" version="2.4.18" targetFramework="monoandroid81" />
<package id="Validation" version="2.4.22" targetFramework="monoandroid90" />
<package id="Xam.Plugins.Android.ExoPlayer" version="2.8.8" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.Core" version="2.8.8" targetFramework="monoandroid90" />
<package id="Xam.Plugins.Android.ExoPlayer.Dash" version="2.8.8" targetFramework="monoandroid81" />
@@ -125,5 +125,5 @@
<package id="Xamarin.GooglePlayServices.Cast.Framework" version="70.1501.0-preview2" targetFramework="monoandroid81" />
<package id="Xamarin.GooglePlayServices.Flags" version="70.1501.0-preview2" targetFramework="monoandroid81" />
<package id="Xamarin.GooglePlayServices.Tasks" version="70.1501.0-preview2" targetFramework="monoandroid81" />
<package id="YoutubeExplode" version="4.6.6" targetFramework="monoandroid90" />
<package id="YoutubeExplode" version="4.6.8" targetFramework="monoandroid90" />
</packages>