Commit Graph

362 Commits

Author SHA1 Message Date
Brad Fitzpatrick 85473f6849 Merge "More work on OS X launcher." 2013-09-07 00:58:43 +00:00
Nick O'Neill cb40c185f6 More work on OS X launcher.
Change-Id: Id88e5f1c26b536b4a296f25b08bb4375ea014dc5
2013-09-06 17:55:51 -07:00
Brad Fitzpatrick dabe4355af Change how the Android camput.arm asset is built to use make.go
Change-Id: I00a6e22ef088a173f78ffca83c984d915670180c
2013-09-03 19:48:32 -07:00
Nick O'Neill 885094adc0 Working on launch.
Change-Id: Id4d0b61565127c60478cbf6d3da1e4f899f9987c
2013-08-30 12:13:04 -07:00
Brad Fitzpatrick 7074b46299 osx: add a Makefile and gitignore
Change-Id: I9873c54bbf7cdc4ae90b78b0bd55330b72063233
2013-07-11 08:39:00 +10:00
Nick O'Neill f36a690934 Removed the workspace for now.
Change-Id: I307cd3e1c4ce63c583ff5e6584226b244d657fef
2013-07-10 10:56:31 -07:00
Nick O'Neill 712fda7b97 Added workspace files for building.
Change-Id: Icc1af8328122f0b8fbb096edd2354efd38954462
2013-07-09 08:47:51 -07:00
Nick O'Neill 79c2a563e4 Added an icon, restricted app to the menu.
Change-Id: Ie681183676d3482fc30d08907e9a26d9b4fbff97
2013-07-08 18:32:21 -07:00
Nick O'Neill c0d251524e First commit for camlistart menu item.
Change-Id: I7b64e5ef11af1277e52bf2034f4157ad890c2da4
2013-07-08 18:32:10 -07:00
mpl ac431439f3 Allow HTTPS with a self-signed certificate.
A new client configuration parameter, "trustedCerts" (list of strings)
is introduced. A certificate fingerprint is defined as the 10 digits
prefix of the sha1 of the whole certificate (in ASN1. DER form).
trustedCerts should contain the list of fingerprints of the
certificates we trust. If not empty, the server's certificate
is checked against that list, instead of using the full x509 validation
on it.

-added a dial function and tls configuration, which check if we're using
SSL, and if we're in "trustedCerts" mode.
pkg/client/client.go
pkg/client/config.go

-moved android specific hacks from camput to the client layer, so that
the dial and tls config could reuse/access them. Also allows future
reuse for other commands, such as camget.
pkg/client/android.go

-adapted camput to the above changes:
cmd/camput/android.go
cmd/camput/camput.go
cmd/camput/files.go

-server prints a hint when it generates the self-signed:
pkg/misc/misc.go
server/camlistored/camlistored.go

-camliactivity:
clients/android/res/xml/preferences.xml
clients/android/src/org/camlistore/Preferences.java
clients/android/src/org/camlistore/SettingsActivity.java
clients/android/src/org/camlistore/UploadService.java
clients/android/src/org/camlistore/UploadThread.java

http://camlistore.org/issue/131

Change-Id: I6be20161549a69aafc8eb7b9e96e9351dc1c5b09
2013-04-23 17:10:37 +02:00
mpl c67b53465a camliactivity: catch invalid server format
Fixes https://code.google.com/p/camlistore/issues/detail?id=120

Change-Id: I602946b80c5a084242f80992b79503052853a4a4
2013-02-25 19:05:41 +01:00
mpl 3f81be742c android: config changes to build with ant
Change-Id: I6c7030bcc6a2f3bb882af706a8cab2a126faef8c
2013-02-23 00:05:01 +01:00
Brad Fitzpatrick 8128b51bb7 android: add Version menu option
Change-Id: I64aeacf18421edd51517c92ec8782b4bb62ca1b1
2013-02-03 10:39:20 -08:00
Brad Fitzpatrick e398532b4a buildinfo: include dirty + flag in version
Change-Id: Idc4763de41fdfa055fed5c06a36db9e9539f60bc
2013-02-03 10:14:21 -08:00
Brad Fitzpatrick ed40fc89f7 Clean up the clients dir a bit
Change-Id: I1fb8e188044e8a552aa02acedb92c1c9b1d75330
2013-02-02 09:02:43 -08:00
Brad Fitzpatrick e8ef81c626 android/camput: more stats
Change-Id: I668b8ee0b7c32d33075e421445af2973be1f576a
2013-01-30 17:22:53 -08:00
Brad Fitzpatrick 957c06d46c android: keep armgo build environment separate
Change-Id: Ie55fdd43813beb5f81ba9f8a41be8012932b1cc1
2013-01-30 17:22:45 -08:00
Brad Fitzpatrick 0825772d49 android: show camput's new advertised stats in UI
Change-Id: I864c539ef9bc81096e271115e90288350209ae66
2013-01-30 16:56:22 -08:00
Brad Fitzpatrick 625c618ac6 android: more graceful camput shutdown (close stdin)
Change-Id: Idd0c572a8426549fb2a1b467ab126986cde9edb5
2013-01-30 10:55:53 -08:00
Brad Fitzpatrick 6cd6acfeda android: slightly better progress bar accuracy
Change-Id: I44da03108419d3aa3d46e074fe8417920f2aaa3e
2013-01-29 17:04:48 -08:00
Brad Fitzpatrick 966beef095 android: formatting rule tweaks
Change-Id: Ic8d74c9838212e55e626f18dda4664626bf2c30c
2013-01-29 16:38:33 -08:00
Brad Fitzpatrick 14f038c667 android: working but kinda-sucky progress bars. need camput to broadcast better stats.
Change-Id: I28e6a16eba835116d8e8e205fe71073e0357b9c7
2013-01-28 21:52:23 -08:00
Brad Fitzpatrick 502026bd89 android: UploadThread re-work. use pipe-to-camput-stdin model, and be more Go-like.
Change-Id: I0f598dae28e47036bf713bfde488a7af0884e932
2013-01-28 19:06:37 -08:00
Brad Fitzpatrick 3a29a9bd82 android: cleanup
Change-Id: I1db3c20c68b8c2c69d76d8f1286e3be15091fb20
2013-01-27 20:28:06 -08:00
Brad Fitzpatrick 05fe9477bf android: pref cleanip + add Dev IP setting, to quickly switch between prod and dev server
Change-Id: Ief66dd2faf2cd366ef808a3d65f07be7b3333ef3
2013-01-27 20:26:02 -08:00
Brad Fitzpatrick 851a0c70b8 android: add Eclipse code formatting policy
Change-Id: I93b0367a66519f7858ebfda424406d41c9ef37fa
2013-01-27 20:24:51 -08:00
Brad Fitzpatrick f5a588527b android: untested: more upload / status work
Change-Id: I15dbf861b0bd8684a4e61a09f910315b874db1ed
2013-01-27 17:12:08 -08:00
Brad Fitzpatrick 8e9f7d332d android: more blob -> file UI changes
Change-Id: Ie3d81d837462bd41c572f42b0447c8428415da0d
2013-01-27 15:31:41 -08:00
Brad Fitzpatrick dc49611c53 android: clean-up and start of protocol from camput to android host
Change-Id: Icda33c1d54bdcd0a57f6ac62c09fd3e9cf9cd6f7
2013-01-27 15:27:17 -08:00
Brad Fitzpatrick 9b1affae33 android: reformat UploadApplication.java
Change-Id: Ib1466e2d522b0154ceb10f7519689060cff09acd
2013-01-27 14:06:15 -08:00
Brad Fitzpatrick 3a38081500 android: zero process reference at end
Change-Id: Ia3e9d44631a68bc2303dde90545eb5610a4313d4
2013-01-27 14:06:07 -08:00
Brad Fitzpatrick f6861b71e2 android, osutil: the the child process its Android-specific cache directory
Change-Id: I1161afd4ab30eb02e0e5b41c3d73a0c94f59c200
2013-01-27 13:24:50 -08:00
Brad Fitzpatrick 3910c347cf android: properly notify the service when a file is successfully uploaded; prevents upload loop
Change-Id: Icdc7d5f8e11d22fa1462051ab32005731e5783d6
2013-01-27 13:24:19 -08:00
Brad Fitzpatrick 2e5841b149 android: remove unused imports
Change-Id: Iecd4ed0c467bad17eb7881bb3554b50c415af91d
2013-01-27 13:12:34 -08:00
Brad Fitzpatrick e994b5c461 android: in prefs, show username summary
Change-Id: I46b702afd8e0944b9b2d54f85745c8b8770681c8
2013-01-27 13:04:47 -08:00
Brad Fitzpatrick 9b7bd9c7ae android: remove dead code
Change-Id: I6526020829ac5efc62c2ad0e3cae98a777748780
2013-01-27 13:04:31 -08:00
Brad Fitzpatrick ba9d9f2a88 android: set targetSdkVersion to 17. now JellyBean pretty.
Change-Id: I24fd7ca8ad264d201faf6aa9147a69fe20353add
2013-01-27 13:04:14 -08:00
Brad Fitzpatrick 6dbacee842 android: check in code formatting policy, and fmt some code
Change-Id: I1d277f50e3518893dc1828b74d8c789df0a25943
2013-01-27 12:54:49 -08:00
Brad Fitzpatrick 3fe1536e01 android: update a Java file when the Go child is updated, to force a rebuild in the ADT
Change-Id: I4ffa15332a2af82ed27300d447bc9d0ca1bd6877
2013-01-27 12:50:24 -08:00
Brad Fitzpatrick 31b6ff2c4a android: uploading using the camput Go process.
works, but UI is terrible and unreliable. but it uploaded and vivified a photo shared from the gallery.

Change-Id: I63199a4d25597739920b276ac240efa27c07926c
2013-01-27 11:37:36 -08:00
Brad Fitzpatrick 1b8006abcd android: remove browse / download service for now. bit rot, or never finished?
Change-Id: I2323aeded34eb3fd0b176273d67a215264f9fb11
2013-01-27 10:17:25 -08:00
Brad Fitzpatrick 91cf37edb6 android: start of using the Go camput binary as a child process.
For now it just smartly copies it from the APK zip to the filesystem and chmods it.

For testing:

(in an adb shell)

CAMLI_AUTH=userpass:USER:PASS /data/data/org.camlistore/files/camput.bin --server=https://server.example.com file -vivify /sdcard/DCIM/Camera/IMG_20130126_143719.jpg

... which now works, as of commit 51e88c7434 (camput: run in an Android linux non-cgo environment)

Change-Id: I32a7e1e28fdf781bec5156271a4b33f5bd3b8b83
2013-01-26 16:54:03 -08:00
Brad Fitzpatrick ec8f01c467 android: make it compile with Eclipse (ADT v21.0.0-519525) again
Change-Id: I70efe6897bf235d6c4c174f505c7a79b09d6e6ec
2013-01-26 13:42:07 -08:00
Sarath Lakshman 778a607c67 client: fix blobserver path in curl and python clients
Change-Id: Ie7a204ee64a9373c696e447ccf93a790584676d6
2013-01-01 00:27:11 +05:30
Brad Fitzpatrick 0f5870c4d8 Mark camwebdav as broken.
Change-Id: If13899e5637bf8b1a1a6acd465cc7f940f506d6f
2012-12-16 20:41:06 -08:00
Brad Fitzpatrick 899f8a0e7a move camdbinit to cmd/
Change-Id: I21657e1cc91bda7a7b18b609b1bfac37680256cb
2012-03-24 19:46:38 -07:00
Brad Fitzpatrick ef7e3c2e90 make pkg/mysqlindexer and camdbinit compile again, even if not working yet
Change-Id: I3fbdfda6c456c079a3ac58ea988e43301e957f11
2012-03-24 19:45:23 -07:00
Brad Fitzpatrick 374c1f5360 cammount: move to cmd/ directory; update dev-cammount script.
Change-Id: Ifa0c4d586c30ebb807a8094594e4872dcd5039ef
2012-03-18 23:58:36 -07:00
Brad Fitzpatrick 685189ca4c cammount: update to use rsc's fuse library; pkg/fs: butcher it up to make it compile.
doesn't work again yet.

Change-Id: I462320918026944716638588d08ba76c67c72a73
2012-03-18 23:54:20 -07:00
Brad Fitzpatrick 768af3d368 move clients/go/camgsinit to clients/camgsinit
Change-Id: I662b3b1ff4cf36a03f736533d3405737820f511f
2012-02-28 19:42:38 -08:00
Brad Fitzpatrick 350491ef7a fix import
Change-Id: I1943db2ab1913345ef05b3987d96e63a5600d39d
2012-02-28 19:42:04 -08:00
Brad Fitzpatrick c825acde06 move camdebug to cmd; it compiles as Go 1 already.
Change-Id: Ic9aa1112a504da96738b7ec3fc224df54b92cdc8
2012-02-21 02:14:34 -08:00
Brad Fitzpatrick 0714a463c9 Update from r60 to [almost] Go 1.
A lot is still broken, but most stuff at least compiles now.

The directory tree has been rearranged now too.  Go libraries are now
under "pkg".  Fully qualified, they are e.g. "camlistore.org/pkg/jsonsign".

The go tool cannot yet fetch from arbitrary domains, but discussion is
happening now on which mechanism to use to allow that.

For now, put the camlistore root under $GOPATH/src.  Typically $GOPATH
is $HOME, so Camlistore should be at $HOME/src/camlistore.org.

Then you can:

$ go build ./server/camlistored

... etc

The build.pl script is currently disabled.  It'll be resurrected at
some point, but with a very different role (helping create a fake
GOPATH and running the go build command, if things are installed at
the wrong place, and/or running fileembed generators).

Many things are certainly broken.

Many things are disabled.  (MySQL, all indexing, etc).

Many things need to be moved into
camlistore.org/third_party/{code.google.com,github.com} and updated
from their r60 to Go 1 versions, where applicable.

The GoMySQL stuff should be updated to use database/sql and the ziutek
library implementing database/sql/driver.

Help wanted.

Change-Id: If71217dc5c8f0e70dbe46e9504ca5131c6eeacde
2012-02-18 21:53:06 -08:00
Andrew Gerrand d60d29c560 implement recursive fetch 2012-01-02 16:07:58 +11:00
Andrew Gerrand 7f6964a0d6 actually do something with -o flag 2012-01-02 15:23:39 +11:00
Brad Fitzpatrick 398e1549c6 Add camput 'rawobj' subcommand for debugging.
Change-Id: I7f7e70a3c757889e6f8f4f264ea7f0e797c41e7a
2011-12-07 14:42:16 -08:00
Brad Fitzpatrick d50f2323fd gofmt
Change-Id: I0d7a2875854ea2a5bdf91cbace6c342f4b17525f
2011-12-07 14:41:19 -08:00
mpl 0e71f20415 auth: added username, camput can do https
Change-Id: I14a047f1a164b64062d94da0db7a64a658b086ae
2011-11-27 01:29:24 +01:00
mpl d7ce1b71ff started on the histogram (issue 18)
Change-Id: I5f90e8c96664221281ac04b4d49de53f352d90fa
2011-11-06 17:32:33 +01:00
Brad Fitzpatrick 453fd92fbe client: don't register client flags by default
Change-Id: I73a3242f1cfd2af9a63dd53c7174843a234c5f18
2011-10-10 17:38:18 -07:00
Brett Slatkin 69ec51052f camput: Change permanode -name to use the attribute "title" to match camlistore UI
Change-Id: I74e97fa22a5710b3f4d510d1d3c7de2d69b343ae
2011-09-30 03:42:31 +00:00
Brad Fitzpatrick dc69d53aae Some Issue 18 statistics work on camput
Change-Id: I409b0616aac5c8bdfd234cafed831b7339391ffa
2011-09-29 10:37:24 -07:00
Brad Fitzpatrick b966e55154 Start of camput files memstat flag, for Issue 18
Change-Id: I2b35bd9ed83e1fb899cf165ad82da95e16d0deba
2011-09-28 19:08:17 -07:00
Brad Fitzpatrick 2ec0a974b6 make camput use schema.WriteFile; add flag to enable rollsum splits
Change-Id: If436f7aa5d8360fbe1aaa07795b326e1eb5066f4
2011-09-28 11:16:51 -07:00
Brad Fitzpatrick c79121e1bc more camput syntax work.
Change-Id: I6d77c8b88c4242168f838ef72a288198f1c197dd
2011-09-26 20:02:35 -07:00
Brad Fitzpatrick 0bfb253381 Merge "blob command for new camput cli" 2011-09-26 16:20:31 +00:00
Brad Fitzpatrick f793ef9cd8 Merge "attr command for new camput cli" 2011-09-26 16:18:55 +00:00
mpl 93da4a48d3 blob command for new camput cli
Change-Id: I7e20119761c0670aa2d01b5f7f38439eddcf4304
2011-09-26 15:57:00 +02:00
mpl 839d8bb858 attr command for new camput cli
Change-Id: I4f3b1231d8817f3874a6a3b499dc364ebd971957
2011-09-26 12:33:30 +02:00
mpl e35f2d0b40 permanode command for new camput cli
Change-Id: I5d5867b196feb4b358cacfaab14f96357134d43b
2011-09-26 12:30:44 +02:00
Brad Fitzpatrick 12f236da37 Start of major camput command-line cleanup.
So far only "init" and "file" are done:

$ grep -r RegisterCommand clients/go/camput
clients/go/camput/init.go:      RegisterCommand("init", c)
clients/go/camput/files.go:     RegisterCommand("file", cmd)

New command line syntax is:

Usage: camput [globalopts] <mode> [commandopts] [commandargs]

Examples:

  camput init

  camput file [opts] <files/directories>

  camput permanode [opts] (create a new permanode)

  camput share [opts] <blobref to share via haveref>

  camput blob <files>     (raw, without any metadata)
  camput blob -           (read from stdin)

  camput attr <permanode> <name> <value>         Set attribute
  camput attr --add <permanode> <name> <value>   Adds attribute (e.g. "tag")
  camput attr --del <permanode> <name> [<value>] Deletes named attribute [value]

For mode-specific help:

  camput MODE -help

Change-Id: I4aeabeff6450beab83c13d94c16bd007addb8b58
2011-09-25 17:40:01 -07:00
Brad Fitzpatrick c3d6526fd1 camput: do directories in parallel, don't deadlock, cleanup, sanitize logging, ...
start of much more work.

Change-Id: I667260895a3f6f1425937189ff9752b18bd6de0d
2011-09-24 17:20:47 -07:00
Brad Fitzpatrick 35231e69f6 shell for camput tests, with TODO of a found bug
Change-Id: Ifc93b4fb0d4ae0e8b84982cb0427d86be4fdae89
2011-09-24 14:15:04 -07:00
Brad Fitzpatrick c8f8f8d59e camput: let tinkerTransport's underlying transport be changed
Change-Id: I0b24d593c27b937c961825442801db4c7031c81d
2011-09-24 14:14:41 -07:00
Brad Fitzpatrick 71ed6f8165 camput: add a 'havecache', like brackup's inventory cache
Change-Id: Ie5399fb08febf685f72d17a51d65962da9a3d32d
2011-09-17 16:59:04 -07:00
Brad Fitzpatrick 6f91469776 camput statcache
Change-Id: I0b469b3497b7ae87f0de039a1398c3102139cdf4
2011-09-17 15:14:37 -07:00
Brad Fitzpatrick 3fbb8487e8 move some debug stuff out of camput into new camdebug
Change-Id: I94c0451b7fabdccdcaff9ae3e5f4097bdb426b78
2011-09-17 12:02:05 -07:00
Brad Fitzpatrick 8c3edb6006 Add missing file from 83a0f2b47c
Change-Id: I8e9b905276bf1e48a378fd88b38884bb9767a5b6
2011-09-17 10:26:32 -07:00
Brad Fitzpatrick 83a0f2b47c some camput work, adding start of a stat cache
Change-Id: I2d4090362a639eed2af6ce02dbaae81f249dfd57
2011-09-16 18:03:13 -07:00
Brad Fitzpatrick e1bb80e41e limit camput concurrency
Change-Id: I7a4806faf99e365e792477af3c5870a2b06a6770
2011-09-16 12:38:03 -07:00
Brad Fitzpatrick d35c4a4ddc minor client/upload changes
Change-Id: I02ec44ff72575e547fee5e44667d648cf06b54f8
2011-09-15 21:52:33 -07:00
Brad Fitzpatrick c0ea8dbcb1 Issue 17: file vs. bytes schema change
Details:
http://code.google.com/p/camlistore/issues/detail?id=17

Change-Id: Ia1237952a2a66f1dcacd00c5c28eb360d9f1d1d7
2011-09-13 11:57:50 -07:00
mpl b0dda5e86f Various renamings. dropped getTagged.
Change-Id: I20982074071b819110fe07cb795ffcb7d6c8560e
2011-09-04 00:48:49 +02:00
Brad Fitzpatrick 88c89757e1 gofixes for latest Go changes
Change-Id: Ib7b3aea5adff0e1683bcb421cc3549c31d9fe174
2011-08-25 19:14:47 +04:00
Iain Peet cb183a1ae2 Implemented Google Storage requests required for blobserver.
This commit really just contains the camlistore-independent
google storage code (googlestorage.go).  I've stubbed out the Storage
interface, but that's not yet done.

Committing now because this is large enough already.

Change-Id: Ie122b11bebed13b36f99f80144787ad4edc0ed51
2011-08-18 10:47:45 -04:00
mpl 27c4e677d4 allow comma separated list for tags in camput
I prefer -tag tag1 -tag tag2 better though,
will do later.

Change-Id: I36bbd9d26f1d87bab005381e6ce42e506155abb4
2011-08-08 01:25:36 +02:00
Brad Fitzpatrick 0a2f4b7507 Merge "first cut at a Camlistore WebDAV server" 2011-08-07 01:52:55 +00:00
Robert Hencke 52a15c7b91 first cut at a Camlistore WebDAV server
don't let it burn out your eyes too badly

Change-Id: I7b1b1df0abbcafff411025d30bd32cd250d2221d
2011-08-06 20:46:37 -05:00
mpl 7860ecead0 allow on the fly tagging when uploading with camput
Change-Id: Ib4318551f6d020499294362f8c650e11da208eab
2011-08-06 19:29:05 +02:00
Iain Peet 46881bb549 Initial work on google storage for developers.
Brought in goauth2 client library, added a utility for obtaining
tokens for the first time.

Change-Id: I7c8301912a086df55732c1a1bc4ddf619438d66c
2011-07-20 15:31:55 -04:00
mpl 42a60238da added Type test to Superset.NewFileReader (as per TODO)
Change-Id: I2c9b0868e1df65306e978552db2e135c5d623289
2011-07-13 10:52:37 +02:00
Amit Levy d6825c9af8 Changed all references of sort.SortStrings to sort.Strings per commit 9012 of go
Change-Id: I2af1eeea05b65db10b17bc077a8af2dd5778910d
2011-07-08 17:54:03 -04:00
Brad Fitzpatrick 024e801ca7 gofmt the whole tree
Change-Id: Ic1b3dd12a4ede83b299dcf51f342e72d4f8700da
2011-07-02 09:09:50 -07:00
Brad Fitzpatrick 15057eec02 Update to Go 8944
Change-Id: I7940180cbe882884286e56ee4fc7bf5589aad9e0
2011-06-29 21:13:03 -07:00
Brad Fitzpatrick 30adc073f5 Version the mysql db schemas; warn on startup if wrong with tip to fix.
Change-Id: I3bc881bc5b078062bc96f80dec1e8f9ac71ece61
2011-06-19 14:36:46 -07:00
caine 4b8997ed48 clients/go/camsync: return stats struct and use them in verbose mode
Change-Id: Icb0d86df5dd33f1bbb37112abe8b549c49a3de24
2011-06-15 11:29:51 -04:00
caine f5effec0e5 clients/python: Make ignore patterns into a command-line flag.
Change-Id: I51f65aee97a8187df303a854d53270da12c4aa7c
2011-06-13 18:53:16 -04:00
Brad Fitzpatrick 691273a284 index more about files: filename, properties set, mime type 2011-06-11 10:55:35 -07:00
Amir Mohammad Saied 6465ab5c37 Android: Make sure application does not force close if server:port is not set 2011-06-10 12:10:43 -07:00
Brad Fitzpatrick c61317703c indexer: index file sha1s, sizes (for js search lookup later) 2011-06-08 18:26:57 -07:00