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

OsPath conversion of Remote.Adb

Browse source 
Note that the additional use of System.FilePath.Posix likely fixes a
problem if this were used on windows. The AndroidPath uses / directory
separators. Before this, on windows, \ would have been used.

The change to newtype AndroidPath is only documentation.
This commit is contained in:
Joey Hess 2025-02-05 11:14:45 -04:00
parent 4dc904bbad
commit 85fa337f61
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Remote/Adb.hs
View file

@ -25,6 +25,7 @@ import Utility.Metered
import Types.ProposedAccepted import Types.ProposedAccepted
import Annex.SpecialRemote.Config import Annex.SpecialRemote.Config
import Annex.Verify import Annex.Verify
import qualified Utility.OsString as OS
import qualified Data.Map as M import qualified Data.Map as M
import qualified System.FilePath.Posix as Posix import qualified System.FilePath.Posix as Posix
@ -34,7 +35,7 @@ newtype AndroidSerial = AndroidSerial { fromAndroidSerial :: String }
deriving (Show, Eq) deriving (Show, Eq)
-- | A location on an Android device. -- | A location on an Android device.
newtype AndroidPath = AndroidPath { fromAndroidPath :: FilePath } newtype AndroidPath = AndroidPath { fromAndroidPath :: Posix.FilePath }
remote :: RemoteType remote :: RemoteType
remote = specialRemoteType $ RemoteType remote = specialRemoteType $ RemoteType
@ -182,20 +183,20 @@ store serial adir = fileStorer $ \k src _p ->
in unlessM (store' serial dest src) $ in unlessM (store' serial dest src) $
giveup "adb failed" giveup "adb failed"
store' :: AndroidSerial -> AndroidPath -> FilePath -> Annex Bool store' :: AndroidSerial -> AndroidPath -> OsPath -> Annex Bool
store' serial dest src = checkAdbInPath False $ do store' serial dest src = checkAdbInPath False $ do
let destdir = takeDirectory $ fromAndroidPath dest let destdir = Posix.takeDirectory $ fromAndroidPath dest
void $ adbShell serial [Param "mkdir", Param "-p", File destdir] void $ adbShell serial [Param "mkdir", Param "-p", File destdir]
showOutput -- make way for adb push output showOutput -- make way for adb push output
liftIO $ boolSystem "adb" $ mkAdbCommand serial liftIO $ boolSystem "adb" $ mkAdbCommand serial
[Param "push", File src, File (fromAndroidPath dest)] [Param "push", File (fromOsPath src), File (fromAndroidPath dest)]
retrieve :: AndroidSerial -> AndroidPath -> Retriever retrieve :: AndroidSerial -> AndroidPath -> Retriever
retrieve serial adir = fileRetriever $ \dest k _p -> retrieve serial adir = fileRetriever $ \dest k _p ->
let src = androidLocation adir k let src = androidLocation adir k
in retrieve' serial src (fromRawFilePath dest) in retrieve' serial src dest
retrieve' :: AndroidSerial -> AndroidPath -> FilePath -> Annex () retrieve' :: AndroidSerial -> AndroidPath -> OsPath -> Annex ()
retrieve' serial src dest = retrieve' serial src dest =
unlessM go $ unlessM go $
giveup "adb pull failed" giveup "adb pull failed"
@ -206,7 +207,7 @@ retrieve' serial src dest =
[ Param "pull" [ Param "pull"
, Param "-a" , Param "-a"
, File $ fromAndroidPath src , File $ fromAndroidPath src
, File dest , File $ fromOsPath dest
] ]
remove :: AndroidSerial -> AndroidPath -> Remover remove :: AndroidSerial -> AndroidPath -> Remover
@ -240,21 +241,22 @@ androidLocation adir k = AndroidPath $
androidHashDir :: AndroidPath -> Key -> AndroidPath androidHashDir :: AndroidPath -> Key -> AndroidPath
androidHashDir adir k = AndroidPath $ androidHashDir adir k = AndroidPath $
fromAndroidPath adir ++ "/" ++ hdir fromAndroidPath adir ++ "/" ++ fromOsPath hdir
where where
hdir = replace [pathSeparator] "/" (fromRawFilePath (hashDirLower def k)) hdir = OS.intercalate (literalOsPath "/") $ OS.split pathSeparator $
hashDirLower def k
storeExportM :: AndroidSerial -> AndroidPath -> FilePath -> Key -> ExportLocation -> MeterUpdate -> Annex () storeExportM :: AndroidSerial -> AndroidPath -> OsPath -> Key -> ExportLocation -> MeterUpdate -> Annex ()
storeExportM serial adir src _k loc _p = storeExportM serial adir src _k loc _p =
unlessM (store' serial dest src) $ unlessM (store' serial dest src) $
giveup "adb failed" giveup "adb failed"
where where
dest = androidExportLocation adir loc dest = androidExportLocation adir loc
retrieveExportM :: AndroidSerial -> AndroidPath -> Key -> ExportLocation -> FilePath -> MeterUpdate -> Annex Verification retrieveExportM :: AndroidSerial -> AndroidPath -> Key -> ExportLocation -> OsPath -> MeterUpdate -> Annex Verification
retrieveExportM serial adir k loc dest _p = retrieveExportM serial adir k loc dest _p =
verifyKeyContentIncrementally AlwaysVerify k $ \iv -> verifyKeyContentIncrementally AlwaysVerify k $ \iv ->
tailVerify iv (toRawFilePath dest) $ tailVerify iv dest $
retrieve' serial src dest retrieve' serial src dest
where where
src = androidExportLocation adir loc src = androidExportLocation adir loc
@ -342,7 +344,7 @@ listImportableContentsM serial adir c = adbfind >>= \case
let (stat, fn) = separate (== '\t') l let (stat, fn) = separate (== '\t') l
sz = fromMaybe 0 (readish (takeWhile (/= ' ') stat)) sz = fromMaybe 0 (readish (takeWhile (/= ' ') stat))
cid = ContentIdentifier (encodeBS stat) cid = ContentIdentifier (encodeBS stat)
loc = mkImportLocation $ toRawFilePath $ loc = mkImportLocation $ toOsPath $
Posix.makeRelative (fromAndroidPath adir) fn Posix.makeRelative (fromAndroidPath adir) fn
in Just (loc, (cid, sz)) in Just (loc, (cid, sz))
mk _ = Nothing mk _ = Nothing
@ -351,7 +353,7 @@ listImportableContentsM serial adir c = adbfind >>= \case
-- connection is reasonably fast, it's probably as good as -- connection is reasonably fast, it's probably as good as
-- git's handling of similar situations with files being modified while -- git's handling of similar situations with files being modified while
-- it's updating the working tree for a merge. -- it's updating the working tree for a merge.
retrieveExportWithContentIdentifierM :: AndroidSerial -> AndroidPath -> ExportLocation -> [ContentIdentifier] -> FilePath -> Either Key (Annex Key) -> MeterUpdate -> Annex (Key, Verification) retrieveExportWithContentIdentifierM :: AndroidSerial -> AndroidPath -> ExportLocation -> [ContentIdentifier] -> OsPath -> Either Key (Annex Key) -> MeterUpdate -> Annex (Key, Verification)
retrieveExportWithContentIdentifierM serial adir loc cids dest gk _p = do retrieveExportWithContentIdentifierM serial adir loc cids dest gk _p = do
case gk of case gk of
Right mkkey -> do Right mkkey -> do
@ -360,7 +362,7 @@ retrieveExportWithContentIdentifierM serial adir loc cids dest gk _p = do
return (k, UnVerified) return (k, UnVerified)
Left k -> do Left k -> do
v <- verifyKeyContentIncrementally DefaultVerify k v <- verifyKeyContentIncrementally DefaultVerify k
(\iv -> tailVerify iv (toRawFilePath dest) go) (\iv -> tailVerify iv dest go)
return (k, v) return (k, v)
where where
go = do go = do
@ -371,7 +373,7 @@ retrieveExportWithContentIdentifierM serial adir loc cids dest gk _p = do
_ -> giveup "the file on the android device has changed" _ -> giveup "the file on the android device has changed"
src = androidExportLocation adir loc src = androidExportLocation adir loc
storeExportWithContentIdentifierM :: AndroidSerial -> AndroidPath -> FilePath -> Key -> ExportLocation -> [ContentIdentifier] -> MeterUpdate -> Annex ContentIdentifier storeExportWithContentIdentifierM :: AndroidSerial -> AndroidPath -> OsPath -> Key -> ExportLocation -> [ContentIdentifier] -> MeterUpdate -> Annex ContentIdentifier
storeExportWithContentIdentifierM serial adir src _k loc overwritablecids _p = storeExportWithContentIdentifierM serial adir src _k loc overwritablecids _p =
ifM checkcanoverwrite ifM checkcanoverwrite
( ifM (store' serial dest src) ( ifM (store' serial dest src)
@ -410,7 +412,7 @@ checkPresentExportWithContentIdentifierM serial adir _k loc knowncids =
androidExportLocation :: AndroidPath -> ExportLocation -> AndroidPath androidExportLocation :: AndroidPath -> ExportLocation -> AndroidPath
androidExportLocation adir loc = AndroidPath $ androidExportLocation adir loc = AndroidPath $
fromAndroidPath adir ++ "/" ++ fromRawFilePath (fromExportLocation loc) fromAndroidPath adir ++ "/" ++ fromOsPath (fromExportLocation loc)
-- | List all connected Android devices. -- | List all connected Android devices.
enumerateAdbConnected :: Annex [AndroidSerial] enumerateAdbConnected :: Annex [AndroidSerial]