
* unannex, uninit: Avoid committing after every file is unannexed, for massive speedup. * --notify-finish switch will cause desktop notifications after each file upload/download/drop completes (using the dbus Desktop Notifications Specification) * --notify-start switch will show desktop notifications when each file upload/download starts. * webapp: Automatically install Nautilus integration scripts to get and drop files. * tahoe: Pass -d parameter before subcommand; putting it after the subcommand no longer works with tahoe-lafs version 1.10. (Thanks, Alberto Berti) * forget --drop-dead: Avoid removing the dead remote from the trust.log, so that if git remotes for it still exist anywhere, git annex info will still know it's dead and not show it. * git-annex-shell: Make configlist automatically initialize a remote git repository, as long as a git-annex branch has been pushed to it, to simplify setup of remote git repositories, including via gitolite. * add --include-dotfiles: New option, perhaps useful for backups. * Version 5.20140227 broke creation of glacier repositories, not including the datacenter and vault in their configuration. This bug is fixed, but glacier repositories set up with the broken version of git-annex need to have the datacenter and vault set in order to be usable. This can be done using git annex enableremote to add the missing settings. For details, see http://git-annex.branchable.com/bugs/problems_with_glacier/ * Added required content configuration. * assistant: Improve ssh authorized keys line generated in local pairing or for a remote ssh server to set environment variables in an alternative way that works with the non-POSIX fish shell, as well as POSIX shells. # imported from the archive
237 lines
7.1 KiB
Haskell
237 lines
7.1 KiB
Haskell
{- git-annex webapp launcher
|
|
-
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
|
|
module Command.WebApp where
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import Assistant
|
|
import Assistant.Common
|
|
import Assistant.NamedThread
|
|
import Assistant.Threads.WebApp
|
|
import Assistant.WebApp
|
|
import Assistant.Install
|
|
import Annex.Environment
|
|
import Utility.WebApp
|
|
import Utility.Daemon (checkDaemon)
|
|
#ifdef __ANDROID__
|
|
import Utility.Env
|
|
#endif
|
|
import Annex.Init
|
|
import qualified Git
|
|
import qualified Git.Config
|
|
import qualified Git.CurrentRepo
|
|
import qualified Annex
|
|
import Config.Files
|
|
import Upgrade
|
|
import Annex.Version
|
|
|
|
import Control.Concurrent
|
|
import Control.Concurrent.STM
|
|
import System.Process (env, std_out, std_err)
|
|
import Network.Socket (HostName)
|
|
import System.Environment (getArgs)
|
|
|
|
def :: [Command]
|
|
def = [ withOptions [listenOption] $
|
|
noCommit $ noRepo startNoRepo $ dontCheck repoExists $ notBareRepo $
|
|
command "webapp" paramNothing seek SectionCommon "launch webapp"]
|
|
|
|
listenOption :: Option
|
|
listenOption = fieldOption [] "listen" paramAddress
|
|
"accept connections to this address"
|
|
|
|
seek :: CommandSeek
|
|
seek ps = do
|
|
listenhost <- getOptionField listenOption return
|
|
withNothing (start listenhost) ps
|
|
|
|
start :: Maybe HostName -> CommandStart
|
|
start = start' True
|
|
|
|
start' :: Bool -> Maybe HostName -> CommandStart
|
|
start' allowauto listenhost = do
|
|
liftIO ensureInstalled
|
|
ifM isInitialized
|
|
( go
|
|
, auto
|
|
)
|
|
stop
|
|
where
|
|
go = do
|
|
cannotrun <- needsUpgrade . fromMaybe (error "no version") =<< getVersion
|
|
browser <- fromRepo webBrowser
|
|
f <- liftIO . absPath =<< fromRepo gitAnnexHtmlShim
|
|
listenhost' <- if isJust listenhost
|
|
then pure listenhost
|
|
else annexListen <$> Annex.getGitConfig
|
|
ifM (checkpid <&&> checkshim f)
|
|
( if isJust listenhost
|
|
then error "The assistant is already running, so --listen cannot be used."
|
|
else do
|
|
url <- liftIO . readFile
|
|
=<< fromRepo gitAnnexUrlFile
|
|
liftIO $ if isJust listenhost'
|
|
then putStrLn url
|
|
else liftIO $ openBrowser browser f url Nothing Nothing
|
|
, do
|
|
startDaemon True True Nothing cannotrun listenhost' $ Just $
|
|
\origout origerr url htmlshim ->
|
|
if isJust listenhost'
|
|
then maybe noop (`hPutStrLn` url) origout
|
|
else openBrowser browser htmlshim url origout origerr
|
|
)
|
|
auto
|
|
| allowauto = liftIO $ startNoRepo []
|
|
| otherwise = do
|
|
d <- liftIO getCurrentDirectory
|
|
error $ "no git repository in " ++ d
|
|
checkpid = do
|
|
pidfile <- fromRepo gitAnnexPidFile
|
|
liftIO $ isJust <$> checkDaemon pidfile
|
|
checkshim f = liftIO $ doesFileExist f
|
|
|
|
{- When run without a repo, start the first available listed repository in
|
|
- the autostart file. If not, it's our first time being run! -}
|
|
startNoRepo :: CmdParams -> IO ()
|
|
startNoRepo _ = do
|
|
-- FIXME should be able to reuse regular getopt, but
|
|
-- it currently runs in the Annex monad.
|
|
args <- getArgs
|
|
let listenhost = headMaybe $ map (snd . separate (== '=')) $
|
|
filter ("--listen=" `isPrefixOf`) args
|
|
|
|
dirs <- liftIO $ filterM doesDirectoryExist =<< readAutoStartFile
|
|
case dirs of
|
|
[] -> firstRun listenhost
|
|
(d:_) -> do
|
|
setCurrentDirectory d
|
|
state <- Annex.new =<< Git.CurrentRepo.get
|
|
void $ Annex.eval state $ do
|
|
whenM (fromRepo Git.repoIsLocalBare) $
|
|
error $ d ++ " is a bare git repository, cannot run the webapp in it"
|
|
callCommandAction $
|
|
start' False listenhost
|
|
|
|
{- Run the webapp without a repository, which prompts the user, makes one,
|
|
- changes to it, starts the regular assistant, and redirects the
|
|
- browser to its url.
|
|
-
|
|
- This is a very tricky dance -- The first webapp calls the signaler,
|
|
- which signals the main thread when it's ok to continue by writing to a
|
|
- MVar. The main thread starts the second webapp, and uses its callback
|
|
- to write its url back to the MVar, from where the signaler retrieves it,
|
|
- returning it to the first webapp, which does the redirect.
|
|
-
|
|
- Note that it's important that mainthread never terminates! Much
|
|
- of this complication is due to needing to keep the mainthread running.
|
|
-}
|
|
firstRun :: Maybe HostName -> IO ()
|
|
firstRun listenhost = do
|
|
checkEnvironmentIO
|
|
{- Without a repository, we cannot have an Annex monad, so cannot
|
|
- get a ThreadState. Using undefined is only safe because the
|
|
- webapp checks its noAnnex field before accessing the
|
|
- threadstate. -}
|
|
let st = undefined
|
|
{- Get a DaemonStatus without running in the Annex monad. -}
|
|
dstatus <- atomically . newTMVar =<< newDaemonStatus
|
|
d <- newAssistantData st dstatus
|
|
urlrenderer <- newUrlRenderer
|
|
v <- newEmptyMVar
|
|
let callback a = Just $ a v
|
|
runAssistant d $ do
|
|
startNamedThread urlrenderer $
|
|
webAppThread d urlrenderer True Nothing
|
|
(callback signaler)
|
|
listenhost
|
|
(callback mainthread)
|
|
waitNamedThreads
|
|
where
|
|
signaler v = do
|
|
putMVar v ""
|
|
takeMVar v
|
|
mainthread v url htmlshim
|
|
| isJust listenhost = do
|
|
putStrLn url
|
|
hFlush stdout
|
|
go
|
|
| otherwise = do
|
|
browser <- maybe Nothing webBrowser
|
|
<$> catchDefaultIO Nothing Git.Config.global
|
|
openBrowser browser htmlshim url Nothing Nothing
|
|
go
|
|
where
|
|
go = do
|
|
_wait <- takeMVar v
|
|
state <- Annex.new =<< Git.CurrentRepo.get
|
|
Annex.eval state $
|
|
startDaemon True True Nothing Nothing listenhost $ Just $
|
|
sendurlback v
|
|
sendurlback v _origout _origerr url _htmlshim = do
|
|
recordUrl url
|
|
putMVar v url
|
|
|
|
recordUrl :: String -> IO ()
|
|
#ifdef __ANDROID__
|
|
{- The Android app has a menu item that opens the url recorded
|
|
- in this file. -}
|
|
recordUrl url = writeFile "/sdcard/git-annex.home/.git-annex-url" url
|
|
#else
|
|
recordUrl _ = noop
|
|
#endif
|
|
|
|
openBrowser :: Maybe FilePath -> FilePath -> String -> Maybe Handle -> Maybe Handle -> IO ()
|
|
#ifndef __ANDROID__
|
|
openBrowser mcmd htmlshim _realurl outh errh = runbrowser
|
|
#else
|
|
openBrowser mcmd htmlshim realurl outh errh = do
|
|
recordUrl url
|
|
{- Android's `am` command does not work reliably across the
|
|
- wide range of Android devices. Intead, FIFO should be set to
|
|
- the filename of a fifo that we can write the URL to. -}
|
|
v <- getEnv "FIFO"
|
|
case v of
|
|
Nothing -> runbrowser
|
|
Just f -> void $ forkIO $ do
|
|
fd <- openFd f WriteOnly Nothing defaultFileFlags
|
|
void $ fdWrite fd url
|
|
closeFd fd
|
|
#endif
|
|
where
|
|
p = case mcmd of
|
|
Just cmd -> proc cmd [htmlshim]
|
|
Nothing -> browserProc url
|
|
#ifdef __ANDROID__
|
|
{- Android does not support file:// urls, but neither is
|
|
- the security of the url in the process table important
|
|
- there, so just use the real url. -}
|
|
url = realurl
|
|
#else
|
|
url = fileUrl htmlshim
|
|
#endif
|
|
runbrowser = do
|
|
hPutStrLn (fromMaybe stdout outh) $ "Launching web browser on " ++ url
|
|
hFlush stdout
|
|
environ <- cleanEnvironment
|
|
(_, _, _, pid) <- createProcess p
|
|
{ env = environ
|
|
, std_out = maybe Inherit UseHandle outh
|
|
, std_err = maybe Inherit UseHandle errh
|
|
}
|
|
exitcode <- waitForProcess pid
|
|
unless (exitcode == ExitSuccess) $
|
|
hPutStrLn (fromMaybe stderr errh) "failed to start web browser"
|
|
|
|
{- web.browser is a generic git config setting for a web browser program -}
|
|
webBrowser :: Git.Repo -> Maybe FilePath
|
|
webBrowser = Git.Config.getMaybe "web.browser"
|
|
|
|
fileUrl :: FilePath -> String
|
|
fileUrl file = "file://" ++ file
|