mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs around download tracks with titles that contain path

Browse Source 
separators, or tracks without metadata.
This commit is contained in:
casey langen 2020-05-10 11:34:00 -07:00
parent 0703bf4134
commit 9ff959536d
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/musikdroid/app/build.gradle
View File

@ -61,8 +61,8 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.google.firebase:firebase-analytics:17.4.0'
implementation 'com.google.firebase:firebase-core:17.4.0'
implementation 'com.google.firebase:firebase-analytics:17.4.1'
implementation 'com.google.firebase:firebase-core:17.4.1'
implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
implementation(name:'android-taskrunner-0.5', ext:'aar')

34
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/download/activity/TrackDownloadActivity.kt
View File

@ -34,6 +34,7 @@ class TrackDownloadActivity: BaseActivity() {
private val httpClient = createHttpClient(Application.instance)
private val mutex = Object()
private var pendingCall: Call? = null
private var outputFilename: String = ""
private lateinit var spinner: MaterialProgressBar
private lateinit var progress: MaterialProgressBar
private val handler = Handler()
@ -141,6 +142,7 @@ class TrackDownloadActivity: BaseActivity() {
}
}
outputFilename = getOutputFilename(response)
if (it.byteStream().toFile(outputFilename, onBytesReceived)) {
MediaScannerConnection.scanFile(
this@TrackDownloadActivity,
@ -202,16 +204,6 @@ class TrackDownloadActivity: BaseActivity() {
}
}
private val outputFilename: String
get() {
val dir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
val title = intent.getStringExtra(EXTRA_TRACK_TITLE)
val externalId = intent.getStringExtra(EXTRA_EXTERNAL_ID)
var extension = intent.extras?.getString(EXTRA_EXTENSION, "mp3")
extension = if (extension.isNullOrBlank()) "mp3" else extension
return "$dir/musikdroid/$title-$externalId.$extension"
}
private val trackUrl: Uri
get() {
val ssl = prefs.getBoolean(Prefs.Key.SSL_ENABLED, Prefs.Default.SSL_ENABLED)
@ -227,6 +219,27 @@ class TrackDownloadActivity: BaseActivity() {
.appendPath(intent.getStringExtra(EXTRA_EXTERNAL_ID)).build()
}
private fun getOutputFilename(response: Response): String {
val dir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
val externalId = intent.getStringExtra(EXTRA_EXTERNAL_ID)
val rawTitle = intent.getStringExtra(EXTRA_TRACK_TITLE)
var filename = "$rawTitle-$externalId"
/* in some cases the server may request a filename override, so we try to honor that
here if possible */
val headers = response.headers().values(HTTP_HEADER_FILENAME_OVERRIDE)
if (headers.isNotEmpty()) {
filename = headers[0]
}
/* strip standard path delimiters */
filename = filename.replace("/", "_").replace("\\", "_")
var extension = intent.extras?.getString(EXTRA_EXTENSION, "mp3")
extension = if (extension.isNullOrBlank()) "mp3" else extension
return "$dir/musikdroid/$filename.$extension"
}
class ConfirmCancelDialog: DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
AlertDialog.Builder(activity!!)
@ -274,6 +287,7 @@ class TrackDownloadActivity: BaseActivity() {
private const val EXTRA_EXTERNAL_ID = "extra_external_id"
private const val EXTRA_TRACK_TITLE = "extra_track_title"
private const val EXTRA_EXTENSION = "extra_extension"
private const val HTTP_HEADER_FILENAME_OVERRIDE = "X-musikcube-Filename-Override"
fun getStartIntent(activity: AppCompatActivity, track: ITrack): Intent {
return Intent(activity, TrackDownloadActivity::class.java).apply {

10
src/plugins/server/HttpServer.cpp
View File

@ -433,8 +433,10 @@ int HttpServer::HandleAudioTrackRequest(
}
if (track) {
std::string duration = GetMetadataString(track, key::duration);
std::string filename = GetMetadataString(track, key::filename);
const std::string duration = GetMetadataString(track, key::duration);
const std::string filename = GetMetadataString(track, key::filename);
const std::string title = GetMetadataString(track, key::title, "");
const std::string externalId = GetMetadataString(track, key::external_id, "");
track->Release();
@ -534,6 +536,10 @@ int HttpServer::HandleAudioTrackRequest(
if (response) {
if (!isOnDemandTranscoder) {
MHD_add_response_header(response, "Accept-Ranges", "bytes");
if (boost::filesystem::exists(title)) {
MHD_add_response_header(response, "X-musikcube-Filename-Override", externalId.c_str());
}
}
else {
MHD_add_response_header(response, "X-musikcube-Estimated-Content-Length", "true");