From cvs at mail.worldforge.org Tue Jul 1 00:49:49 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Tue, 1 Jul 2008 03:49:49 -0400 (EDT) Subject: [WF-CVS] cvs: alex Message-ID: <20080701074949.89C131411A2B@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: alex 08/07/01 03:49:49 Modified files: libs/eris/Eris : Account.h Connection.h EntityRef.h Exceptions.h Metaserver.cpp Metaserver.h libs/eris/test : metaQuery.cpp Log message: Applying GCC 4.3 fixes from Marc Riese. From cvs at mail.worldforge.org Tue Jul 1 01:00:46 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Tue, 1 Jul 2008 04:00:46 -0400 (EDT) Subject: [WF-CVS] cvs: alex Message-ID: <20080701080046.0F1561408DEF@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: alex 08/07/01 04:00:46 Modified files: libs/mercator/Mercator: AreaShader.cpp AreaShader.h RandCache.h Log message: Applying GCC 4.3 fixes from Marc Riese. From commit-messages at dark.worldforge.org Tue Jul 1 06:52:01 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 1 Jul 2008 15:52:01 +0200 Subject: [WF-CVS] [WF media] r2782 - trunk/art/3d_objects/items/weapons Message-ID: <200807011352.m61Dq1gs024378@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Jul 1 16:20:09 2008 New Revision: 2782 Log: Added: trunk/art/3d_objects/items/weapons/ From commit-messages at dark.worldforge.org Tue Jul 1 06:54:49 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 1 Jul 2008 15:54:49 +0200 Subject: [WF-CVS] [WF media] r2783 - in trunk/3d_objects/items/tool/models: arrow broad_sword short_sword Message-ID: <200807011354.m61DsnZk024909@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Jul 1 16:23:00 2008 New Revision: 2783 Log: Removed: trunk/3d_objects/items/tool/models/arrow/ trunk/3d_objects/items/tool/models/broad_sword/ trunk/3d_objects/items/tool/models/short_sword/ From commit-messages at dark.worldforge.org Tue Jul 1 06:55:31 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 1 Jul 2008 15:55:31 +0200 Subject: [WF-CVS] [WF media] r2784 - in trunk/art/3d_objects: items/weapons/arrow items/weapons/broad_sword items/weapons/short_sword plants/trees/models/birch Message-ID: <200807011355.m61DtVFw024958@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Jul 1 16:23:43 2008 New Revision: 2784 Log: Added: trunk/art/3d_objects/items/weapons/arrow/ - copied from r2779, /trunk/3d_objects/items/tool/models/arrow/ trunk/art/3d_objects/items/weapons/broad_sword/ - copied from r2779, /trunk/3d_objects/items/tool/models/broad_sword/ trunk/art/3d_objects/items/weapons/short_sword/ - copied from r2779, /trunk/3d_objects/items/tool/models/short_sword/ Modified: trunk/art/3d_objects/plants/trees/models/birch/birch.emdl Modified: trunk/art/3d_objects/plants/trees/models/birch/birch.emdl ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Tue Jul 1 06:58:26 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 1 Jul 2008 15:58:26 +0200 Subject: [WF-CVS] [WF media] r2785 - in trunk/3d_objects: items/tool/models/chopping_block items/weapons tools weapons Message-ID: <200807011358.m61DwQN6025511@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Jul 1 16:26:38 2008 New Revision: 2785 Log: Added: trunk/3d_objects/items/tool/models/chopping_block/ - copied from r2748, /trunk/3d_objects/tools/chopping_block/ trunk/3d_objects/items/weapons/ - copied from r2748, /trunk/3d_objects/weapons/ Removed: trunk/3d_objects/tools/ trunk/3d_objects/weapons/ From commit-messages at dark.worldforge.org Tue Jul 1 07:15:33 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 1 Jul 2008 16:15:33 +0200 Subject: [WF-CVS] [WF media] r2786 - trunk/art/3d_objects/items/weapons/arrow Message-ID: <200807011415.m61EFXnv027685@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Jul 1 16:43:45 2008 New Revision: 2786 Log: Added: trunk/art/3d_objects/items/weapons/arrow/arrow.emdl (contents, props changed) Added: trunk/art/3d_objects/items/weapons/arrow/arrow.emdl ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Tue Jul 1 07:16:15 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Tue, 1 Jul 2008 16:16:15 +0200 Subject: [WF-CVS] [WF media] r2787 - in trunk/3d_objects/items/weapons: models textures textures/arrow Message-ID: <200807011416.m61EGFpX027766@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Tue Jul 1 16:44:28 2008 New Revision: 2787 Log: Added: trunk/3d_objects/items/weapons/models/ trunk/3d_objects/items/weapons/textures/ trunk/3d_objects/items/weapons/textures/arrow/ trunk/3d_objects/items/weapons/textures/arrow/D.png (contents, props changed) Added: trunk/3d_objects/items/weapons/textures/arrow/D.png ============================================================================== Binary file. No diff available. From cvs at mail.worldforge.org Tue Jul 1 08:04:25 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Tue, 1 Jul 2008 11:04:25 -0400 (EDT) Subject: [WF-CVS] cvs: alriddoch Message-ID: <20080701150425.367DF1411F96@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: alriddoch 08/07/01 11:04:25 Modified files: servers/cyphesis-C++: ChangeLog NEWS Log message: 2008-07-01 Al Riddoch * NEWS: Update NEWS announcement for release. * Release 0.5.16 From cvs at mail.worldforge.org Tue Jul 1 08:05:41 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Tue, 1 Jul 2008 11:05:41 -0400 (EDT) Subject: [WF-CVS] cvs: alriddoch Message-ID: <20080701150541.1E91D14185AE@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: alriddoch 08/07/01 11:05:41 Modified files: servers/cyphesis-C++: ChangeLog servers/cyphesis-C++/server: Makefile.am Log message: 2008-07-01 Al Riddoch * server/Makefile.am: Attempt to update the static libraries required for a portable binary. From cvs at mail.worldforge.org Tue Jul 1 08:25:02 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Tue, 1 Jul 2008 11:25:02 -0400 (EDT) Subject: [WF-CVS] cvs: alex Message-ID: <20080701152502.0E4811407ECA@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: alex 08/07/01 11:25:02 Modified files: libs/mercator : ChangeLog libs/varconf : ChangeLog libs/Atlas-C++ : ChangeLog libs/eris : ChangeLog Log message: Adding forgotten changelog entry. From commitmsg at worldforge.de Tue Jul 1 13:58:45 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Tue, 1 Jul 2008 22:58:45 +0200 (CEST) Subject: [WF-CVS] [WF-git] Alex' GSoC-2008 project branch, entity_creator, updated. af4defdf652264cb7ba2c1caf91986133fc4d81a Message-ID: <20080701205847.4AC772977801E@worldforge.de> The branch, entity_creator has been updated via af4defdf652264cb7ba2c1caf91986133fc4d81a (commit) via 46e5947eebba18b2d178fba50778cedbfd666289 (commit) from c8c05f4e6e099c687c8ad12e636151a700810060 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit af4defdf652264cb7ba2c1caf91986133fc4d81a Author: Alexey Torkhov Date: Tue Jul 1 23:42:35 2008 +0400 Changing way placeholders are replaced. Now we are replacing whole element with placeholder, but saving "name" attribute. commit 46e5947eebba18b2d178fba50778cedbfd666289 Author: Alexey Torkhov Date: Tue Jul 1 01:38:24 2008 +0400 Fixing wrong throw. ----------------------------------------------------------------------- Summary of changes: src/components/ogre/manipulation/EntityRecipe.cpp | 8 +++- .../ogre/manipulation/GUIAdapterBindings.cpp | 43 ++++++++++++++++--- 2 files changed, 43 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/src/components/ogre/manipulation/EntityRecipe.cpp b/src/components/ogre/manipulation/EntityRecipe.cpp index 86cdb1b..ae01d10 100644 --- a/src/components/ogre/manipulation/EntityRecipe.cpp +++ b/src/components/ogre/manipulation/EntityRecipe.cpp @@ -126,6 +126,12 @@ EntityRecipe::SpecIterator::SpecIterator(EntityRecipe* recipe) : TiXmlVisitor(), bool EntityRecipe::SpecIterator::Visit(const TiXmlText& textNode) { + // We should be the only child of our parent + if (textNode.Parent()->FirstChild() != textNode.Parent()->LastChild()) + { + return false; + } + std::string text = textNode.ValueStr(); // If text looks like placeholder, try to look up it in bindings and associate if found @@ -134,7 +140,7 @@ bool EntityRecipe::SpecIterator::Visit(const TiXmlText& textNode) BindingsStore::iterator bindings = mRecipe->mBindings.find(text.substr(1)); if (bindings != mRecipe->mBindings.end()) { - bindings->second->associateXmlElement(const_cast(textNode)); + bindings->second->associateXmlElement(const_cast(*textNode.Parent())); S_LOG_VERBOSE("Associated " << bindings->first << " with " << text); } else diff --git a/src/components/ogre/manipulation/GUIAdapterBindings.cpp b/src/components/ogre/manipulation/GUIAdapterBindings.cpp index 2caf8d7..035ed32 100644 --- a/src/components/ogre/manipulation/GUIAdapterBindings.cpp +++ b/src/components/ogre/manipulation/GUIAdapterBindings.cpp @@ -69,8 +69,9 @@ void GUIAdapterBindings::associateXmlElement(TiXmlNode& element) void GUIAdapterBindings::setValue(Atlas::Message::Element& val) { TiXmlNode* parent = mElement->Parent(); - TiXmlNode* newNode; +/* + TiXmlNode* newNode; if (val.isNone()) { // Bah! None! Let's forge out something @@ -93,16 +94,42 @@ void GUIAdapterBindings::setValue(Atlas::Message::Element& val) { newNode = new TiXmlText(val.asString()); } - else if (val.isMap()) + else if (val.isMap() || val.isList()) { - newNode = convertAtlasToXml(val); } else { - throw new std::logic_error("New unknown Atlas element type seen in the wild for the first time."); + throw std::logic_error("New unknown Atlas element type seen in the wild for the first time."); } +*/ + + // Got Atlas XML representation of adapter value + TiXmlNode* xmlNode = convertAtlasToXml(val); - mElement = parent->ReplaceChild(mElement, *newNode); + if (xmlNode->NoChildren()) + { + throw std::logic_error("Empty result from adapter."); + } + + // Checking node validity + TiXmlElement* newNode = xmlNode->ToElement()->FirstChildElement(); + if (newNode && xmlNode->FirstChild() == xmlNode->LastChild()) + { + const char* name = mElement->ToElement()->Attribute("name"); + + // Saving "name" attribute of old node, if any + if (name) + { + newNode->SetAttribute("name", name); + } + + // Replacing placeholder node with received value + mElement = parent->ReplaceChild(mElement, *newNode); + } + else + { + throw std::logic_error("Adapter returns Atlas message with multiply elements."); + } delete newNode; } @@ -116,9 +143,11 @@ TiXmlNode* GUIAdapterBindings::convertAtlasToXml(Atlas::Message::Element& val) Atlas::Formatter formatter(data, codec); Atlas::Message::Encoder encoder(formatter); formatter.streamBegin(); - encoder.streamMessageElement(val.asMap()); + encoder.listElementItem(val); formatter.streamEnd(); + S_LOG_VERBOSE(" got adapter value " << data.str()); + // Create TinyXml node TiXmlDocument xmlDoc; xmlDoc.Parse(data.str().c_str()); @@ -126,7 +155,7 @@ TiXmlNode* GUIAdapterBindings::convertAtlasToXml(Atlas::Message::Element& val) { throw std::logic_error("TinyXml unable to parse Atlas generated data."); } - + return xmlDoc.RootElement()->Clone(); } -- Alex' GSoC-2008 project From commitmsg at worldforge.de Tue Jul 1 15:12:42 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Wed, 2 Jul 2008 00:12:42 +0200 (CEST) Subject: [WF-CVS] [WF-git] WorldForge Open Media Browser/Archive Tool branch, master, updated. 0.0.1-6-gd361dda Message-ID: <20080701221242.CFD132977801E@worldforge.de> The branch, master has been updated via d361dda3447f3ad424e9a282bf91b4369f407df8 (commit) via 9cd71ed99acca28814551020996fa52e6413b1a7 (commit) via 91a611afd7f8c339f707e2ffa386634ced5a884b (commit) via fcca6b0b7ac7a7a17cc82e30e065977caf08e313 (commit) via 8b50be0ea7917ea3ad627d95e5dae315d33e00aa (commit) via e3f53d313416dbe051d9def0dd29adc2d59ff0f1 (commit) from 0285b6526aacfb70f3003c933a89fd24c84b0685 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d361dda3447f3ad424e9a282bf91b4369f407df8 Author: Kai Blin Date: Wed Jul 2 00:05:21 2008 +0200 Change templates to better handle the "data not loaded" case. commit 9cd71ed99acca28814551020996fa52e6413b1a7 Author: Kai Blin Date: Tue Jul 1 23:41:34 2008 +0200 0.0.2 build changes. commit 91a611afd7f8c339f707e2ffa386634ced5a884b Author: Kai Blin Date: Tue Jul 1 19:53:56 2008 +0200 Bump version to 0.0.2 commit fcca6b0b7ac7a7a17cc82e30e065977caf08e313 Author: Kai Blin Date: Tue Jul 1 19:52:47 2008 +0200 Implement breadcrumb navigation commit 8b50be0ea7917ea3ad627d95e5dae315d33e00aa Author: Kai Blin Date: Tue Jul 1 12:24:53 2008 +0200 Implement basic file view. commit e3f53d313416dbe051d9def0dd29adc2d59ff0f1 Author: Kai Blin Date: Tue Jul 1 12:23:22 2008 +0200 Load site name from config file ----------------------------------------------------------------------- Summary of changes: development.ini | 1 + setup.py | 2 +- wombat.egg-info/PKG-INFO | 2 +- wombat.egg-info/SOURCES.txt | 4 +++ wombat.egg-info/paste_deploy_config.ini_tmpl | 3 ++ wombat/controllers/dir.py | 6 ++-- wombat/controllers/file.py | 31 ++++++++++++++++++++++--- wombat/controllers/show.py | 5 +--- wombat/lib/app_globals.py | 2 +- wombat/lib/helpers.py | 19 ++++++++++++++++ wombat/model/dir.py | 3 ++ wombat/model/file.py | 10 ++++++-- wombat/model/rootdir.py | 2 +- wombat/templates/comments.mako | 1 + wombat/templates/details.mako | 14 +++++++++++ wombat/templates/dir.mako | 2 +- wombat/templates/dirlist.mako | 2 +- wombat/templates/file.mako | 15 ++++++++++++ wombat/templates/filelist.mako | 2 +- wombat/templates/index.mako | 3 -- wombat/templates/menu.mako | 4 +- wombat/templates/nav.mako | 9 ++++++- wombat/templates/pagination.mako | 3 ++ 23 files changed, 118 insertions(+), 27 deletions(-) create mode 100644 wombat/templates/comments.mako create mode 100644 wombat/templates/details.mako create mode 100644 wombat/templates/file.mako create mode 100644 wombat/templates/pagination.mako Changeset truncated at 500 lines: diff --git a/development.ini b/development.ini index 54ce31c..0716573 100644 --- a/development.ini +++ b/development.ini @@ -21,6 +21,7 @@ full_stack = true cache_dir = %(here)s/data rootdir_cache = %(here)s/data/rootdir.pickle media_dir = %(here)s/media +site_name = WOMBAT Demo Site beaker.session.key = wombat beaker.session.secret = somesecret diff --git a/setup.py b/setup.py index fcc4544..9f84e62 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ except ImportError: setup( name='wombat', - version="0.0.1", + version="0.0.2", description='WorldForge Open Media Browser/Archive Tool', author='Kai Blin', author_email='kai.blin at gmail.com', diff --git a/wombat.egg-info/PKG-INFO b/wombat.egg-info/PKG-INFO index 9583c14..d214206 100644 --- a/wombat.egg-info/PKG-INFO +++ b/wombat.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: wombat -Version: 0.0.1dev +Version: 0.0.2dev Summary: WorldForge Open Media Browser/Archive Tool Home-page: http://wiki.worldforge.org/wiki/Wombat Author: Kai Blin diff --git a/wombat.egg-info/SOURCES.txt b/wombat.egg-info/SOURCES.txt index 31d0962..23f80b9 100644 --- a/wombat.egg-info/SOURCES.txt +++ b/wombat.egg-info/SOURCES.txt @@ -60,13 +60,17 @@ wombat/public/images/word.gif wombat/public/images/zipdir.gif wombat/templates/additions.mako wombat/templates/base.mako +wombat/templates/comments.mako +wombat/templates/details.mako wombat/templates/dir.mako wombat/templates/dirlist.mako +wombat/templates/file.mako wombat/templates/filelist.mako wombat/templates/index.mako wombat/templates/menu.mako wombat/templates/messages.mako wombat/templates/nav.mako +wombat/templates/pagination.mako wombat/templates/please_scan.mako wombat/templates/searchbox.mako wombat/templates/serverinfo.mako diff --git a/wombat.egg-info/paste_deploy_config.ini_tmpl b/wombat.egg-info/paste_deploy_config.ini_tmpl index 051a9a9..616136d 100644 --- a/wombat.egg-info/paste_deploy_config.ini_tmpl +++ b/wombat.egg-info/paste_deploy_config.ini_tmpl @@ -18,6 +18,9 @@ port = 5000 use = egg:wombat full_stack = true cache_dir = %(here)s/data +rootdir_cache = %(here)s/data/rootdir.pickle +media_dir = %(here)s/media +site_name = WOMBAT Demo Site beaker.session.key = wombat beaker.session.secret = ${app_instance_secret} app_instance_uuid = ${app_instance_uuid} diff --git a/wombat/controllers/dir.py b/wombat/controllers/dir.py index 03285e4..72b29d5 100644 --- a/wombat/controllers/dir.py +++ b/wombat/controllers/dir.py @@ -11,7 +11,7 @@ log = logging.getLogger(__name__) class DirController(BaseController): def index(self): - c.name = 'WOMBAT' + c.name = config['app_conf']['site_name'] c.title = 'Directory view' c.messages = [] if not os.path.exists(config.get('app_conf').get('rootdir_cache')): @@ -29,8 +29,8 @@ class DirController(BaseController): req_path = "" c.req_path = req_path try: - c.dir = c.root_dir.getDir(req_path) + c.obj = c.root_dir.getDir(req_path) except KeyError: - c.dir = c.root_dir + c.obj = c.root_dir return render('/dir.mako') diff --git a/wombat/controllers/file.py b/wombat/controllers/file.py index fae1cde..714d422 100644 --- a/wombat/controllers/file.py +++ b/wombat/controllers/file.py @@ -1,13 +1,36 @@ import logging from wombat.lib.base import * +from pylons import config +import os.path +import cPickle log = logging.getLogger(__name__) class FileController(BaseController): def index(self): - # Return a rendered template - # return render('/some/template.mako') - # or, Return a response - return 'Implement me!' + c.name = config['app_conf']['site_name'] + c.title = 'File view' + c.messages = [] + if not os.path.exists(config.get('app_conf').get('rootdir_cache')): + c.messages.append("Failed to locate cached data.") + return render('/please_scan.mako') + + f = open(config.get('app_conf').get('rootdir_cache'), 'r') + try: + c.root_dir = cPickle.load(f) + finally: + f.close() + try: + req_path = request.params['path'] + except KeyError: + req_path = "" + c.req_path = req_path + try: + c.obj = c.root_dir.getFile(req_path) + except KeyError: + c.messages.append("Failed to locate file '%s'." % req_path) + c.obj = c.root_dir + return render('/dir.mako') + return render('/file.mako') diff --git a/wombat/controllers/show.py b/wombat/controllers/show.py index d3ae1b2..618c85e 100644 --- a/wombat/controllers/show.py +++ b/wombat/controllers/show.py @@ -2,16 +2,13 @@ import logging from wombat.lib.base import * from pylons import config -import os -import os.path -import cPickle log = logging.getLogger(__name__) class ShowController(BaseController): def index(self): - c.name = 'WOMBAT' + c.name = config['app_conf']['site_name'] c.title = 'Welcome' c.messages = [] return render('/index.mako') diff --git a/wombat/lib/app_globals.py b/wombat/lib/app_globals.py index ac11534..3e546e3 100644 --- a/wombat/lib/app_globals.py +++ b/wombat/lib/app_globals.py @@ -11,4 +11,4 @@ class Globals(object): initialization and is available during requests via the 'g' variable """ - self.version = "0.0.1" + self.version = "0.0.2" diff --git a/wombat/lib/helpers.py b/wombat/lib/helpers.py index 0eb7c8f..40e4990 100644 --- a/wombat/lib/helpers.py +++ b/wombat/lib/helpers.py @@ -4,3 +4,22 @@ Consists of functions to typically be used within templates, but also available to Controllers. This module is available to both as 'h'. """ from webhelpers import * +import os.path +import string + +def getBreadcrumbTrail(rootdir, obj): + trail = [] + dir_str = os.path.dirname(obj.getPath()) + dir_trail = string.split(dir_str, os.path.sep) + entry_str = "" + trail.append(rootdir) + for entry in dir_trail: + entry_str = os.path.join(entry_str, entry) + if entry_str == "": + continue + dir = rootdir.getDir(entry_str) + trail.append(dir) + + return trail + + diff --git a/wombat/model/dir.py b/wombat/model/dir.py index 2089fa4..50373d5 100644 --- a/wombat/model/dir.py +++ b/wombat/model/dir.py @@ -39,3 +39,6 @@ class Dir: def getName(self): return self.path + def getType(self): + return "dir" + diff --git a/wombat/model/file.py b/wombat/model/file.py index da7ff9d..dabf9c3 100644 --- a/wombat/model/file.py +++ b/wombat/model/file.py @@ -13,20 +13,21 @@ # this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -from os.path import getsize, join +from os.path import getsize, join, basename from pylons import config class File: def __init__(self, path): self.path = path self.type = "Generic file" - self.size = getsize(join(config['app_conf']['media_dir'], path)) + self.fullpath = join(config['app_conf']['media_dir'], path) + self.size = getsize(self.fullpath) def getPath(self): return self.path def getName(self): - return self.path + return basename(self.path) def getSize(self): return self.size @@ -39,3 +40,6 @@ class File: size /= 1024.0 i += 1 return "%.2f %s" % (size, size_name[i]) + + def getType(self): + return "file" diff --git a/wombat/model/rootdir.py b/wombat/model/rootdir.py index c90f9ef..fd802b8 100644 --- a/wombat/model/rootdir.py +++ b/wombat/model/rootdir.py @@ -30,7 +30,7 @@ class RootDir(Dir): self.scanpath = path def getName(self): - return "root" + return "/" def addDir(self, dir): self.all_dirs[dir.path] = dir diff --git a/wombat/templates/comments.mako b/wombat/templates/comments.mako new file mode 100644 index 0000000..b8325d7 --- /dev/null +++ b/wombat/templates/comments.mako @@ -0,0 +1 @@ +
Implement comments
diff --git a/wombat/templates/details.mako b/wombat/templates/details.mako new file mode 100644 index 0000000..78b5609 --- /dev/null +++ b/wombat/templates/details.mako @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +
Filename:${c.obj.getName()}
Filesize:${c.obj.getPrettySize()}
Direct Link:${c.obj.getPath()}
diff --git a/wombat/templates/dir.mako b/wombat/templates/dir.mako index 5d84442..60d8d6b 100644 --- a/wombat/templates/dir.mako +++ b/wombat/templates/dir.mako @@ -9,7 +9,7 @@
${c.name}
-
Viewing ${c.dir.getName()} directory.
+
Viewing ${c.obj.getName()} directory.
<%include file="dirlist.mako"/> <%include file="filelist.mako"/> diff --git a/wombat/templates/dirlist.mako b/wombat/templates/dirlist.mako index af7551e..b4fa46c 100644 --- a/wombat/templates/dirlist.mako +++ b/wombat/templates/dirlist.mako @@ -1,7 +1,7 @@ <% i = 0 %> -%for dir in c.dir.getSubdirs(): +%for dir in c.obj.getSubdirs():
* diff --git a/wombat/templates/file.mako b/wombat/templates/file.mako new file mode 100644 index 0000000..d0faa19 --- /dev/null +++ b/wombat/templates/file.mako @@ -0,0 +1,15 @@ +<%inherit file="base.mako"/> +
+
+<%include file="nav.mako"/> +
+ +
${c.obj.getName()}
+ +
Viewing ${c.obj.getName()}.
+ +<%include file="details.mako"/> +<%include file="pagination.mako"/> +<%include file="comments.mako"/> + +
diff --git a/wombat/templates/filelist.mako b/wombat/templates/filelist.mako index fd07619..7dc92db 100644 --- a/wombat/templates/filelist.mako +++ b/wombat/templates/filelist.mako @@ -2,7 +2,7 @@ <% i = 0 %> -%for file in c.dir.getFiles(): +%for file in c.obj.getFiles():
* diff --git a/wombat/templates/index.mako b/wombat/templates/index.mako index 10efc6b..bcc2687 100644 --- a/wombat/templates/index.mako +++ b/wombat/templates/index.mako @@ -1,9 +1,6 @@ <%inherit file="base.mako"/>
-<%include file="nav.mako"/> -
-
<%include file="additions.mako"/>
diff --git a/wombat/templates/menu.mako b/wombat/templates/menu.mako index a9b039a..b301a34 100644 --- a/wombat/templates/menu.mako +++ b/wombat/templates/menu.mako @@ -1,6 +1,6 @@
    -%if c.dir != '': -%for dir in c.dir.getSubdirs(): +%if c.obj != '' and c.obj.getType() == "dir": +%for dir in c.obj.getSubdirs():
  • ${dir.getName()}
    • diff --git a/wombat/templates/nav.mako b/wombat/templates/nav.mako index 59d0148..052ece9 100644 --- a/wombat/templates/nav.mako +++ b/wombat/templates/nav.mako @@ -1,2 +1,9 @@
    Navigation
    - Implement breadcrumb navigation! +%if c.obj != '' and c.root_dir != '': +%for entry in h.getBreadcrumbTrail(c.root_dir, c.obj): + * ${entry.getName()} +%endfor +%else: + Directory data not loaded. +%endif diff --git a/wombat/templates/pagination.mako b/wombat/templates/pagination.mako new file mode 100644 index 0000000..b57882e --- /dev/null +++ b/wombat/templates/pagination.mako @@ -0,0 +1,3 @@ + -- WorldForge Open Media Browser/Archive Tool From commit-messages at dark.worldforge.org Tue Jul 1 15:52:14 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 00:52:14 +0200 Subject: [WF-CVS] [WF media] r2788 - trunk/3d_objects/structures/models/wooden_fence Message-ID: <200807012252.m61MqEIr020830@rzcomm22.rz.tu-bs.de> Author: erik Date: Wed Jul 2 01:20:24 2008 New Revision: 2788 Log: Added old pig sty mesh to keep compatability with the older world. As we move to a new world we'll remove this, and construct our fences through the use of the fence sections instead, but for now we'll have to keep this around. Added: trunk/3d_objects/structures/models/wooden_fence/pig-sty.mesh (contents, props changed) Added: trunk/3d_objects/structures/models/wooden_fence/pig-sty.mesh ============================================================================== Binary file. No diff available. From commit-messages at dark.worldforge.org Wed Jul 2 06:47:37 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 15:47:37 +0200 Subject: [WF-CVS] [WF media] r2789 - trunk/art/3d_objects/items/weapons/arrow Message-ID: <200807021347.m62Dlblw009191@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:15:51 2008 New Revision: 2789 Log: Modified: trunk/art/3d_objects/items/weapons/arrow/arrow.emdl Modified: trunk/art/3d_objects/items/weapons/arrow/arrow.emdl ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Wed Jul 2 06:51:44 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 15:51:44 +0200 Subject: [WF-CVS] [WF media] r2790 - trunk/art/primitives Message-ID: <200807021351.m62DpiAQ009427@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:20:02 2008 New Revision: 2790 Log: Added: trunk/art/primitives/ - copied from r2596, /trunk/3d_objects/primitives/ From commit-messages at dark.worldforge.org Wed Jul 2 06:53:47 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 15:53:47 +0200 Subject: [WF-CVS] [WF media] r2791 - in trunk/3d_objects/items/weapons: models/arrow textures/arrow Message-ID: <200807021353.m62DrlJ7009971@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:20:47 2008 New Revision: 2791 Log: added arrow, texture needs work Added: trunk/3d_objects/items/weapons/models/arrow/ trunk/3d_objects/items/weapons/models/arrow/arrow.material trunk/3d_objects/items/weapons/models/arrow/arrow.mesh (contents, props changed) Modified: trunk/3d_objects/items/weapons/textures/arrow/D.png Added: trunk/3d_objects/items/weapons/models/arrow/arrow.material ============================================================================== --- (empty file) +++ trunk/3d_objects/items/weapons/models/arrow/arrow.material Wed Jul 2 16:20:47 2008 @@ -0,0 +1,26 @@ + +material /global/items/weapons/arrow +{ + receive_shadows off + technique + { + pass + { + specular 0.449020 0.449020 0.449020 50.000000 + texture_unit + { + texture ..\..\textures\arrow\D.png + + + } + + diffuse 1.000000 1.000000 1.000000 + emissive 0.500000 0.500000 0.300000 + } + } +} + + + + + Added: trunk/3d_objects/items/weapons/models/arrow/arrow.mesh ============================================================================== Binary file. No diff available. Modified: trunk/3d_objects/items/weapons/textures/arrow/D.png ============================================================================== Binary files. No diff available. From commit-messages at dark.worldforge.org Wed Jul 2 06:59:45 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 15:59:45 +0200 Subject: [WF-CVS] [WF media] r2792 - in trunk/3d_objects: clothes creatures Message-ID: <200807021359.m62DxjJH010672@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:28:03 2008 New Revision: 2792 Log: moved to skeletons Removed: trunk/3d_objects/clothes/ trunk/3d_objects/creatures/ From commit-messages at dark.worldforge.org Wed Jul 2 07:00:45 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 16:00:45 +0200 Subject: [WF-CVS] [WF media] r2793 - in trunk/3d_objects: containers items/containers Message-ID: <200807021400.m62E0jUG010865@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:29:04 2008 New Revision: 2793 Log: moved containers to items area Added: trunk/3d_objects/items/containers/ - copied from r2791, /trunk/3d_objects/containers/ Removed: trunk/3d_objects/containers/ From commit-messages at dark.worldforge.org Wed Jul 2 07:05:23 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 16:05:23 +0200 Subject: [WF-CVS] [WF media] r2794 - in trunk/3d_objects/items: parchments sheet Message-ID: <200807021405.m62E5NoL011487@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:33:39 2008 New Revision: 2794 Log: Added: trunk/3d_objects/items/parchments/ - copied from r2793, /trunk/3d_objects/items/sheet/ Removed: trunk/3d_objects/items/sheet/ From commit-messages at dark.worldforge.org Wed Jul 2 07:05:56 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 16:05:56 +0200 Subject: [WF-CVS] [WF media] r2795 - in trunk/3d_skeletons: clothes creatures Message-ID: <200807021405.m62E5uN9011578@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:34:15 2008 New Revision: 2795 Log: Added: trunk/3d_skeletons/clothes/ - copied from r2748, /trunk/3d_objects/clothes/ trunk/3d_skeletons/creatures/ - copied from r2748, /trunk/3d_objects/creatures/ From commit-messages at dark.worldforge.org Wed Jul 2 07:07:34 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 16:07:34 +0200 Subject: [WF-CVS] [WF media] r2796 - trunk/3d_objects/environment/models Message-ID: <200807021407.m62E7Ydm012032@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:35:54 2008 New Revision: 2796 Log: Added: trunk/3d_objects/environment/models/ From commit-messages at dark.worldforge.org Wed Jul 2 07:09:07 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 16:09:07 +0200 Subject: [WF-CVS] [WF media] r2797 - in trunk/3d_objects/environment: boulder cave models/boulder models/cave models/monster_skeleton models/roots models/skyboxes models/spanish_moss models/stalactites monster_skeleton roots spanish_moss stalactites Message-ID: <200807021409.m62E97Ei012089@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:37:27 2008 New Revision: 2797 Log: Added: trunk/3d_objects/environment/models/boulder/ - copied from r2791, /trunk/3d_objects/environment/boulder/ trunk/3d_objects/environment/models/cave/ - copied from r2791, /trunk/3d_objects/environment/cave/ trunk/3d_objects/environment/models/monster_skeleton/ - copied from r2791, /trunk/3d_objects/environment/monster_skeleton/ trunk/3d_objects/environment/models/roots/ - copied from r2791, /trunk/3d_objects/environment/roots/ trunk/3d_objects/environment/models/skyboxes/ - copied from r2791, /trunk/3d_objects/environment/skyboxes/ trunk/3d_objects/environment/models/spanish_moss/ - copied from r2791, /trunk/3d_objects/environment/spanish_moss/ trunk/3d_objects/environment/models/stalactites/ - copied from r2791, /trunk/3d_objects/environment/stalactites/ Removed: trunk/3d_objects/environment/boulder/ trunk/3d_objects/environment/cave/ trunk/3d_objects/environment/monster_skeleton/ trunk/3d_objects/environment/roots/ trunk/3d_objects/environment/spanish_moss/ trunk/3d_objects/environment/stalactites/ From commit-messages at dark.worldforge.org Wed Jul 2 07:11:15 2008 From: commit-messages at dark.worldforge.org (commit-messages at dark.worldforge.org) Date: Wed, 2 Jul 2008 16:11:15 +0200 Subject: [WF-CVS] [WF media] r2798 - in trunk/3d_objects/environment: models/boulder/moraf_rock models/cave/felsite_cave models/cave/moraf models/monster_skeleton/petrified models/roots/bare_roots models/spanish_moss/slimy_moss models/stalactites/limestone textures/bare_roots textures/felsite_cave textures/limestone textures/moraf textures/moraf_rock textures/petrified textures/slimy_moss Message-ID: <200807021411.m62EBFVl012248@rzcomm22.rz.tu-bs.de> Author: xrenmilay Date: Wed Jul 2 16:39:34 2008 New Revision: 2798 Log: Added: trunk/3d_objects/environment/textures/bare_roots/ - copied from r2797, /trunk/3d_objects/environment/models/roots/bare_roots/ trunk/3d_objects/environment/textures/felsite_cave/ - copied from r2797, /trunk/3d_objects/environment/models/cave/felsite_cave/ trunk/3d_objects/environment/textures/limestone/ - copied from r2797, /trunk/3d_objects/environment/models/stalactites/limestone/ trunk/3d_objects/environment/textures/moraf/ - copied from r2797, /trunk/3d_objects/environment/models/cave/moraf/ trunk/3d_objects/environment/textures/moraf_rock/ - copied from r2797, /trunk/3d_objects/environment/models/boulder/moraf_rock/ trunk/3d_objects/environment/textures/petrified/ - copied from r2797, /trunk/3d_objects/environment/models/monster_skeleton/petrified/ trunk/3d_objects/environment/textures/slimy_moss/ - copied from r2797, /trunk/3d_objects/environment/models/spanish_moss/slimy_moss/ Removed: trunk/3d_objects/environment/models/boulder/moraf_rock/ trunk/3d_objects/environment/models/cave/felsite_cave/ trunk/3d_objects/environment/models/cave/moraf/ trunk/3d_objects/environment/models/monster_skeleton/petrified/ trunk/3d_objects/environment/models/roots/bare_roots/ trunk/3d_objects/environment/models/spanish_moss/slimy_moss/ trunk/3d_objects/environment/models/stalactites/limestone/ From commitmsg at worldforge.de Wed Jul 2 07:57:08 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Wed, 2 Jul 2008 16:57:08 +0200 (CEST) Subject: [WF-CVS] [WF-git] The Ember WorldForge client. branch, master, updated. 1afecbe6cec3521b29b1e3b1f4d6f8970961672e Message-ID: <20080702145712.A6B2129178002@worldforge.de> The branch, master has been updated via 1afecbe6cec3521b29b1e3b1f4d6f8970961672e (commit) from 844192c7e1ff807297c7d777002e8c138877f026 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1afecbe6cec3521b29b1e3b1f4d6f8970961672e Author: Sean Ryan Date: Wed Jul 2 10:56:59 2008 -0400 added separate check for sigc++ library rather than relying only on the WF lib check ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/configure.ac b/configure.ac index cab859f..db02594 100644 --- a/configure.ac +++ b/configure.ac @@ -377,6 +377,15 @@ PKG_CHECK_MODULES(FREEALUT, freealut >= $FREEALUT_VERSION, #SDL_VERSION=1.2.0 #AC_SUBST(SDL_VERSION) +# check for sigc++ separately from the WF checks +PKG_CHECK_MODULES(SIG, [sigc++-2.0 >= 2.0], + [ + CXXFLAGS="$CXXFLAGS $SIG_CFLAGS" + LDFLAGS="$LDFLAGS $SIG_LIBS" + ], + [ + AC_MSG_ERROR([Couldn't find SIGC++2.0]) + ]) # Check for the WorldForge libs PKG_CHECK_MODULES(WF, [eris-1.3 >= 1.3.13 \ -- The Ember WorldForge client. From cvs at mail.worldforge.org Wed Jul 2 13:01:34 2008 From: cvs at mail.worldforge.org (worldforge cvs) Date: Wed, 2 Jul 2008 16:01:34 -0400 (EDT) Subject: [WF-CVS] cvs: erik Message-ID: <20080702200134.0D89714095E9@moria.seul.org> CVSROOT: /home/cvspsrv/worldforge Module name: forge Changes by: erik 08/07/02 16:01:34 Modified files: libs/mercator : ChangeLog libs/mercator/Mercator: Segment.cpp Log message: 2008-07-02 Erik Hjortsberg * Mercator/Segment.cpp: Delete surfaces at shut down, else we'll have a memory leak. From commitmsg at worldforge.de Wed Jul 2 13:47:12 2008 From: commitmsg at worldforge.de (commitmsg at worldforge.de) Date: Wed, 2 Jul 2008 22:47:12 +0200 (CEST) Subject: [WF-CVS] [WF-git] Alex' GSoC-2008 project branch, entity_creator, updated. c4e2e1d4d663073678ed71d8e229133aa0a2dd26 Message-ID: <20080702204713.7A5C229178002@worldforge.de> The branch, entity_creator has been updated via c4e2e1d4d663073678ed71d8e229133aa0a2dd26 (commit) from af4defdf652264cb7ba2c1caf91986133fc4d81a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c4e2e1d4d663073678ed71d8e229133aa0a2dd26 Author: Alexey Torkhov Date: Thu Jul 3 00:46:53 2008 +0400 Trying to populate entity with values returned from Lua. ----------------------------------------------------------------------- Summary of changes: src/components/ogre/manipulation/EntityRecipe.cpp | 36 ++++++++++++++++++-- .../ogre/manipulation/GUIAdapterBindings.cpp | 2 +- .../ogre/manipulation/GUIAdapterBindings.h | 2 +- .../manipulation/entityrecipes/test.entityrecipe | 7 +++- 4 files changed, 41 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/src/components/ogre/manipulation/EntityRecipe.cpp b/src/components/ogre/manipulation/EntityRecipe.cpp index ae01d10..cddd6cf 100644 --- a/src/components/ogre/manipulation/EntityRecipe.cpp +++ b/src/components/ogre/manipulation/EntityRecipe.cpp @@ -27,10 +27,14 @@ #include "EntityRecipe.h" #include "components/ogre/scripting/LuaScriptingCallContext.h" +#include "components/ogre/scripting/LuaScriptingProvider.h" #include "services/scripting/ScriptingService.h" #include "services/EmberServices.h" #include +#include +#include + namespace EmberOgre { EntityRecipe::EntityRecipe(Ogre::ResourceManager* creator, const Ogre::String& name, Ogre::ResourceHandle handle, @@ -156,16 +160,18 @@ void EntityRecipe::createEntity() { S_LOG_VERBOSE("Creating entity."); + // Loading script code + Ember::EmberServices::getSingleton().getScriptingService()->executeCode(mScript, "LuaScriptingProvider"); + // Walking through adapter bindings for (BindingsStore::iterator I = mBindings.begin(); I != mBindings.end(); ++I) { const std::string& func = I->second->getFunc(); S_LOG_VERBOSE(" binding: " << I->first << " to func " << func); - // TODO: handle real functions if (func.empty()) { - const std::vector& adapters = I->second->getAdapters(); + std::vector& adapters = I->second->getAdapters(); if (adapters.size() == 1) { @@ -175,9 +181,33 @@ void EntityRecipe::createEntity() } else { - S_LOG_WARNING("Wrong number of adapters."); + S_LOG_WARNING("Should be only one adapter without calling function."); } } + else + { + LuaScriptingCallContext callContext; + + lua_State* L = static_cast(Ember::EmberServices::getSingleton().getScriptingService()->getProviderFor("LuaScriptingProvider"))->getLuaState(); + + // Pushing function params + std::vector& adapters = I->second->getAdapters(); + for (std::vector::iterator J = adapters.begin(); J != adapters.end(); J++) + { + std::string adapterName = *J; + Atlas::Message::Element* val = new Atlas::Message::Element(mGUIAdapters[adapterName]->getValue()); + tolua_pushusertype_and_takeownership(L, val, "Atlas::Message::Element"); + } + + // Calling test function + Ember::EmberServices::getSingleton().getScriptingService()->callFunction(func, "LuaScriptingProvider", &callContext); + + LuaRef returnValue( callContext.getReturnValue() ); + + Atlas::Message::Element returnObj; + returnObj = returnValue.asObject("Atlas::Message::Element"); + I->second->setValue(returnObj); + } } /* diff --git a/src/components/ogre/manipulation/GUIAdapterBindings.cpp b/src/components/ogre/manipulation/GUIAdapterBindings.cpp index 035ed32..7cc89a0 100644 --- a/src/components/ogre/manipulation/GUIAdapterBindings.cpp +++ b/src/components/ogre/manipulation/GUIAdapterBindings.cpp @@ -56,7 +56,7 @@ void GUIAdapterBindings::addAdapter(std::string adapterName) mAdapters.push_back(adapterName); } -const std::vector& GUIAdapterBindings::getAdapters() +std::vector& GUIAdapterBindings::getAdapters() { return mAdapters; } diff --git a/src/components/ogre/manipulation/GUIAdapterBindings.h b/src/components/ogre/manipulation/GUIAdapterBindings.h index a7d7d7d..3492292 100644 --- a/src/components/ogre/manipulation/GUIAdapterBindings.h +++ b/src/components/ogre/manipulation/GUIAdapterBindings.h @@ -59,7 +59,7 @@ public: /** * Return adapters list */ - const std::vector& getAdapters(); + std::vector& getAdapters(); /** * Associates this bindings with XML element diff --git a/src/components/ogre/manipulation/entityrecipes/test.entityrecipe b/src/components/ogre/manipulation/entityrecipes/test.entityrecipe index 1b15f34..fc667ef 100644 --- a/src/components/ogre/manipulation/entityrecipes/test.entityrecipe +++ b/src/components/ogre/manipulation/entityrecipes/test.entityrecipe @@ -23,7 +23,7 @@ - + @@ -31,6 +31,11 @@