Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ class IONFLTRController internal constructor(
inputsValidator.validateTransferInputs(options.url, options.filePath)

// Create parent directories if needed
val targetFile = File(options.filePath)
val normalizedFilePath = fileHelper.normalizeFilePath(options.filePath)
val targetFile = File(normalizedFilePath)
fileHelper.createParentDirectories(targetFile)

// Setup connection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,29 @@ internal class IONFLTRFileHelper(val contentResolver: ContentResolver) {
FileToUploadInfo(fileName, fileSize, inputStream)
}
} else {
val filePathWithoutPrefix = filePath.removePrefix("file://")
val fileObject = File(filePathWithoutPrefix)
val cleanFilePath = normalizeFilePath(filePath)
val fileObject = File(cleanFilePath)
if (!fileObject.exists()) {
throw IONFLTRException.FileDoesNotExist()
}
FileToUploadInfo(fileObject.name, fileObject.length(), FileInputStream(fileObject))
}
}

/**
* Normalizes a file path by removing URI prefixes like "file://", "file:/", etc.
*
* @param filePath The file path that might contain URI prefixes
* @return Cleaned file path without URI prefixes
*/
fun normalizeFilePath(filePath: String): String {
return when {
filePath.startsWith("file://") -> filePath.removePrefix("file://")
filePath.startsWith("file:/") -> filePath.removePrefix("file:/")
filePath.startsWith("file:") -> filePath.removePrefix("file:")
else -> filePath
}
}

/**
* Gets a MIME type based on the provided file path
Expand All @@ -51,8 +65,10 @@ internal class IONFLTRFileHelper(val contentResolver: ContentResolver) {
* @return The MIME type or null if it was unable to determine
*/
fun getMimeType(filePath: String?): String? =
MimeTypeMap.getFileExtensionFromUrl(filePath)?.let { extension ->
MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
filePath?.let { normalizeFilePath(it) }?.let { normalizedPath ->
MimeTypeMap.getFileExtensionFromUrl(normalizedPath)?.let { extension ->
MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
}
}

/**
Expand Down