norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

implement group-album-by-folder

Browse Source
This commit is contained in:
Adrian Ulrich 2017-02-04 10:05:24 +01:00
parent 90b48bdc8c
commit 7183a85869
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ch/blinkenlights/android/medialibrary/MediaScanner.java
View File

@ -385,6 +385,7 @@ public class MediaScanner implements Handler.Callback {
* @return true if we modified the database * @return true if we modified the database
*/ */
private boolean rpcInspectFile(File file) { private boolean rpcInspectFile(File file) {
MediaLibrary.Preferences prefs = MediaLibrary.getPreferences(mContext);
String path = file.getAbsolutePath(); String path = file.getAbsolutePath();
long songId = MediaLibrary.hash63(path); long songId = MediaLibrary.hash63(path);
@ -437,8 +438,13 @@ public class MediaScanner implements Handler.Callback {
if (discNumber == null) if (discNumber == null)
discNumber = "1"; // untagged, but most likely '1' - this prevents annoying sorting issues with partially tagged files discNumber = "1"; // untagged, but most likely '1' - this prevents annoying sorting issues with partially tagged files
long albumId = MediaLibrary.hash63(album);
long artistId = MediaLibrary.hash63(artist); long artistId = MediaLibrary.hash63(artist);
long albumId = MediaLibrary.hash63(album);
// Overwrite albumId with a hash that included the parent dir if set in preferences
if (prefs.groupAlbumsByFolder) {
albumId = MediaLibrary.hash63(album + "\n" + file.getParent());
}
ContentValues v = new ContentValues(); ContentValues v = new ContentValues();
v.put(MediaLibrary.SongColumns._ID, songId); v.put(MediaLibrary.SongColumns._ID, songId);