mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

adb: Added configuration setting oldandroid=true

Browse source 
To avoid using find -printf, which was first supported in Android around
2019-2020.

Probing seems too fragile, and execing stat once per file is too slow to do
when there's a faster way available, which brought me to an option...

Sponsored-by: Brett Eisenberg on Patreon
This commit is contained in:
Joey Hess 2022-07-13 18:00:47 -04:00
parent 6c7550ba62
commit 50c2cac7e7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Remote/Adb.hs
View file

@ -46,6 +46,8 @@ remote = specialRemoteType $ RemoteType
(FieldDesc "sometimes needed to specify which Android device to use")
, yesNoParser ignorefinderrorField (Just False)
(FieldDesc "ignore adb find errors")
, yesNoParser oldandroidField (Just False)
(FieldDesc "support old versions of android (slower)")
]
, setup = adbSetup
, exportSupported = exportIsSupported
@ -62,6 +64,8 @@ androidserialField = Accepted "androidserial"
ignorefinderrorField :: RemoteConfigField
ignorefinderrorField = Accepted "ignorefinderror"
oldandroidField :: RemoteConfigField
oldandroidField = Accepted "oldandroid"
gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> RemoteStateHandle -> Annex (Maybe Remote)
gen r u rc gc rs = do
@ -305,26 +309,44 @@ listImportableContentsM serial adir c = adbfind >>= \case
ImportableContents (mapMaybe mk ls) []
Nothing -> giveup "adb find failed"
where
adbfind = adbShell' serial
adbfind = adbShell' serial findparams
(\s -> if oldandroid
then s ++ ignorefinderrorsh
else concat
[ "set -o pipefail; "
, s
, "| xargs -0 stat -c " ++ shellEscape statformat ++ " --"
, ignorefinderrorsh
]
)
findparams =
[ Param "find"
-- trailing slash is needed, or android's find command
-- won't recurse into the directory
, File $ fromAndroidPath adir ++ "/"
, Param "-type", Param "f"
, Param "-printf", Param "%p\\0"
]
(\s -> concat
[ "set -o pipefail; "
, s
, "| xargs -0 stat -c " ++ shellEscape statformat ++ " --"
, if ignorefinderror then " || true" else ""
]
)
] ++ if oldandroid
then
[ Param "-exec"
, Param "stat"
, Param "-c"
, Param statformat
, Param "{}"
, Param ";"
]
else
[ Param "-printf"
, Param "%p\\0"
]
ignorefinderror = fromMaybe False (getRemoteConfigValue ignorefinderrorField c)
oldandroid = fromMaybe False (getRemoteConfigValue oldandroidField c)
statformat = adbStatFormat ++ "\t%n"
ignorefinderrorsh = if ignorefinderror then " || true" else ""
mk ('S':'T':'\t':l) =
let (stat, fn) = separate (== '\t') l
sz = fromMaybe 0 (readish (takeWhile (/= ' ') stat))