Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-08 15:58:56 +01:00
Code Issues Releases Wiki Activity

Merge pull request #414 from tzugen/mediastore

Browse Source 
Mediastore to Kotlin, fix #383
This commit is contained in:
Nite 2021-04-17 11:43:36 +02:00 committed by GitHub
commit c16d6b5181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 114 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
View File

@ -409,20 +409,10 @@ public class DownloadFile
{
Util.renameFile(partialFile, saveFile);
mediaStoreService.saveInMediaStore(DownloadFile.this);
if (Util.getShouldScanMedia(context))
{
Util.scanMedia(context, saveFile);
}
}
else
{
Util.renameFile(partialFile, completeFile);
if (Util.getShouldScanMedia(context))
{
Util.scanMedia(context, completeFile);
}
}
}
}

4
ultrasonic/src/main/java/org/moire/ultrasonic/service/Downloader.java
View File

@ -188,10 +188,6 @@ public class Downloader
DownloadFile downloadFile = backgroundDownloadList.get(i);
if (downloadFile.isWorkDone() && (!downloadFile.shouldSave() || downloadFile.isSaved()))
{
if (Util.getShouldScanMedia(context))
{
Util.scanMedia(context, downloadFile.getCompleteFile());
}
// Don't need to keep list like active song list
backgroundDownloadList.remove(i);

125
ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaStoreService.java
View File

@ -1,125 +0,0 @@
/*
This file is part of Subsonic.
Subsonic is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Subsonic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
Copyright 2009 (C) Sindre Mehus
*/
package org.moire.ultrasonic.service;
import java.io.File;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.provider.MediaStore;
import timber.log.Timber;
import org.moire.ultrasonic.domain.MusicDirectory;
import org.moire.ultrasonic.util.FileUtil;
/**
* @author Sindre Mehus
*/
public class MediaStoreService
{
private static final Uri ALBUM_ART_URI = Uri.parse("content://media/external/audio/albumart");
private final Context context;
public MediaStoreService(Context context)
{
this.context = context;
}
public void saveInMediaStore(DownloadFile downloadFile)
{
MusicDirectory.Entry song = downloadFile.getSong();
File songFile = downloadFile.getCompleteFile();
// Delete existing row in case the song has been downloaded before.
deleteFromMediaStore(downloadFile);
ContentResolver contentResolver = context.getContentResolver();
ContentValues values = new ContentValues();
values.put(MediaStore.MediaColumns.TITLE, song.getTitle());
values.put(MediaStore.Audio.AudioColumns.ARTIST, song.getArtist());
values.put(MediaStore.Audio.AudioColumns.ALBUM, song.getAlbum());
values.put(MediaStore.Audio.AudioColumns.TRACK, song.getTrack());
values.put(MediaStore.Audio.AudioColumns.YEAR, song.getYear());
values.put(MediaStore.MediaColumns.DATA, songFile.getAbsolutePath());
values.put(MediaStore.MediaColumns.MIME_TYPE, song.getContentType());
values.put(MediaStore.Audio.AudioColumns.IS_MUSIC, 1);
Uri uri = contentResolver.insert(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, values);
if (uri != null)
{
// Look up album, and add cover art if found.
Cursor cursor = contentResolver.query(uri, new String[]{MediaStore.Audio.AudioColumns.ALBUM_ID}, null, null, null);
if (cursor != null && cursor.moveToFirst())
{
int albumId = cursor.getInt(0);
insertAlbumArt(albumId, downloadFile);
cursor.close();
}
}
}
public void deleteFromMediaStore(DownloadFile downloadFile)
{
ContentResolver contentResolver = context.getContentResolver();
MusicDirectory.Entry song = downloadFile.getSong();
File file = downloadFile.getCompleteFile();
int n = contentResolver.delete(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, MediaStore.Audio.AudioColumns.TITLE_KEY + "=? AND " +
MediaStore.MediaColumns.DATA + "=?", new String[]{MediaStore.Audio.keyFor(song.getTitle()), file.getAbsolutePath()});
if (n > 0)
{
Timber.i("Deleting media store row for %s", song);
}
}
private void insertAlbumArt(int albumId, DownloadFile downloadFile)
{
ContentResolver contentResolver = context.getContentResolver();
Uri uri = Uri.withAppendedPath(ALBUM_ART_URI, String.valueOf(albumId));
if (uri == null)
{
return;
}
Cursor cursor = contentResolver.query(uri, null, null, null, null);
if (cursor != null && !cursor.moveToFirst())
{
// No album art found, add it.
File albumArtFile = FileUtil.getAlbumArtFile(context, downloadFile.getSong());
if (albumArtFile.exists())
{
ContentValues values = new ContentValues();
values.put(MediaStore.Audio.AlbumColumns.ALBUM_ID, albumId);
values.put(MediaStore.MediaColumns.DATA, albumArtFile.getPath());
contentResolver.insert(ALBUM_ART_URI, values);
Timber.i("Added album art: %s", albumArtFile);
}
cursor.close();
}
}
}

1
ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java
View File

@ -125,7 +125,6 @@ public final class Constants
public static final String PREFERENCES_KEY_DEFAULT_SHARE_GREETING = "sharingDefaultGreeting";
public static final String PREFERENCES_KEY_DEFAULT_SHARE_EXPIRATION = "sharingDefaultExpiration";
public static final String PREFERENCES_KEY_SHOW_ALL_SONGS_BY_ARTIST = "showAllSongsByArtist";
public static final String PREFERENCES_KEY_SCAN_MEDIA = "scanMedia";
public static final String PREFERENCES_KEY_IMAGE_LOADER_CONCURRENCY = "imageLoaderConcurrency";
public static final String PREFERENCES_KEY_FF_IMAGE_LOADER = "ff_new_image_loader";
public static final String PREFERENCES_KEY_USE_FIVE_STAR_RATING = "use_five_star_rating";

12
ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java
View File

@ -1394,18 +1394,6 @@ public class Util
return preferences.getBoolean(Constants.PREFERENCES_KEY_SHOW_ALL_SONGS_BY_ARTIST, false);
}
public static boolean getShouldScanMedia(Context context)
{
SharedPreferences preferences = getPreferences(context);
return preferences.getBoolean(Constants.PREFERENCES_KEY_SCAN_MEDIA, false);
}
public static void scanMedia(Context context, File file)
{
Uri uri = Uri.fromFile(file);
Intent scanFileIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri);
context.sendBroadcast(scanFileIntent);
}
public static int getImageLoaderConcurrency(Context context)
{

114
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaStoreService.kt Normal file
View File

@ -0,0 +1,114 @@
/*
* MediaStoreService.kt
* Copyright (C) 2009-2021 Ultrasonic developers
*
* Distributed under terms of the GNU GPLv3 license.
*/
package org.moire.ultrasonic.service
import android.content.ContentValues
import android.content.Context
import android.net.Uri
import android.os.Build
import android.provider.MediaStore
import org.moire.ultrasonic.util.FileUtil
import timber.log.Timber
/**
* By adding UltraSonics media files to the Android MediaStore
* they become available in the stock music apps
*
* @author Sindre Mehus
*/
class MediaStoreService(private val context: Context) {
// Find the audio collection on the primary external storage device.
val collection: Uri by lazy {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
MediaStore.Audio.Media.getContentUri(
MediaStore.VOLUME_EXTERNAL_PRIMARY
)
} else {
MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
}
}
val albumArtCollection: Uri by lazy {
// This path is not well documented
// https://android.googlesource.com/platform/packages/providers/
// MediaProvider/+/refs/tags/android-platform-11.0.0_r5/
// src/com/android/providers/media/MediaProvider.java#7596
Uri.parse(collection.toString().replaceAfterLast("/", "albumart"))
}
fun saveInMediaStore(downloadFile: DownloadFile) {
val song = downloadFile.song
val songFile = downloadFile.completeFile
// Delete existing row in case the song has been downloaded before.
deleteFromMediaStore(downloadFile)
val contentResolver = context.contentResolver
val values = ContentValues()
values.put(MediaStore.MediaColumns.TITLE, song.title)
values.put(MediaStore.Audio.AudioColumns.ARTIST, song.artist)
values.put(MediaStore.Audio.AudioColumns.ALBUM, song.album)
values.put(MediaStore.Audio.AudioColumns.TRACK, song.track)
values.put(MediaStore.Audio.AudioColumns.YEAR, song.year)
values.put(MediaStore.MediaColumns.DATA, songFile.absolutePath)
values.put(MediaStore.MediaColumns.MIME_TYPE, song.contentType)
values.put(MediaStore.Audio.AudioColumns.IS_MUSIC, 1)
val uri = contentResolver.insert(collection, values)
if (uri != null) {
// Look up album, and add cover art if found.
val cursor = contentResolver.query(
uri, arrayOf(MediaStore.Audio.AudioColumns.ALBUM_ID),
null, null, null
)
if (cursor != null && cursor.moveToFirst()) {
val albumId = cursor.getInt(0)
insertAlbumArt(albumId, downloadFile)
cursor.close()
}
}
}
fun deleteFromMediaStore(downloadFile: DownloadFile) {
val contentResolver = context.contentResolver
val song = downloadFile.song
val file = downloadFile.completeFile
val selection = MediaStore.Audio.AudioColumns.TITLE_KEY + "=? AND " +
MediaStore.MediaColumns.DATA + "=?"
val selectionArgs = arrayOf(MediaStore.Audio.keyFor(song.title), file.absolutePath)
val res = contentResolver.delete(collection, selection, selectionArgs)
if (res > 0) {
Timber.i("Deleting media store row for %s", song)
}
}
private fun insertAlbumArt(albumId: Int, downloadFile: DownloadFile) {
val contentResolver = context.contentResolver
val uri = Uri.withAppendedPath(albumArtCollection, albumId.toString())
?: return
val cursor = contentResolver.query(uri, null, null, null, null)
if (cursor != null && !cursor.moveToFirst()) {
// No album art found, add it.
val albumArtFile = FileUtil.getAlbumArtFile(context, downloadFile.song)
if (albumArtFile.exists()) {
val values = ContentValues()
values.put(MediaStore.Audio.AlbumColumns.ALBUM_ID, albumId)
// values.put(MediaStore.MediaColumns.DATA, albumArtFile.path)
contentResolver.insert(albumArtCollection, values)
Timber.i("Added album art: %s", albumArtFile)
}
cursor.close()
}
}
}

2
ultrasonic/src/main/res/values-cs/strings.xml
View File

@ -382,8 +382,6 @@
<string name="settings.show_all_songs_by_artist">Zobrazit všechny skladby umělce</string>
<string name="settings.show_all_songs_by_artist_summary">Přidat nový zápis v náhledu umělců pro přístup ke všem skladbám umělce</string>
<string name="download.menu_show_artist">Zobrazit umělce</string>
<string name="settings.scan_media">Skenovat média po stažení</string>
<string name="settings.scan_media_summary">Automaticky skenovat médi po jejich stažení</string>
<string name="settings.image_loader_concurrency">Počet vláken stahování obrázků</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-de/strings.xml
View File

@ -379,8 +379,6 @@
<string name="settings.show_all_songs_by_artist">Alle Titel nach Künstler sortieren</string>
<string name="settings.show_all_songs_by_artist_summary">Einen neuen Eintrag in der Künstleransicht hinzufügen, um auf alle Lieder eines Künstlers zuzugreifen</string>
<string name="download.menu_show_artist">Künstler zeigen</string>
<string name="settings.scan_media">Medien nach Download durchsuchen</string>
<string name="settings.scan_media_summary">Medien nach dem Herunterladen automatisch durchsuchen</string>
<string name="settings.image_loader_concurrency">Paralleles laden von Bildern</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-es/strings.xml
View File

@ -384,8 +384,6 @@
<string name="settings.show_all_songs_by_artist">Mostrar todas las canciones por artista</string>
<string name="settings.show_all_songs_by_artist_summary">Añadir nueva entrada en la vista de artista para acceder a todas las canciones de un artista</string>
<string name="download.menu_show_artist">Mostrar artista</string>
<string name="settings.scan_media">Escanear medio después de descargar</string>
<string name="settings.scan_media_summary">Escanear automáticamente el medio después de descargar</string>
<string name="settings.image_loader_concurrency">Concurrencia del cargador de imágenes</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-fr/strings.xml
View File

@ -384,8 +384,6 @@
<string name="settings.show_all_songs_by_artist">Voir toutes les titres par artiste</string>
<string name="settings.show_all_songs_by_artist_summary">Ajouter une nouvelle entrée de l\'affichage de l\'artiste pour accéder à toutes les titres pour un artiste</string>
<string name="download.menu_show_artist">Afficher l\'artiste</string>
<string name="settings.scan_media">Scan Media After Download</string>
<string name="settings.scan_media_summary">Balayer automatiquement les médias après téléchargement</string>
<string name="settings.image_loader_concurrency">Chargements d’images simultanés</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-hu/strings.xml
View File

@ -383,8 +383,6 @@
<string name="settings.show_all_songs_by_artist">Az előadó összes dalának megjelenítése</string>
<string name="settings.show_all_songs_by_artist_summary">Új bejegyzés hozzáadása az előadóhoz, az előadó összes dalának eléréséhez.</string>
<string name="download.menu_show_artist">Ugrás az előadóhoz</string>
<string name="settings.scan_media">Scan Media After Download</string>
<string name="settings.scan_media_summary">Automatically scan media after download</string>
<string name="settings.image_loader_concurrency">Image Loader Concurrency</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-nl/strings.xml
View File

@ -384,8 +384,6 @@
<string name="settings.show_all_songs_by_artist">Alle nummers van artiest tonen</string>
<string name="settings.show_all_songs_by_artist_summary">Item toevoegen in artiestweergave om alle nummers van een artiest te bekijken</string>
<string name="download.menu_show_artist">Artiest tonen</string>
<string name="settings.scan_media">Media scannen na downloaden</string>
<string name="settings.scan_media_summary">Media automatisch scannen na downloaden</string>
<string name="settings.image_loader_concurrency">Aantal tegelijkertijd te laden afbeeldingen</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-pl/strings.xml
View File

@ -379,8 +379,6 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników
<string name="settings.show_all_songs_by_artist">Wyświetlaj wszystkie utwory artysty</string>
<string name="settings.show_all_songs_by_artist_summary">Dodaje nową pozycję w widoku artysty z wszystkimi jego utworami</string>
<string name="download.menu_show_artist">Wyświetlaj artystę</string>
<string name="settings.scan_media">Skanuj media po pobraniu</string>
<string name="settings.scan_media_summary">Automatycznie uruchamia skanowanie mediów po pobraniu</string>
<string name="settings.image_loader_concurrency">Ilość jednocześnie ładowanych obrazów</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-pt-rBR/strings.xml
View File

@ -384,8 +384,6 @@
<string name="settings.show_all_songs_by_artist">Mostrar Todas as Músicas por Artista</string>
<string name="settings.show_all_songs_by_artist_summary">Adicionar nova entrada em artista para acessar todas as músicas do artista</string>
<string name="download.menu_show_artist">Mostrar Artista</string>
<string name="settings.scan_media">Escanear Música no Download</string>
<string name="settings.scan_media_summary">Automaticamente escaneia música após o download</string>
<string name="settings.image_loader_concurrency">Concorrência ao Carregar Imagens</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-pt/strings.xml
View File

@ -379,8 +379,6 @@
<string name="settings.show_all_songs_by_artist">Todas as Músicas do Artista</string>
<string name="settings.show_all_songs_by_artist_summary">Adicionar nova entrada em artista para ver todas as músicas do artista</string>
<string name="download.menu_show_artist">Mostrar Artista</string>
<string name="settings.scan_media">Varrer Música no Download</string>
<string name="settings.scan_media_summary">Automaticamente varre música após baixar</string>
<string name="settings.image_loader_concurrency">Concorrência ao Carregar Imagens</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-ru/strings.xml
View File

@ -371,8 +371,6 @@
<string name="settings.show_all_songs_by_artist">Показать все треки исполнителя</string>
<string name="settings.show_all_songs_by_artist_summary">Добавить новую запись в представлении исполнителя, чтобы получить доступ ко всем песням для исполнителя</string>
<string name="download.menu_show_artist">Показать исполнителей</string>
<string name="settings.scan_media">Сканировать носители после загрузки</string>
<string name="settings.scan_media_summary">Автомат</string>
<string name="settings.image_loader_concurrency">Загрузчик совпадающих изображений</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values/strings.xml
View File

@ -386,8 +386,6 @@
<string name="settings.show_all_songs_by_artist">Show All Songs By Artist</string>
<string name="settings.show_all_songs_by_artist_summary">Add new entry in artist view to access all songs for an artist</string>
<string name="download.menu_show_artist">Show Artist</string>
<string name="settings.scan_media">Scan Media After Download</string>
<string name="settings.scan_media_summary">Automatically scan media after download</string>
<string name="settings.image_loader_concurrency">Image Loader Concurrency</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

6
ultrasonic/src/main/res/xml/settings.xml
View File

@ -118,12 +118,6 @@
a:summary="@string/settings.clear_bookmark_summary"
a:title="@string/settings.clear_bookmark"
app:iconSpaceReserved="false"/>
<CheckBoxPreference
a:defaultValue="false"
a:key="scanMedia"
a:summary="@string/settings.scan_media_summary"
a:title="@string/settings.scan_media"
app:iconSpaceReserved="false"/>
<ListPreference
a:defaultValue="5000"
a:entries="@array/bufferLengthNames"