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

adb: Added ignorefinderror configuration parameter

Browse source 
On a phone with Calyxos, adb find in /sdcard complains:

find: ./Android/data/com.android.providers.downloads.ui: Permission denied

But otherwise works, so this option makes import and export work ok, except
for that one app's data.

Sponsored-by: Graham Spencer
This commit is contained in:
Joey Hess 2022-01-10 21:15:30 -04:00
parent 00a917d2d2
commit 525473aa5a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Remote/Adb.hs
View file

@ -43,6 +43,8 @@ remote = specialRemoteType $ RemoteType
(FieldDesc "location on the Android device where the files are stored")
, optionalStringParser androidserialField
(FieldDesc "sometimes needed to specify which Android device to use")
, yesNoParser ignorefinderrorField (Just False)
(FieldDesc "ignore adb find errors")
]
, setup = adbSetup
, exportSupported = exportIsSupported
@ -56,6 +58,10 @@ androiddirectoryField = Accepted "androiddirectory"
androidserialField :: RemoteConfigField
androidserialField = Accepted "androidserial"
ignorefinderrorField :: RemoteConfigField
ignorefinderrorField = Accepted "ignorefinderror"
gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> RemoteStateHandle -> Annex (Maybe Remote)
gen r u rc gc rs = do
c <- parsedRemoteConfig remote rc
@ -83,7 +89,7 @@ gen r u rc gc rs = do
, renameExport = renameExportM serial adir
}
, importActions = ImportActions
{ listImportableContents = listImportableContentsM serial adir
{ listImportableContents = listImportableContentsM serial adir c
, importKey = Nothing
, retrieveExportWithContentIdentifier = retrieveExportWithContentIdentifierM serial adir
, storeExportWithContentIdentifier = storeExportWithContentIdentifierM serial adir
@ -289,13 +295,13 @@ renameExportM serial adir _k old new = do
, File newloc
]
listImportableContentsM :: AndroidSerial -> AndroidPath -> Annex (Maybe (ImportableContentsChunkable Annex (ContentIdentifier, ByteSize)))
listImportableContentsM serial adir = adbfind >>= \case
listImportableContentsM :: AndroidSerial -> AndroidPath -> ParsedRemoteConfig -> Annex (Maybe (ImportableContentsChunkable Annex (ContentIdentifier, ByteSize)))
listImportableContentsM serial adir c = adbfind >>= \case
Just ls -> return $ Just $ ImportableContentsComplete $
ImportableContents (mapMaybe mk ls) []
Nothing -> giveup "adb find failed"
where
adbfind = adbShell serial
adbfind = adbShell' serial
[ Param "find"
-- trailing slash is needed, or android's find command
-- won't recurse into the directory
@ -304,7 +310,10 @@ listImportableContentsM serial adir = adbfind >>= \case
, Param "-exec", Param "stat"
, Param "-c", Param statformat
, Param "{}", Param "+"
]
]
(if ignorefinderror then "|| true" else "")
ignorefinderror = fromMaybe False (getRemoteConfigValue ignorefinderrorField c)
statformat = adbStatFormat ++ "\t%n"
@ -390,8 +399,11 @@ enumerateAdbConnected = checkAdbInPath [] $ liftIO $
--
-- Any stdout from the command is returned, separated into lines.
adbShell :: AndroidSerial -> [CommandParam] -> Annex (Maybe [String])
adbShell serial cmd = adbShellRaw serial $
unwords $ map shellEscape (toCommand cmd)
adbShell serial cmd = adbShell' serial cmd ""
adbShell' :: AndroidSerial -> [CommandParam] -> String -> Annex (Maybe [String])
adbShell' serial cmd extra = adbShellRaw serial $
(unwords $ map shellEscape (toCommand cmd)) ++ extra
adbShellBool :: AndroidSerial -> [CommandParam] -> Annex Bool
adbShellBool serial cmd =