Commit Graph

6981 Commits

Author SHA1 Message Date
mpl 87a8e7ad54 website: fix test working dir
Change-Id: If92dc43b4ee3e5fd2ac9c6490d242d3dacff74b1
2018-04-25 23:18:16 -07:00
mpl a6ad4d88e9 dev/devcam: do not look for pk in ./bin dir
Change-Id: I1903b389fbed1bf836d4d3c91c5fb6d2db117b84
2018-04-25 22:51:41 -07:00
Mathieu Lonjaret 11dfa3850d Merge "internal/geocode: change Lookup behavior wrt to AltLookupFn" 2018-04-26 02:22:21 +00:00
mpl 8b30515218 internal/geocode: change Lookup behavior wrt to AltLookupFn
Even when AltLookupFun was defined, Lookup used to fallthrough after the
AltLookupFn, depending on what AltLookupFn returned.
This means in some cases, our tests in pkg/search did end up calling the
Google API (which was not intended). We found out because with the new
dependency on an API key for the Google service, we now rely on reading
the key from the config dir, which is wired to panic if it is accessed
during tests.

This change therefore simplifies Lookup, by making it return the results
of the AltLookupFn call, if AltLookupFn exists.

Change-Id: Ie196f892f36d309c725a6e869094364d49cffdc8
2018-04-25 18:01:39 -07:00
Brad Fitzpatrick 6a68c7dea3 server/perkeepd/ui: fix size of swarm logo
Change-Id: I66aaf4053e5a129d112fe389cf222004ace3f20d
2018-04-25 13:43:40 -07:00
Brad Fitzpatrick f636f75b75 server/perkeepd/ui: change foursquare logo to swarm logo
Upstream rebranded.

Change-Id: I0ce6e98f29c5c3fe59ec9ac905cf4bb8976f0a4f
2018-04-25 13:31:48 -07:00
Brad Fitzpatrick b424d3f4c8 Merge "importer: change some camlistore.org to perkeep.org; fix devcam --makethings" 2018-04-25 20:23:55 +00:00
Brad Fitzpatrick bc24f7920a importer: change some camlistore.org to perkeep.org; fix devcam --makethings
Change-Id: I517a77a5ef2dd7495402c1357f99a6223fe8481a
2018-04-25 13:23:18 -07:00
mpl b75523bbea dev/devcam: fix website go code location
also do not set GOBIN when building self

Change-Id: Ibea2ab4fcc7b60ef28dfcb6620a44b29541eedef
2018-04-25 12:19:10 -07:00
Mathieu Lonjaret 66788a29af Merge "clients/android: Camlistore->Perkeep renames" 2018-04-25 19:03:38 +00:00
mpl 92c60d7c69 clients/android: Camlistore->Perkeep renames
Change-Id: I7012bfad11b5582bb0c2383a3b3a1eb84512819a
2018-04-25 11:26:13 -07:00
Brad Fitzpatrick aad03ce0d3 Merge "geocode: support the now-required Google API key and document how to configure" 2018-04-25 18:25:41 +00:00
Brad Fitzpatrick 70a9c72528 geocode: support the now-required Google API key and document how to configure
Change-Id: Ic4f01c7bf0ad37d06ee76aad53ad99a91d986c03
2018-04-25 11:20:47 -07:00
mpl 5f6517b728 clients/android: adjust version numbers for incoming release
Change-Id: Iac6ca39be04e334e7a6129cf5a8c2ed299c7be25
2018-04-25 10:51:57 -07:00
Brad Fitzpatrick dcbe9bfbd8 Merge "pkg/test/docker: force the MySQL version to 5" 2018-04-25 04:39:39 +00:00
Brad Fitzpatrick b04b2a7618 Merge "blobserver/{files,localdisk}: add VFS layer for use by localdisk" 2018-04-25 04:38:48 +00:00
mpl 7247d11107 pkg/test/docker: force the MySQL version to 5
Since we don't support the latest MySQL version, our tests in Travis CI
are failing since they pull the latest docker image.

We should fix the issue
(https://github.com/perkeep/perkeep/issues/1114), but in the meantime,
we might as well restrict the tests to MySQL 5, so that CI tests keep on
being useful to alert us about other errors.

Change-Id: I32a2cc1dc5a4194c891183d96498dee14c759baf
2018-04-24 19:45:27 -07:00
Mathieu Lonjaret 03b0ab4601 Merge "website: add links to android app" 2018-04-25 01:53:10 +00:00
mpl e02c044e67 website: add links to android app
Change-Id: I90ed3cbe168b95dfaeaa674b330c1b704145f6e6
2018-04-24 18:51:58 -07:00
Mathieu Lonjaret 926a324800 Merge "clients/android: add steps to sign the apk" 2018-04-25 01:48:26 +00:00
mpl 1aeadf4a8a pkg/index: on slurping bogus gps coordinate, log instead of panicking
If a GPS coordinate is bogus, we should have caught it when receiving
the blob, and not write it out as an index row.
If we did not, we end up catching it when trying to slurp it to the
corpus. At this point there's no reason to penalize the user by
panicking, we can instead skip it and log about the error.

Change-Id: Ie40479befca78d8b5da343ef1a8420f703f07cb7
2018-04-24 17:53:33 -07:00
Brad Fitzpatrick 8a67582cf9 blobserver/{files,localdisk}: add VFS layer for use by localdisk
For now, no user-visible changes.

But this will permit an SFTP blobstorage layer in the future.

Next step will be moving 90% of the code from the localdisk package
into the files package.

Updates #1111

Change-Id: I62b924e3d69ca47e7c0fa83c78a77808a71ea33e
2018-04-24 16:30:08 -07:00
mpl e35db56405 clients/android: add steps to sign the apk
Change-Id: I776dd14efca4bd10263a7c7422e0ffd5c706a523
2018-04-24 16:10:05 -07:00
mpl 66e6766571 pkg/gpgchallenge: use long form when looking for key ID
We migrated to using the long form for key IDs sometime ago, but we
never updated the client of the gpgchallenge accordingly, so in
functions that take a keyID as an argument, it would fail to find the
given long keyID within a key ring.

However, for usability reasons, we want to keep the short form in the
hostname of the instance (and hence as the DNS entry), so we revert to
using the short form when perkeepd is setting its host name.

Change-Id: I8373016671fdead32780a04f6d64045e81cc9cd1
2018-04-23 21:44:25 -07:00
mpl 4a562043e0 pkg/sorted/sqlkv: make multiple close safe
Change-Id: I3d0f81e201a944b43bfd484e6393aed7cc52b7e3
2018-04-23 17:44:59 -07:00
mpl 2286b6442b website: move go code to pk-web package
Fixes #1109

Change-Id: Ibcba1addf25da414f4d9cb42f621d6b9184898da
2018-04-23 16:42:35 -07:00
mpl a2760b9767 pkg/deploy/gce: rename tarball name with perkeepd
Change-Id: I2dad2c783cdac7bd995f00e1ff22fc37d8bbb358
2018-04-23 14:06:48 -07:00
mpl 4ed26b3d04 misc/docker: fix expected output binaries location
Change-Id: I3f7f30580a513602e0091269163af9618926623a
2018-04-23 13:59:06 -07:00
mpl 3dc471f790 misc/docker: bump go image to 1.10.1
Change-Id: I993ff0606e0cbd6a6e816df35e5ca4eda3896cfc
2018-04-23 13:47:56 -07:00
Brad Fitzpatrick b5392b7d3b Merge "make.go: validate that make.go is run in GOPATH" 2018-04-23 03:57:55 +00:00
Mathieu Lonjaret 36bb53527f Merge "cmd: rename camget to pk-get, and make it a mode of pk" 2018-04-23 03:52:06 +00:00
mpl 7a27eb42eb cmd: rename camget to pk-get, and make it a mode of pk
A couple of related fixes and renames too.

Updates #981
Fixes #1056

Change-Id: Id47a933c77422edfb9db41d34c38ed9d0d7a1846
2018-04-22 20:50:54 -07:00
Brad Fitzpatrick 05684c3dc1 make.go: validate that make.go is run in GOPATH
It used to be a feature of make.go that it could run from anywhere and
users could ignore GOPATH. We would still like that, but the
shenanigans we did before to mirror the perkeep source tree to a temp
directory and set GOPATH to that temp directory were annoying. And
fortunately GOPATH is slowly dying, so we won't need to deal with this
forever. As of Go 1.8, there is always now a default GOPATH
(https://golang.org/doc/go1.8#gopath), so at least people don't need
to set environment variables. And in Go 1.12-ish, we'll probably ditch
GOPATH entirely.

So, for now require that users build in their GOPATH, which might be
the implicit GOPATH if they haven't set one. This only affects
developers. Regular users can use release binaries.

Change-Id: Ib4e3f05fa987baeaba5aa51349887e6c243f0092
2018-04-22 20:16:51 -07:00
Mathieu Lonjaret 78e60919f7 Merge "make.go: use first value of GOPATH" 2018-04-23 02:44:14 +00:00
Brad Fitzpatrick 01af2e3134 Merge "internal/osutil: move the config dir to perkeep" 2018-04-22 20:16:48 +00:00
Mathieu Lonjaret c87c026e7e Merge "pkg/test: do not expect binaries in ./bin" 2018-04-22 18:59:48 +00:00
mpl e778290117 pkg/test: do not expect binaries in ./bin
As make.go now does not install binaries in ./bin, but rather let them be
installed wherever go install does, the test World should now rely on
os/exec's LookPath to find the binaries it needs.

Fixes related failing tests

Change-Id: I256e79673ca994001e831aed9e7a3ab5ba485ead
2018-04-22 11:59:12 -07:00
Brad Fitzpatrick a062b701c9 all: more log spam & logging consistency cleanup
Change-Id: Ibc38c2eed86e75afb064ba25ba586494c813f56c
2018-04-22 11:30:02 -07:00
Brad Fitzpatrick ab797685bf importer: rename foursquare to swarm, add Properties to Importer interface
Foursquare was rebranded Swarm (for check-ins) some time ago, so
rename our implementation to match the upstream branding. But still
store "foursquare" as the permanode importer type, to not break old
users. That override is now added to the new Properties struct, and
all importers now return their properties.

More stuff will be added to Properties later: WIP flag, bug link,
proper title, icon?

Change-Id: I31cbe2feec3dbf9c6bdb0c866056d9c6966313e3
2018-04-22 11:29:50 -07:00
mpl b27ac3a71b make.go: use first value of GOPATH
Fixes #1101

Change-Id: Ia6993d81f93b8aa64582d1b265d094fc7b232fc7
2018-04-22 11:05:27 -07:00
Brad Fitzpatrick e5e29b004b dev/devcam: don't invoke make.go four times for four targets
Just once is fine.

Change-Id: I74b34f34ee5a193dcf7ac7d28acc858fd6263a68
2018-04-22 09:01:40 -07:00
Brad Fitzpatrick 38d0075c3a all: make log lines a bit more consistent
Change-Id: I06c5bbe072c9857ca3afbf97d14146b9cd96a49e
2018-04-22 08:51:43 -07:00
Mathieu Lonjaret 892dd7b0f3 Merge "pkg/search: allow empty expression" 2018-04-22 04:42:13 +00:00
Brad Fitzpatrick 915299b8b6 importer/twitter: remove some log spam, clean up a comment
Change-Id: I5709a27424a56fafe84f43358b1a735c496fedd1
2018-04-21 21:02:38 -07:00
mpl aaac9635d2 pkg/search: allow empty expression
We had checks in place to return an error if a search query had both
no constraint and no expression. However:
1) we accepted " " as a valid search expression (which is the
work-around that was used by the web UI for the index page)
2) the rest of the code seems to be coping well if we remove these
checks, which this CL does.

This allows us to remove the q=" " trick in the web UI, which does not
seem to be breaking anything, and has the side-effect of improving the
map aspect story (issue 1081). Because with this change, the index page
is not considered anymore as the result of a search query, which means
if one then clicks on an image, one then gets to the image permanode as
a "standalone" item, instead of as one item part of set.
As a consequence:
1) If one then clicks on the map aspect, one gets only this item on the
map (with the proper zoom level), instead of all the items from the
index page.
2) The other side of the coin is left/right navigation does not "work"
anymore in this context, since the item is not part of a set anymore.

In other words, this change makes the index page (i.e. the empty search)
a somewhat particular case, and makes it behave a little differently
from the result of any other (non-empty) search.

Updates issue #1081

Change-Id: Ibbb1711c67c7cf8adaf94ab5d2c68c3755e4983b
2018-04-21 17:44:43 -07:00
mpl 2bb666ccf6 all: rename remaining occurrences of camput
Also removed misc/buildbot while at it (which contained camput
references) since we don't use it anymore at all.

TODO: the OSX app seems to be relying on finding a binary in ../bin,
which we do not use anymore. This will probably need fixing.

Updates #981

Change-Id: I14220fbad2e81181330fca4bb2d2e5fe170e1bd6
2018-04-21 16:20:24 -07:00
Brad Fitzpatrick 9ce352249c internal/osutil: move the config dir to perkeep
Updates #981

Change-Id: I71ceea6395d31851e8502a2f397acb22056fe1b0
2018-04-21 12:50:24 -07:00
Mathieu Lonjaret 86ee09b012 Merge "make.go: fix cross compilation" 2018-04-21 19:45:35 +00:00
mpl 9035ba9f25 make.go: fix cross compilation
When installing, respect user defined GOBIN and/or GOPATH, or the
Go defaults.
But when cross-compiling, disable GOBIN, as it's not supported.

Fixes #1100

Change-Id: I69485722d6dbfcbf7721463077f828efc950d9d3
2018-04-21 21:44:05 +02:00
Brad Fitzpatrick 46f31ba425 server/perkeepd/ui: rename UI menu from Camli to Perkeep
Also disable the annoying mouse hover enter/exit behavior. Require
clicks. TODO: more focus events elsewhere should close the menu, but
this is better than before.

Also, rename the PIGGY variable to KEEPY for now, in prep for changing
the logo from a pig to the Keepy the Perkeep Parakeet mascot.

Updates #981

Change-Id: I48d9dd7267701b39122836aaad708726b1c105ac
2018-04-21 12:37:52 -07:00