@@ -11,5 +11,6 @@ replace_:id=/\\d+$ replace_:md5=/[a-zA-Z0-9]{32} ignore=\\.(jpg|png|jpeg|gif|swf|js|css|jar|ico|mp3)$ ignore_url_params=true +auto_purge=true color=#FF4444 gltrail.ini-example @@ -225,7 +225,7 @@ void GLWidget::paintGL() e->render(this); - if( e->expired() ) { + if( e->expired() && e->host->doPurge() ) { cout << "Expired[" << e->name().toStdString() << "][" << e->rate << "]" << endl; for(iter2 = nodes.begin(); iter2 != nodes.end(); ++iter2) { src/glwidget.cpp @@ -25,9 +25,10 @@ class Host : public QObject { void setCommand(const QString &c) { command = c; }; void setArgs(const QString &a) { args = a; }; void setPattern(const QString &p) { pattern = p; }; - void setIgnore(const QString &i) { ignore = i; }; + void setIgnore(const QString &i) { ignore = i; }; void setColor(const QString &c) { color = QColor(c); }; void setIgnoreQueryParameters(bool p) { ignoreParams = p; }; + void setAutoPurge(bool p) {autoPurge = p; }; void addReplacement(const QString &p, const QString &s) { replacementPatterns << p; @@ -43,7 +44,8 @@ class Host : public QObject { bool ignoreQueryParameters( void ) { return ignoreParams; }; QString getDomain( void ) const { return domain; }; - QColor getColor( void ) const { return color; }; + QColor getColor( void ) const { return color; }; + bool doPurge( void ) const { return autoPurge; }; void start(); void end(); @@ -70,6 +72,8 @@ public slots: QString pattern; QColor color; + bool autoPurge; + QStringList replacementPatterns; QStringList replacementStrings; src/host.h @@ -53,7 +53,7 @@ Window::~Window() void Window::readSettings(GLWidget *gl) { QString configFile("gltrail.ini"); - + if( QCoreApplication::arguments().size() > 1 ) { configFile = QCoreApplication::arguments().at(1); } @@ -87,16 +87,17 @@ void Window::readSettings(GLWidget *gl) { 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 ); + QString pattern = settings.value(keys[i]).toString(); + QString str = keys[i]; + str.replace("replace_", ""); + if( pattern.startsWith("/") ) + str = "/" + str; + h->addReplacement( pattern,str ); } } src/window.cpp @@ -39,16 +39,6 @@ public: private: GLWidget *glWidget; QProcess *proc; - - - - QString host; - QString user; - QString port; - QString command; - QString args; - QString pattern; - }; #endif src/window.h 23af35c21ccd35f036a1517bfcffa32b2b64a3a1 Erlend Simonsen mr@fudgie.org http://github.com/Fudge/gltrail/commit/28744565b891d05cb943cfbeb0bfc2e32c3b0bf6 28744565b891d05cb943cfbeb0bfc2e32c3b0bf6 2008-03-07T06:38:32-08:00 2008-03-07T06:38:32-08:00 Add auto_purge option, defaults to false 2a6ac12fceb20acf6f1648486395d3e0c2441282 Erlend Simonsen mr@fudgie.org