Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,879 Commits 44 Branches 11 Tags 59 MiB
Commit Graph

4879 Commits

Author SHA1 Message Date
Brad Fitzpatrick 1577fc1e56 Merge "netutil: add HostPort, serverinit: return app baseURL" 2014-08-01 18:50:59 +00:00
Brad Fitzpatrick f3758ae239 Merge "pkg/serverinit: fix tests for windows" 2014-08-01 18:50:59 +00:00
Aaron Boodman 00552a0ded Merge "Require date and username before custom rendering Twitter items." 2014-08-01 18:50:59 +00:00
Aaron Boodman 6c78cb5c22 Merge "Render containers with the camliContentImage attr as folders for now." 2014-08-01 18:50:59 +00:00
Aaron Boodman 8dba194013 Render containers with the camliContentImage attr as folders for now. 
Something fancier would be better, but without this change they'd get
rendered as single images, which would be confusing.

Change-Id: Icd08eb1716ae1f3bebe2f064388cac822a0a4e63
 2014-08-01 11:52:24 -07:00
mpl 044ac54a20 pkg/serverinit: fix tests for windows 
Fixes: http://camlistore.org/issue/304

Change-Id: Ieb29ffefd1daf8d62704374d8e1eecd9cfea3156
 2014-08-01 01:05:41 +02:00
mpl 0a869ad067 netutil: add HostPort, serverinit: return app baseURL 
Context: http://camlistore.org/issue/479

This patch allows camlistored to wait for all the apps to be serving,
before printing its own listening address.

Change-Id: I4035b115a03ef6a2a43177b83b5b65ebc50a2188
 2014-08-01 00:01:27 +02:00
Brad Fitzpatrick 10252d1951 Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2014-07-31 14:35:30 -07:00
Brad Fitzpatrick 8fbd54c09b picasa: set url property on photos and albums 
Change-Id: If89ee61138e4fb80e68f87130c5fe189b7d82582
 2014-07-31 14:34:52 -07:00
Brad Fitzpatrick 31c324c206 corpus: respect more attributes when looking up permanode's time 
Change-Id: I2ed9f9f100109510c1617e465a8d3e2b3261d244
 2014-07-31 14:24:03 -07:00
Brad Fitzpatrick 1ff2918602 importers: add SupportsIncremental accessor 
If an importer is efficient at running regularly, it returns true.

If it's not true, the UI won't allow turning on automatic runs.

Flickr doesn't set it (yet).
 2014-07-31 11:34:31 -07:00
mpl b1346fa07a website/camweb: redirect to right scheme on www. request 
Fixes http://camlistore.org/459

Change-Id: Icf69e404a6985c984688c291e88da365721ee029
 2014-07-31 17:37:33 +02:00
Brad Fitzpatrick b3637337be Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2014-07-30 17:28:02 -07:00
Brad Fitzpatrick 4ea387545a picasa: ignore shard number when comparing URLs for equality. 
Change-Id: I9e31756f3f8122f7bc563ba2a2f1e19aee553f65
 2014-07-30 17:26:46 -07:00
mpl 2437ada83f foursquare: some attributes cleanup 
Change-Id: I7a1d794e58b47edeef06c3d181991c8aa1eb0534
 2014-07-31 01:50:36 +02:00
Brad Fitzpatrick a5c802ec21 Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2014-07-30 16:25:20 -07:00
Brad Fitzpatrick d4f22274cd picasa: document and simplify Photo fields in picago. 
Be smarter about title vs description. Don't use caption as an attribute name.

Change-Id: I746fc6d88e27b6b85a8505456e6eb423443d7840
 2014-07-30 16:24:56 -07:00
Brad Fitzpatrick 95492813b1 picasa: clean up album attributes, add tests, fix keywords with spaces 
Change-Id: I32faae16334e3999731f3980502eb6a1a6d38595
 2014-07-30 15:50:34 -07:00
mpl fd4d43ff5d Merge "flickr: set primary photo as camliContentImage on album" 2014-07-30 20:57:13 +00:00
mpl c032a4a8e7 flickr: set primary photo as camliContentImage on album 
Change-Id: I3e805e3e64878d7f0057957c0be476a1a613cb21
 2014-07-31 23:17:44 +02:00
mpl 05c91dbf48 Merge "ui/permanode: cope better with not a permanode case" 2014-07-30 19:58:42 +00:00
mpl 41bdd85120 ui/permanode: cope better with not a permanode case 
A camliPath can now have a file blob as a target (instead of a
permanode). And when we render these camliPath members as links, since
it can happen that these members haven't been described, we can't know
in advance whether to link them as permanodes or as blobs, so we
always default to permanode. Therefore, it can now legitimately happen
that we end up on the permanode page, while the blobRef is actually
one of a non permanode.

This patch tries to cope with that situation in a bit nicer way.

Context: http://camlistore.org/issue/470

Change-Id: Ic3b728541e164a6e6056d8f275a1d7e76b41e043
 2014-07-30 01:07:06 +02:00
Brad Fitzpatrick 8f62edbc9e Merge "flickr: some attributes changes" 2014-07-29 22:37:54 +00:00
mpl 28d5307853 flickr: some attributes changes 
Also revert Total to an "int string", the doc was a lie and Aaron was
right.

Change-Id: I81ca7c8a3e3141beed1c4a3e5784a590a11f1399
 2014-07-30 23:13:57 +02:00
Brad Fitzpatrick 606acb5915 picasa: re-use existing permanode if it doesn't conflict 2014-07-29 14:54:43 -07:00
Brad Fitzpatrick de629e036c search: allow searching by file wholeref 2014-07-29 14:38:20 -07:00
Brad Fitzpatrick 29c63cc2ab picasa, picago: support video, change struct definitions, add start of more tests 2014-07-29 11:44:44 -07:00
Brad Fitzpatrick 1763efbefe picasa: TODO about broken video support 
Change-Id: Ie44e1129b1965f379adb8599ffe7f7693fb02eab
 2014-07-28 23:15:15 -07:00
Brad Fitzpatrick b4c4aabbd4 picasa: more work towards permanode reuse 
Change-Id: Icf590e3593036c5a1a2764a800062f40eada09c1
 2014-07-28 23:14:20 -07:00
Brad Fitzpatrick e61c7b949f picasa: start of reusing existing permanode when importing photo 
Change-Id: Id43c60f2d5cfea27fb57adb0ca81b621360039b1
 2014-07-28 21:35:58 -07:00
Brad Fitzpatrick 1eaccc75dd Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2014-07-28 21:01:00 -07:00
Brad Fitzpatrick f5f02768b3 picasa: give a title to importer root permanode 
Change-Id: I0e259db52060518dfe33f31f0222b169a8c9e0ef
 2014-07-28 19:16:17 -07:00
Brad Fitzpatrick 9a3c619405 importer: add ChildPathObjectOrFunc to let importers find a fitting permanode on miss 
Change-Id: I016f30aa9e05a1024c2cdb7b1e8be0a675f73719
 2014-07-28 19:15:53 -07:00
Brad Fitzpatrick dadb9cca16 Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2014-07-28 16:37:40 -07:00
Brad Fitzpatrick ea6785569d picasa: simplify photo import code, only redownload photo when necessary, do 3 at once. 
Change-Id: I99551ad90359ced164b47b12f121ef207b797430
 2014-07-28 16:37:19 -07:00
Brad Fitzpatrick 349651dcee Merge "pkg/webserver: use a custom logger, if provided" 2014-07-28 20:58:41 +00:00
mpl b7d8d55bb3 pkg/webserver: use a custom logger, if provided 
http://camlistore.org/issue/479

Change-Id: I41bd0a02d40e9ad94f655b5c1abdfa5db76c7019
 2014-07-29 01:40:51 +02:00
Brad Fitzpatrick 2695422f2e picasa: incremental album import, and key album off its ID, not name. 
Change-Id: I748e01950fa22eec024bb08ae22060b6939513dd
 2014-07-28 13:58:24 -07:00
Brad Fitzpatrick 80e543efe2 nodeattr: add more, rearrange, clean up some comments. 
Change-Id: Ifc1809ed07166c18253cf0a82e708fccb3071f08
 2014-07-28 13:56:43 -07:00
Brad Fitzpatrick b8756b73a5 picasa: logging and TODO 
Change-Id: Icf010ad8b781dbbf66f03160d49089d8986853a0
 2014-07-27 13:13:01 -07:00
Brad Fitzpatrick e8816c072d picasa: cleanups, missing body.Close, start of incremental support, fix SummarizeAccount 
Change-Id: I497338743c7d85dea9f374215662543f4a9ad6a9
 2014-07-27 12:25:18 -07:00
Brad Fitzpatrick db09f2fe1a Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2014-07-25 16:03:53 -07:00
Brad Fitzpatrick 4021f812c6 importer, picasa: move ExtendedOAuth2 out of pkg importer, fix picasa 
The ExtendedOAuth2 code tried to be generic, but wasn't (had Picasa
comments?) and was only used by Picasa anyway.  We can move it later
if there are actually 2 users and it works for both.

At the same time, make Picasa actually work by writing a correct
IsAccountReady function.
 2014-07-25 16:02:43 -07:00
Brad Fitzpatrick 3a77e7bcb0 twitter: clarify purpose of getTopLevelNode and set titles better 
Change-Id: Ie4d88b927ccd63a943afbb220594b6cb0c96a2b9
 2014-07-25 14:54:48 -07:00
Brad Fitzpatrick b531c32f11 nodeattr: moving more from importer/attrs.go 
Change-Id: Iebf336c44af77ccbe655aadbe1e57ad339ba5201
 2014-07-25 14:48:03 -07:00
Brad Fitzpatrick d0fbfd9751 nodeattr: rename Content to CamliContent, since Content also exists. 
Change-Id: I305ca3cecf9b223a125fb9207966995c9dbf83b8
 2014-07-25 14:41:17 -07:00
Brad Fitzpatrick 997d8241b9 twitter: simplify getTopLevelNode 
Change-Id: Id25ad568a79d44144ac8aaf9652e31dc7de6e864
 2014-07-25 14:10:52 -07:00
Brad Fitzpatrick 0716bfdecf twitter: revert 98a73d966d; it changed its imported root structure 
I failed to catch that in review.

Change-Id: Ie88298a2f34595b27c6f98af6f31b61a29ebac1b
 2014-07-25 14:07:17 -07:00
Brad Fitzpatrick 8af06fa3ff picasa: work on making the instructions accurate & work 2014-07-25 13:37:47 -07:00
Brad Fitzpatrick fad3a60a77 picasa: some importer attribute cleanup 
Use nodeattr constants. Don't set lat/long when unknown.
 2014-07-25 13:24:46 -07:00