SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issues with downloading files without titles (in artists, albums, movie titles or TV Show titles)

This commit is contained in:
Synced Synapse 2016-10-11 20:05:23 +01:00
parent 034b969f3b
commit 83ed7b3cb6
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/xbmc/kore/ui/ArtistOverviewFragment.java
View File

@ -338,6 +338,11 @@ public class ArtistOverviewFragment extends AbstractDetailsFragment
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
if (songInfoList.size() == 0) {
Toast.makeText(getActivity(), R.string.no_songs_to_download, Toast.LENGTH_LONG);
return;
}
// Check if the directory exists and whether to overwrite it // Check if the directory exists and whether to overwrite it
File file = new File(songInfoList.get(0).getAbsoluteDirectoryPath()); File file = new File(songInfoList.get(0).getAbsoluteDirectoryPath());
if (file.exists()) { if (file.exists()) {

14
app/src/main/java/org/xbmc/kore/utils/FileDownloadHelper.java
View File

@ -45,6 +45,10 @@ public class FileDownloadHelper {
public static final int OVERWRITE_FILES = 0, public static final int OVERWRITE_FILES = 0,
DOWNLOAD_WITH_NEW_NAME = 1; DOWNLOAD_WITH_NEW_NAME = 1;
public static final String NO_ARTIST_DIR = "No artist",
NO_MOVIE_TITLE_DIR = "No title",
NO_TVSHOW_TITLE_DIR = "No title";
public static abstract class MediaInfo { public static abstract class MediaInfo {
public final String fileName; public final String fileName;
@ -120,8 +124,8 @@ public class FileDownloadHelper {
} }
public String getRelativeDirectoryPath() { public String getRelativeDirectoryPath() {
return (TextUtils.isEmpty(album) || TextUtils.isEmpty(artist)) ? return (TextUtils.isEmpty(artist) ? NO_ARTIST_DIR :
null : artist + "/" + album; TextUtils.isEmpty(album) ? artist : artist + "/" + album);
} }
public String getDownloadFileName() { public String getDownloadFileName() {
@ -153,7 +157,7 @@ public class FileDownloadHelper {
public String getRelativeDirectoryPath() { public String getRelativeDirectoryPath() {
return (TextUtils.isEmpty(title)) ? return (TextUtils.isEmpty(title)) ?
null : title; NO_MOVIE_TITLE_DIR : title;
} }
public String getDownloadFileName() { public String getDownloadFileName() {
@ -193,10 +197,10 @@ public class FileDownloadHelper {
public String getRelativeDirectoryPath() { public String getRelativeDirectoryPath() {
if (season > 0) { if (season > 0) {
return (TextUtils.isEmpty(tvshowTitle)) ? return (TextUtils.isEmpty(tvshowTitle)) ?
null : tvshowTitle + "/Season" + String.valueOf(season); NO_TVSHOW_TITLE_DIR : tvshowTitle + "/Season" + String.valueOf(season);
} else { } else {
return (TextUtils.isEmpty(tvshowTitle)) ? return (TextUtils.isEmpty(tvshowTitle)) ?
null : tvshowTitle; NO_TVSHOW_TITLE_DIR : tvshowTitle;
} }
} }

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

@ -387,4 +387,6 @@
<string name="read_phone_state_permission_denied">Permission denied. Won\'t be able to pause playback during calls.</string> <string name="read_phone_state_permission_denied">Permission denied. Won\'t be able to pause playback during calls.</string>
<string name="write_storage_permission_denied">Permission denied. Won\'t be able to download files.</string> <string name="write_storage_permission_denied">Permission denied. Won\'t be able to download files.</string>
<string name="no_songs_to_download">No songs to download</string>
</resources> </resources>