src/inputs/digg.cpp src/inputs/digg.h @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: gltrail -# Generated by qmake (2.01a) (Qt 4.3.2) on: Sat Mar 15 17:33:31 2008 +# Generated by qmake (2.01a) (Qt 4.3.2) on: Sat Mar 15 18:26:00 2008 # Project: gltrail.pro # Template: subdirs # Command: /usr/bin/qmake -unix -o Makefile gltrail.pro Makefile @@ -4,6 +4,7 @@ 3. cp gltrail.ini-example gltrail.ini (and replace with your information) 4. ./bin/gltrail gltrail.ini + ./bin/gltrail --digg Note: You'll need public-key ssh access set up to your servers, as I haven't found a good/free cross-platform ssh library. README @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: ../bin/gltrail -# Generated by qmake (2.01a) (Qt 4.3.2) on: Sat Mar 15 17:33:31 2008 +# Generated by qmake (2.01a) (Qt 4.3.2) on: Sat Mar 15 18:40:51 2008 # Project: src.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile src.pro @@ -10,13 +10,13 @@ CC = gcc CXX = g++ -DEFINES = -DQT_SHARED -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB +DEFINES = -DQT_SHARED -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB CFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES) CXXFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES) -INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4 -I/usr/X11R6/include -I. -I. +INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4 -I/usr/X11R6/include -I. -I. LINK = g++ LFLAGS = -LIBS = $(SUBLIBS) -L/usr/X11R6/lib -L/usr/lib -lGLU -lGL -lQtOpenGL -lQtGui -lQtCore -lpthread +LIBS = $(SUBLIBS) -L/usr/lib -L/usr/X11R6/lib -lQtOpenGL -lQtGui -lQtNetwork -lQtCore -lGLU -lGL -lpthread AR = ar cqs RANLIB = QMAKE = /usr/bin/qmake @@ -48,23 +48,27 @@ SOURCES = main.cpp \ window.cpp \ glwidget.cpp \ background_updater.cpp \ - inputs/ssh.cpp moc_input.cpp \ - moc_window.cpp \ + input.cpp \ + inputs/ssh.cpp \ + inputs/digg.cpp moc_window.cpp \ moc_glwidget.cpp \ moc_background_updater.cpp \ - moc_ssh.cpp + moc_ssh.cpp \ + moc_digg.cpp OBJECTS = main.o \ activity.o \ element.o \ window.o \ glwidget.o \ background_updater.o \ + input.o \ ssh.o \ - moc_input.o \ + digg.o \ moc_window.o \ moc_glwidget.o \ moc_background_updater.o \ - moc_ssh.o + moc_ssh.o \ + moc_digg.o DIST = /usr/share/qt4/mkspecs/common/g++.conf \ /usr/share/qt4/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/common/linux.conf \ @@ -75,8 +79,8 @@ DIST = /usr/share/qt4/mkspecs/common/g++.conf \ /usr/share/qt4/mkspecs/features/default_pre.prf \ /usr/share/qt4/mkspecs/features/debug.prf \ /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/unix/opengl.prf \ /usr/share/qt4/mkspecs/features/qt.prf \ + /usr/share/qt4/mkspecs/features/unix/opengl.prf \ /usr/share/qt4/mkspecs/features/moc.prf \ /usr/share/qt4/mkspecs/features/unix/thread.prf \ /usr/share/qt4/mkspecs/features/warn_on.prf \ @@ -127,8 +131,8 @@ Makefile: src.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mk /usr/share/qt4/mkspecs/features/default_pre.prf \ /usr/share/qt4/mkspecs/features/debug.prf \ /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/unix/opengl.prf \ /usr/share/qt4/mkspecs/features/qt.prf \ + /usr/share/qt4/mkspecs/features/unix/opengl.prf \ /usr/share/qt4/mkspecs/features/moc.prf \ /usr/share/qt4/mkspecs/features/unix/thread.prf \ /usr/share/qt4/mkspecs/features/warn_on.prf \ @@ -147,8 +151,8 @@ Makefile: src.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mk /usr/share/qt4/mkspecs/features/default_pre.prf: /usr/share/qt4/mkspecs/features/debug.prf: /usr/share/qt4/mkspecs/features/default_post.prf: -/usr/share/qt4/mkspecs/features/unix/opengl.prf: /usr/share/qt4/mkspecs/features/qt.prf: +/usr/share/qt4/mkspecs/features/unix/opengl.prf: /usr/share/qt4/mkspecs/features/moc.prf: /usr/share/qt4/mkspecs/features/unix/thread.prf: /usr/share/qt4/mkspecs/features/warn_on.prf: @@ -161,7 +165,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) .tmp/gltrail1.0.0 || $(MKDIR) .tmp/gltrail1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gltrail1.0.0/ && $(COPY_FILE) --parents input.h element.h activity.h relation.h window.h glwidget.h background_updater.h inputs/ssh.h .tmp/gltrail1.0.0/ && $(COPY_FILE) --parents main.cpp activity.cpp element.cpp window.cpp glwidget.cpp background_updater.cpp inputs/ssh.cpp .tmp/gltrail1.0.0/ && (cd `dirname .tmp/gltrail1.0.0` && $(TAR) gltrail1.0.0.tar gltrail1.0.0 && $(COMPRESS) gltrail1.0.0.tar) && $(MOVE) `dirname .tmp/gltrail1.0.0`/gltrail1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gltrail1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gltrail1.0.0/ && $(COPY_FILE) --parents input.h element.h activity.h relation.h window.h glwidget.h background_updater.h inputs/ssh.h inputs/digg.h .tmp/gltrail1.0.0/ && $(COPY_FILE) --parents main.cpp activity.cpp element.cpp window.cpp glwidget.cpp background_updater.cpp input.cpp inputs/ssh.cpp inputs/digg.cpp .tmp/gltrail1.0.0/ && (cd `dirname .tmp/gltrail1.0.0` && $(TAR) gltrail1.0.0.tar gltrail1.0.0 && $(COMPRESS) gltrail1.0.0.tar) && $(MOVE) `dirname .tmp/gltrail1.0.0`/gltrail1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gltrail1.0.0 clean:compiler_clean @@ -180,12 +184,9 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: moc_input.cpp moc_window.cpp moc_glwidget.cpp moc_background_updater.cpp moc_ssh.cpp +compiler_moc_header_make_all: moc_window.cpp moc_glwidget.cpp moc_background_updater.cpp moc_ssh.cpp moc_digg.cpp compiler_moc_header_clean: - -$(DEL_FILE) moc_input.cpp moc_window.cpp moc_glwidget.cpp moc_background_updater.cpp moc_ssh.cpp -moc_input.cpp: input.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) input.h -o moc_input.cpp - + -$(DEL_FILE) moc_window.cpp moc_glwidget.cpp moc_background_updater.cpp moc_ssh.cpp moc_digg.cpp moc_window.cpp: glwidget.h \ input.h \ window.h @@ -207,6 +208,10 @@ moc_ssh.cpp: input.h \ inputs/ssh.h /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) inputs/ssh.h -o moc_ssh.cpp +moc_digg.cpp: input.h \ + inputs/digg.h + /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) inputs/digg.h -o moc_digg.cpp + compiler_rcc_make_all: compiler_rcc_clean: compiler_image_collection_make_all: qmake_image_collection.cpp @@ -248,7 +253,8 @@ element.o: element.cpp element.h \ window.o: window.cpp window.h \ glwidget.h \ input.h \ - inputs/ssh.h + inputs/ssh.h \ + inputs/digg.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o window.o window.cpp glwidget.o: glwidget.cpp glwidget.h \ @@ -267,13 +273,19 @@ background_updater.o: background_updater.cpp background_updater.h \ relation.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o background_updater.o background_updater.cpp +input.o: input.cpp input.h \ + glwidget.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o input.o input.cpp + ssh.o: inputs/ssh.cpp inputs/ssh.h \ input.h \ glwidget.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ssh.o inputs/ssh.cpp -moc_input.o: moc_input.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_input.o moc_input.cpp +digg.o: inputs/digg.cpp inputs/digg.h \ + input.h \ + glwidget.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o digg.o inputs/digg.cpp moc_window.o: moc_window.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_window.o moc_window.cpp @@ -287,6 +299,9 @@ moc_background_updater.o: moc_background_updater.cpp moc_ssh.o: moc_ssh.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_ssh.o moc_ssh.cpp +moc_digg.o: moc_digg.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_digg.o moc_digg.cpp + ####### Install install: FORCE src/Makefile @@ -21,8 +21,6 @@ public: protected: void run(); - - private: Inputs *hosts; Elements *elements; src/background_updater.h @@ -41,7 +41,6 @@ int last_time = 0; GLWidget::GLWidget(QWidget *parent, Inputs *h) : QGLWidget(QGLFormat(QGL::DoubleBuffer | QGL::Rgba | QGL::DirectRendering | QGL::AlphaChannel), parent) { - // startTimer(1); startTimer(16); setFocusPolicy(Qt::StrongFocus); setMouseTracking(true); @@ -75,7 +74,7 @@ GLWidget::~GLWidget() { if( hosts != NULL ) { for(Inputs::iterator it = hosts->begin(); it != hosts->end(); ++it) - (*it)->end(); + (*it)->endProcessing(); } } @@ -342,7 +341,7 @@ void GLWidget::resizeGL(int width, int height) { void GLWidget::keyPressEvent(QKeyEvent *event) { if( event->key() == Qt::Key_Escape ) { for(Inputs::iterator it = hosts->begin(); it != hosts->end(); ++it) - (*it)->end(); + (*it)->endProcessing(); hosts = NULL; QApplication::exit(1); } else if( event->key() == Qt::Key_Space ) { src/glwidget.cpp @@ -78,6 +78,9 @@ public: bool showStats() const { return statsMode; }; bool useRecoil() const { return recoil; }; + void setShowLines(int mode) { linesMode = mode; }; + void setShowSize(int mode) { sizeMode = mode; }; + float getX() const { return x; }; float getY() const { return y; }; src/glwidget.h @@ -1,4 +1,4 @@ -#include "host.h" +#include "input.h" #include <QStringList> #include <iostream> @@ -6,117 +6,11 @@ using namespace std; -void Input::start(void) { - proc = new QProcess( this ); +void Input::startProcessing() { - proc->setProcessChannelMode(QProcess::SeparateChannels); - - connect( proc, SIGNAL(readyReadStandardOutput()), this, SLOT(readFromStdout()) ); - connect( proc, SIGNAL(readyReadStandardError()), this, SLOT(readFromStderr()) ); - QString cmd = getCommandString(); - std::cout << "[" << domain.toStdString() << "] exec[" << cmd.toStdString() << "]" << std::endl; - proc->start( getCommandString() ); - proc->waitForStarted(); } +void Input::endProcessing() { -void Input::end( void ) { - cout << "Terminating[" << domain.toStdString() << "]" << endl; - proc->terminate(); - proc->waitForFinished(2000); - if( proc->state() == QProcess::Running ) { - cout << "Killing[" << domain.toStdString() << "]" << endl; - proc->kill(); - } - -} - -QString Input::getCommandString() { - QStringList cmd; - cmd << "ssh"; - cmd << user + "@" + host; - - if( !port.isEmpty() ) - cmd << "-p" << port; - - cmd << command << args; - - return cmd.join(" "); } -void Input::readFromStdout(void ) { - char buf[2048]; - - proc->setReadChannel(QProcess::StandardOutput); - - while( proc->canReadLine() ) { - qint64 len = proc->readLine(buf, sizeof(buf)); - if( len != -1 ) { - - // QString apache_pattern("([\\d\\S.]+) (\\S+) (\\S+) \\[([^\\]]+)\\] \"([^\"]*)\" (\\d+) ([\\S]+) \"([^\"]+)\" \"([^\"]+)\""); - QRegExp rx(pattern); - - if( rx.indexIn(buf) > -1 ) { - QString url = rx.cap(1); - - if( url.contains(" ") ) { - url = url.split(" ")[1]; - } - - QString referrer = rx.cap(2); - - if( ignoreQueryParameters() ) - url = url.split("?")[0]; - - if( !ignore.isEmpty() && url.contains( QRegExp(ignore, Qt::CaseInsensitive) ) ) { - continue; - } - - for( int i = 0; i < replacementPatterns.size(); i++ ) { - url.replace( QRegExp(replacementPatterns[i]), replacementStrings[i] ); - } - - url.replace( QRegExp("/index\\.vsp$"), "/" ); - - if( referrer.contains( QRegExp("http://(.*\\.)?" + domain) ) || referrer.startsWith("/") ) { - referrer = referrer.split("?")[0]; - - for( int i = 0; i < replacementPatterns.size(); i++ ) { - referrer.replace( QRegExp(replacementPatterns[i]), replacementStrings[i] ); - } - } - - referrer.replace( QRegExp("^http://(.*\\.)?" + domain), ""); - bool external = false; - if( referrer.contains("http://") ) { - external = true; - referrer.replace("http://", ""); - } - // std::cout << "[" << domain.toStdString() << "] " << url.toStdString() << " <- " << (const char*) referrer.toLatin1() << std::endl; - - if( url == referrer ) { - referrer = ""; - } - - gl->addRelation(this, url, referrer, external); - - } else { - std::cout << "[" << domain.toStdString() << "] UNKNOWN [" << buf << "]" << std::endl; - } - // glWidget->addRandomElement(); - } - } -} - -void Input::readFromStderr(void) { - char buf[2048]; - std::cout << "STDERR!\n"; - proc->setReadChannel(QProcess::StandardError); - - while( proc->canReadLine() ) { - qint64 len = proc->readLine(buf, sizeof(buf)); - if( len != -1 ) { - std::cout << "[" << domain.toStdString() << "] STDERR [" << buf << "]" << std::endl; - } - } -} src/input.cpp @@ -9,14 +9,12 @@ class GLWidget; -class Input : public QObject { - - Q_OBJECT +class Input { public: - Input(QObject *parent) : QObject(parent) {}; - ~Input() {}; + Input() {}; + virtual ~Input() {}; void setDomain(const QString &d) { domain = d; }; void setColor(const QString &c) { color = QColor(c); }; @@ -27,10 +25,11 @@ class Input : public QObject { void setGLWidget(GLWidget *glw) { gl = glw; }; GLWidget *getGLWidget() const { return gl; }; + void setAutoPurge(bool p) {autoPurge = p; }; bool doPurge( void ) const { return autoPurge; }; - virtual void start() {}; - virtual void end() {}; + virtual void startProcessing(); + virtual void endProcessing(); protected: GLWidget *gl; QString domain; src/input.h @@ -6,7 +6,7 @@ using namespace std; -void SSH::start(void) { +void SSH::startProcessing(void) { proc = new QProcess( this ); proc->setProcessChannelMode(QProcess::SeparateChannels); @@ -20,7 +20,7 @@ void SSH::start(void) { } -void SSH::end( void ) { +void SSH::endProcessing( void ) { cout << "Terminating[" << domain.toStdString() << "]" << endl; proc->terminate(); proc->waitForFinished(2000); @@ -58,13 +58,12 @@ void SSH::readFromStdout(void ) { if( rx.indexIn(buf) > -1 ) { QString url = rx.cap(1); + QString referrer = rx.cap(2); if( url.contains(" ") ) { url = url.split(" ")[1]; } - QString referrer = rx.cap(2); - if( ignoreQueryParameters() ) url = url.split("?")[0]; src/inputs/ssh.cpp @@ -1,5 +1,5 @@ -#ifndef HOST_H -#define HOST_H +#ifndef SSH_H +#define SSH_H #include <QObject> #include <QList> @@ -9,13 +9,13 @@ class GLWidget; -class SSH : public Input { +class SSH : public QObject, public Input { Q_OBJECT public: - SSH(QObject *parent) : Input(parent) {}; + SSH(QObject *parent) : QObject(parent) {}; ~SSH() {}; void setHost(const QString &h) { host = h; }; @@ -26,7 +26,6 @@ class SSH : public Input { void setPattern(const QString &p) { pattern = p; }; void setIgnore(const QString &i) { ignore = i; }; void setIgnoreQueryParameters(bool p) { ignoreParams = p; }; - void setAutoPurge(bool p) {autoPurge = p; }; void addReplacement(const QString &p, const QString &s) { replacementPatterns << p; @@ -38,8 +37,8 @@ class SSH : public Input { QString getIgnore( void ) { return ignore; }; bool ignoreQueryParameters( void ) { return ignoreParams; }; - void start(); - void end(); + void startProcessing(); + void endProcessing(); public slots: src/inputs/ssh.h @@ -1,4 +1,4 @@ -QT += opengl +QT += opengl network CONFIG += debug SOURCES += main.cpp \ @@ -7,7 +7,9 @@ SOURCES += main.cpp \ window.cpp \ glwidget.cpp \ background_updater.cpp \ - inputs/ssh.cpp + input.cpp \ + inputs/ssh.cpp \ + inputs/digg.cpp HEADERS += input.h \ element.h \ @@ -16,16 +18,14 @@ HEADERS += input.h \ window.h \ glwidget.h \ background_updater.h \ - inputs/ssh.h - + inputs/ssh.h \ + inputs/digg.h TEMPLATE = app CONFIG += warn_on \ thread \ qt \ - debug \ - opengl TARGET = ../bin/gltrail src/src.pro @@ -25,9 +25,12 @@ #include "window.h" #include "input.h" #include "inputs/ssh.h" +#include "inputs/digg.h" Inputs inputs; +using namespace std; + Window::Window(QWidget *parent) : QWidget(parent) { @@ -59,57 +62,74 @@ void Window::readSettings(GLWidget *gl) { configFile = QCoreApplication::arguments().at(1); } - std::cout << "Reading config[" << configFile.toStdString() << "]" << std::endl; + if( configFile == "--digg" ) { + cout << "Pulling from Digg..." << endl; + + Digg *d = new Digg(this); + + d->setGLWidget(gl); + d->setDomain("digg.com"); + d->setAutoPurge(true); + d->setColor( "#7777FF" ); + + gl->setShowLines(0); + gl->setShowSize(4); + d->start(); - QSettings settings(configFile, QSettings::IniFormat); + inputs << d; - settings.beginGroup("hosts"); - QStringList rels = settings.allKeys(); - settings.endGroup(); + } else { + std::cout << "Reading config[" << configFile.toStdString() << "]" << std::endl; - for( int i = 0; i < rels.size(); i++ ) { - QString hostName = rels.at(i); + QSettings settings(configFile, QSettings::IniFormat); settings.beginGroup("hosts"); - QString domain = settings.value(hostName).toString(); - std::cout << "Reading [" << domain.toStdString() << "]" << std::endl; + QStringList rels = settings.allKeys(); settings.endGroup(); - SSH *h = new SSH(this); - settings.beginGroup(domain); - h->setHost(hostName); - h->setDomain(domain); - h->setUser( settings.value("user").toString() ); - h->setPort( settings.value("port").toString() ); - h->setCommand( settings.value("command").toString() ); - h->setArgs( settings.value("args").toString() ); - h->setPattern( settings.value("pattern").toString() ); - h->setIgnore( settings.value("ignore").toString() ); - h->setColor( settings.value("color").toString() ); - h->setIgnoreQueryParameters( settings.value("ignore_url_params").toBool() ); - h->setAutoPurge( settings.value("auto_purge").toBool() ); - - QStringList keys = settings.childKeys(); - for( int i = 0; i < keys.size(); i++ ) { - if( keys[i].startsWith("replace_") ) { - QString pattern = settings.value(keys[i]).toString(); - QString str = keys[i]; - str.replace("replace_", ""); - if( pattern.startsWith("/") ) - str = "/" + str; - h->addReplacement( pattern,str ); + for( int i = 0; i < rels.size(); i++ ) { + QString hostName = rels.at(i); + + settings.beginGroup("hosts"); + QString domain = settings.value(hostName).toString(); + std::cout << "Reading [" << domain.toStdString() << "]" << std::endl; + settings.endGroup(); + + SSH *h = new SSH(this); + settings.beginGroup(domain); + h->setHost(hostName); + h->setDomain(domain); + h->setUser( settings.value("user").toString() ); + h->setPort( settings.value("port").toString() ); + h->setCommand( settings.value("command").toString() ); + h->setArgs( settings.value("args").toString() ); + h->setPattern( settings.value("pattern").toString() ); + h->setIgnore( settings.value("ignore").toString() ); + h->setColor( settings.value("color").toString() ); + h->setIgnoreQueryParameters( settings.value("ignore_url_params").toBool() ); + h->setAutoPurge( settings.value("auto_purge").toBool() ); + + QStringList keys = settings.childKeys(); + for( int i = 0; i < keys.size(); i++ ) { + if( keys[i].startsWith("replace_") ) { + QString pattern = settings.value(keys[i]).toString(); + QString str = keys[i]; + str.replace("replace_", ""); + if( pattern.startsWith("/") ) + str = "/" + str; + h->addReplacement( pattern,str ); + } } - } - h->setGLWidget(gl); + h->setGLWidget(gl); - settings.endGroup(); - std::cout << "Read [" << hostName.toStdString() << "]" << std::endl; + settings.endGroup(); + std::cout << "Read [" << hostName.toStdString() << "]" << std::endl; - inputs << h; - h->start(); + h->startProcessing(); + inputs << h; + } } - } src/window.cpp 51e1fff64c668428a3c992ef5b1df40d97b35e14 Erlend Simonsen mr@fudgie.org http://github.com/Fudge/gltrail/commit/fa140465143ce70fdc39e3ae41733ab1c6dc7f43 fa140465143ce70fdc39e3ae41733ab1c6dc7f43 2008-03-16T09:19:55-07:00 2008-03-16T07:51:59-07:00 Basic implementation of a Digg input ae020b1bbeabeddcb81fbe2a67cd1c0f49775a6d Erlend Simonsen mr@fudgie.org