godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #90146 from melquiadess/extract-command-line-file-parsing-and-add-unit-tests

Browse Source 
Android: Extract parsing command line file to a separate class + add unit tests
This commit is contained in:
Rémi Verschelde
2024-04-04 14:37:28 +02:00
parent 61b56f6019 839600b744
commit c7606354c6
4 changed files with 203 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
platform/android/java/lib/src/org/godotengine/godot/Godot.kt
View File

@@ -56,6 +56,7 @@ import org.godotengine.godot.io.directory.DirectoryAccessHandler
import org.godotengine.godot.io.file.FileAccessHandler
import org.godotengine.godot.plugin.GodotPluginRegistry
import org.godotengine.godot.tts.GodotTTS
import org.godotengine.godot.utils.CommandLineFileParser
import org.godotengine.godot.utils.GodotNetUtils
import org.godotengine.godot.utils.PermissionsUtil
import org.godotengine.godot.utils.PermissionsUtil.requestPermission
@@ -68,7 +69,7 @@ import org.godotengine.godot.xr.XRMode
import java.io.File
import java.io.FileInputStream
import java.io.InputStream
import java.nio.charset.StandardCharsets
import java.lang.Exception
import java.security.MessageDigest
import java.util.*
@@ -120,6 +121,7 @@ class Godot(private val context: Context) : SensorEventListener {
val directoryAccessHandler = DirectoryAccessHandler(context)
val fileAccessHandler = FileAccessHandler(context)
val netUtils = GodotNetUtils(context)
private val commandLineFileParser = CommandLineFileParser()
/**
* Tracks whether [onCreate] was completed successfully.
@@ -915,47 +917,18 @@ class Godot(private val context: Context) : SensorEventListener {
}
private fun getCommandLine(): MutableList<String> {
val original: MutableList<String> = parseCommandLine()
val hostCommandLine = primaryHost?.commandLine
if (!hostCommandLine.isNullOrEmpty()) {
original.addAll(hostCommandLine)
}
return original
}
private fun parseCommandLine(): MutableList<String> {
val inputStream: InputStream
return try {
inputStream = requireActivity().assets.open("_cl_")
val len = ByteArray(4)
var r = inputStream.read(len)
if (r < 4) {
return mutableListOf()
}
val argc =
(len[3].toInt() and 0xFF) shl 24 or ((len[2].toInt() and 0xFF) shl 16) or ((len[1].toInt() and 0xFF) shl 8) or (len[0].toInt() and 0xFF)
val cmdline = ArrayList<String>(argc)
for (i in 0 until argc) {
r = inputStream.read(len)
if (r < 4) {
return mutableListOf()
}
val strlen =
(len[3].toInt() and 0xFF) shl 24 or ((len[2].toInt() and 0xFF) shl 16) or ((len[1].toInt() and 0xFF) shl 8) or (len[0].toInt() and 0xFF)
if (strlen > 65535) {
return mutableListOf()
}
val arg = ByteArray(strlen)
r = inputStream.read(arg)
if (r == strlen) {
cmdline.add(String(arg, StandardCharsets.UTF_8))
}
}
cmdline
} catch (e: Exception) {
// The _cl_ file can be missing with no adverse effect
val commandLine = try {
commandLineFileParser.parseCommandLine(requireActivity().assets.open("_cl_"))
} catch (ignored: Exception) {
mutableListOf()
}
val hostCommandLine = primaryHost?.commandLine
if (!hostCommandLine.isNullOrEmpty()) {
commandLine.addAll(hostCommandLine)
}
return commandLine
}
/**

83
platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt Normal file
View File

@@ -0,0 +1,83 @@
/**************************************************************************/
/* CommandLineFileParser.kt */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
package org.godotengine.godot.utils
import java.io.InputStream
import java.nio.charset.StandardCharsets
import java.util.ArrayList
/**
* A class that parses the content of file storing command line params. Usually, this file is saved
* in `assets/_cl_` on exporting an apk
*
* Returns a mutable list of command lines
*/
internal class CommandLineFileParser {
fun parseCommandLine(inputStream: InputStream): MutableList<String> {
return try {
val headerBytes = ByteArray(4)
var argBytes = inputStream.read(headerBytes)
if (argBytes < 4) {
return mutableListOf()
}
val argc = decodeHeaderIntValue(headerBytes)
val cmdline = ArrayList<String>(argc)
for (i in 0 until argc) {
argBytes = inputStream.read(headerBytes)
if (argBytes < 4) {
return mutableListOf()
}
val strlen = decodeHeaderIntValue(headerBytes)
if (strlen > 65535) {
return mutableListOf()
}
val arg = ByteArray(strlen)
argBytes = inputStream.read(arg)
if (argBytes == strlen) {
cmdline.add(String(arg, StandardCharsets.UTF_8))
}
}
cmdline
} catch (e: Exception) {
// The _cl_ file can be missing with no adverse effect
mutableListOf()
}
}
private fun decodeHeaderIntValue(headerBytes: ByteArray): Int =
(headerBytes[3].toInt() and 0xFF) shl 24 or
((headerBytes[2].toInt() and 0xFF) shl 16) or
((headerBytes[1].toInt() and 0xFF) shl 8) or
(headerBytes[0].toInt() and 0xFF)
}