1519 Commits

Author SHA1 Message Date
Elrond
4305580e85 Improve .one() by using sqlalchemy's .one() 2011-12-24 19:11:42 +01:00
Elrond
2608982885 Add search level one() method
And create a _fix_query_dict which converts '_id' to 'id'.
2011-12-24 19:11:12 +01:00
Elrond
fb7dd855de Turn MediaComment's author() into get_author property
1) MediaComment's author method conflicts with the author
   field. So rename it to get_author.
2) Turn it from a normal function into a python property.
   That means you call it by ".get_author" not by
   ".get_author()". This is exactly what sqlalchemy gives
   us free of charge.
2011-12-23 22:25:06 +01:00
Karen Rustad
db425022dd added translation tags to html5 wwarning 2011-12-23 17:28:31 +01:00
Karen Rustad
6c191eb3de Added a 'you don't have HTML5 so this video will not work' warning using just the inherent properties of the <video> tag (and some css for style) 2011-12-23 00:26:00 +01:00
Elrond
d23d4b23da Note reported bug in workaround
So that the workaround can eventually be removed, note the
URL for the relevant bug in a comment.
2011-12-21 00:34:02 +01:00
Elrond
871fc591dd Workaround for Routes/urlgen bug.
This is relevant for fcgi:

Some servers (cherokee for example) put "HTTP":"off" in the
environ. And the following code in urlgen breaks on this:
    if environ.get('HTTPS') or environ.get('wsgi.url_scheme') == 'https' \
       or environ.get('HTTP_X_FORWARDED_PROTO') == 'https':
        hostinfo['protocol'] = 'https'

workaround is to remove HTTPS:off from the environ.
2011-12-21 00:06:38 +01:00
Elrond
463a5dcc43 Merge remote branch 'remotes/joar/webfinger'
* remotes/joar/webfinger:
  Added references to docstring in mediagoblin.webfinger
  Removed mediagoblin.tools.feed which was accidentally included
  Polishing the webfinger implementation
  webfinger fully compliant with webfinger.org! Still *preliminary* solution.
  Changed some thngs to be compatible with webfinger.org, still *very preliminary*
  Added *very preliminary* support for webfinger
2011-12-20 22:58:16 +01:00
Joar Wandborg
85c916919b Added references to docstring in mediagoblin.webfinger
and mediagoblin.webfinger.views [references mediagoblin.webfinger]
2011-12-20 22:55:13 +01:00
Joar Wandborg
448a58534f Removed mediagoblin.tools.feed which was accidentally included 2011-12-20 22:13:43 +01:00
Joar Wandborg
c8cb0ee88f Polishing the webfinger implementation
- Changed quotes in the templates from " to '
- Changed all link generation to use request.urlgen
- Moved xrd links data generation from template to view
- Added parsing of the account URI using urlparse
2011-12-20 22:06:36 +01:00
Elrond
4ae4012dad Move db/models.py -> db/mongo/models.py
To my surprise, there was only ONE reference to models.py.
From open.py.
2011-12-20 20:41:21 +01:00
Elrond
faf74067da Move db/migrations.py -> db/mongo/migrations.py
And change references.
2011-12-20 20:33:33 +01:00
Elrond
59bd06aabb Move db/util.py -> db/mongo/util.py
- Change some reference
- Provide a wrapper db/util.py
2011-12-20 19:35:47 +01:00
Elrond
4970960f8c Move db/indexes.py to db/mongo/indexes.py
And change references (one!).
2011-12-20 19:20:09 +01:00
Elrond
046f9f8481 Move db/open.py to db/mongo/open.py
Starting to move the mongo specific stuff into db/mongo.
And create thin "from db.mongo.Y import z" wrappers in
db/Y.py.

Why?
1) Will make it lots easier to switch to sql for
   testing/developing.
2) The mongo stuff needs to stay around after moving to
   sql, because the converter needs it.
2011-12-20 19:06:04 +01:00
Elrond
7b194a79f0 SQL: mongokit like interface
In trying to ease the migration to SQL, created an
interface to sqlalchemy that looks a lot like the interface
that is currently in use.

*WARNING* Work in progress
2011-12-18 17:07:15 +01:00
Jef van Schendel
18517e888a Show actual comment number. Only shows plural for now (ticket #712) 2011-12-18 00:31:39 +01:00
Elrond
dbcf5289dc Simple Mongo -> SQL migration tool
This is just a start at a Migration tool from Mongo to SQL.
It fills all currently available SQL models with data from
MongoDB. A few fields in the SQL tables are left out,
because some data format migrations are needed (notably:
queue_file_name).

This thing lives in mediagoblin/db/sql/convert.py because
it has a lot of stuff hardcoded and is not, repeat not for
end users!

Hard coded:
- output database: ./mediagoblin.db (sqlite)
- Mediagoblin config: ./mediagoblin.ini
2011-12-17 21:37:02 +01:00
Elrond
7c2c56a5ff Little sql model update
- Add title to the MediaEntry
- Rename fp_verification_expire to fp_token_expire to
  follow the mongo model.
2011-12-17 17:34:55 +01:00
Joar Wandborg
8eb216388f Fixed import_export
- Mongokit instead of pymongo
- db.MediaEntry instead of db.media_entry (pymongo style)
2011-12-15 23:49:52 +01:00
Elrond
e365f980ac SQL: Some toys and little fix
Run bin/python mediagoblin/db/sql/models.py and watch the
create tables on a memory sqlite db.

Also unicode strings need unicode defauls. Warning by
sqlalchemy.
2011-12-15 22:11:49 +01:00
Elrond
a8ae9a29c1 Move sql models into db/sql/
So we can play with the sql models, let's put them in a
proper place.
2011-12-15 21:15:21 +01:00
Elrond
a0033abb9b Merge remote branch 'remotes/cwebber/sqlalchemy'
* remotes/cwebber/sqlalchemy:
  Beginnings of sqlalchemy models
2011-12-15 21:10:01 +01:00
Joar Wandborg
9df07e87a8 webfinger fully compliant with webfinger.org! Still *preliminary* solution. 2011-12-15 19:35:53 +01:00
Will Kahn-Greene
8d45c4463b Fix -dev version and add version number docs
Version numbers should adhere to PEP-386.
2011-12-15 09:28:48 -05:00
Joar Wandborg
830a78cdfb Changed some thngs to be compatible with webfinger.org, still *very preliminary* 2011-12-15 00:58:14 +01:00
Joar Wandborg
9c1c6c2a61 Added *very preliminary* support for webfinger 2011-12-15 00:46:10 +01:00
Jef van Schendel
31f5c4567f Change "Submit" to "Add" for ticket #466 2011-12-14 16:42:40 +01:00
Jef van Schendel
cd4b519a78 Remove "X license" placeholder from media page 2011-12-14 16:36:29 +01:00
Jef van Schendel
bb298cde80 Change wording for change_fp; improved the button text 2011-12-14 16:18:26 +01:00
Elrond
8d52214f1e Merge remote branch 'joar/b681-comments_from_reviewing_video'
* joar/b681-comments_from_reviewing_video:
  Bug 681 - Comments from reviewing the new video merge
2011-12-13 21:35:15 +01:00
Jef van Schendel
bb3b9e4090 Merge jQuery branch, resolve conflicts 2011-12-13 15:15:57 +01:00
Elrond
d44140a212 Merge branch 'sql/dot-notation'
* sql/dot-notation:
  Dot-Notation for MediaEntry.media_data
  Dot-Notation for MediaEntry.media_type
  Dot-Notation for MediaEntry.description(_html)
  Dot-Notation for MediaEntry.slug
  Dot-Notation for MediaEntry.title
  Dot-Notation for MediaEntry.uploader
  Dot-Notation for MediaEntry.created
  Dot-Notation: tests/test_edit.py
  Dot-Notation for Users.fp_token_expire
  Dot-Notation for Users.fp_verification_key
  Dot-Notation for Users.bio and .bio_html
  Dot-Notation for Users.url
  Dot-Notation for Users.is_admin
  Dot-Notation for Users.verification_key
  Dot-Notation for Users.status
  Dot-Notation for Users.email_verified
  Dot-Notation for Users.pw_hash
  Dot-Notation for Users.email
  Dot-Notation for Users.username
2011-12-12 18:53:03 +01:00
Will Kahn-Greene
6ae878e730 Changer version to -dev 2011-12-12 11:52:24 -05:00
Will Kahn-Greene
449f58e446 Update version numbers 2011-12-12 11:41:29 -05:00
Will Kahn-Greene
a46f645e7f Fix doc footer
This has the correct copyright statement.
2011-12-12 11:12:59 -05:00
Will Kahn-Greene
e91a4dcb73 Tweak rest formatting 2011-12-12 10:48:24 -05:00
Christopher Allan Webber
57875c83c2 Updated translations 2011-12-12 09:45:53 -06:00
Christopher Allan Webber
9bc2fc6c6a Added the "Media types" chapter 2011-12-12 09:44:48 -06:00
Will Kahn-Greene
076bf0cf28 Doc updates
* fixed some language
* fixed some consistency issues
* fixed some 80-line-width issues
* fixed some typos and markup problems
2011-12-12 10:20:05 -05:00
Will Kahn-Greene
78dc055e22 Add some documentation to lazyserver.sh
I had no idea what it did, so I asked and tossed the answer at the
top of the script.
2011-12-12 10:17:03 -05:00
Will Kahn-Greene
5b9ef3d58f Update README
* tweaked some language
* fixed some statements that aren't correct anymore
2011-12-12 09:53:41 -05:00
Will Kahn-Greene
528c8b8fab Tweak runtests to be more helpful
If nose isn't installed, then runtests.sh says it can't find nosetests
and exits, but doesn't tell you what you need to do to fix the situation.
This fixes that.
2011-12-12 09:46:23 -05:00
Christopher Allan Webber
c36c378273 Removed extraneous whitespace from video.html 2011-12-12 08:15:16 -06:00
Christopher Allan Webber
438dd8cd8f Add a note on how to up the upload size limit 2011-12-12 08:13:46 -06:00
Christopher Allan Webber
23caf305f2 Allow administrators to disable keeping the original. That's the new default! 2011-12-12 08:10:10 -06:00
Christopher Allan Webber
ed1840ee64 Mark "newer/older" buttons for translation 2011-12-12 07:35:47 -06:00
Jef van Schendel
b27067371d Style changes for media_uploader (now media_specs); removed margins from button_action buttons 2011-12-10 21:03:18 +01:00
Jef van Schendel
4ad9ac5ae0 Remove pagination images and replace them with unicode characters 2011-12-10 19:58:02 +01:00