mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00
Code Issues Releases Wiki Activity

Be safer

Browse Source
This commit is contained in:
Leo Franchi
2011-09-09 17:14:08 -04:00
parent c6259d2feb
commit 45a276cf33
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/AtticaManager.cpp
View File

@@ -161,7 +161,7 @@ AtticaManager::payloadFetched()
if( !resolverPath.isEmpty() ) if( !resolverPath.isEmpty() )
{ {
// TomahawkApp::instance()->enableScriptResolver( resolverPath ); TomahawkApp::instance()->enableScriptResolver( resolverPath );
m_resolverStates[ resolverId ] = Installed; m_resolverStates[ resolverId ] = Installed;
TomahawkSettings::instance()->setAtticaResolverState( resolverId, Installed ); TomahawkSettings::instance()->setAtticaResolverState( resolverId, Installed );
emit resolverInstalled( resolverId ); emit resolverInstalled( resolverId );
@@ -249,13 +249,24 @@ AtticaManager::uninstallResolver( const Content& resolver )
{ {
TomahawkApp::instance()->disableScriptResolver( resolver.id() ); TomahawkApp::instance()->disableScriptResolver( resolver.id() );
m_resolverStates[ resolver.id() ] = Uninstalled; m_resolverStates[ resolver.id() ] = Uninstalled;
TomahawkSettings::instance()->setAtticaResolverState( resolver.id(), Uninstalled );
emit resolverUninstalled( resolver.id() ); emit resolverUninstalled( resolver.id() );
emit resolverStateChanged( resolver.id() ); emit resolverStateChanged( resolver.id() );
// uninstalling is easy... just delete it! :) // uninstalling is easy... just delete it! :)
QDir resolverDir = TomahawkUtils::appDataDir(); QDir resolverDir = TomahawkUtils::appDataDir();
resolverDir.cd( QString( "atticaresolvers/%1" ).arg( resolver.id() ) ); if ( !resolverDir.cd( QString( "atticaresolvers/%1" ).arg( resolver.id() ) ) )
return;
if ( resolver.id().isEmpty() )
return;
// sanity check
if ( !resolverDir.absolutePath().contains( "atticaresolvers" ) ||
!resolverDir.absolutePath().contains( resolver.id() ) )
return;
removeDirectory( resolverDir.absolutePath() ); removeDirectory( resolverDir.absolutePath() );
} }
@@ -266,6 +277,7 @@ AtticaManager::removeDirectory( const QString& dir ) const
{ {
const QDir aDir(dir); const QDir aDir(dir);
tLog() << "Deleting DIR:" << dir;
bool has_err = false; bool has_err = false;
if (aDir.exists()) { if (aDir.exists()) {
foreach(const QFileInfo& entry, aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::NoSymLinks)) { foreach(const QFileInfo& entry, aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::NoSymLinks)) {

2
src/AtticaManager.h
View File

@@ -19,6 +19,8 @@
#ifndef ATTICAMANAGER_H #ifndef ATTICAMANAGER_H
#define ATTICAMANAGER_H #define ATTICAMANAGER_H
#include "config.h"
#include <QObject> #include <QObject>
#include <QHash> #include <QHash>

2
src/settingsdialog.h
View File

@@ -22,6 +22,8 @@
#include <QDialog> #include <QDialog>
#include <QModelIndex> #include <QModelIndex>
#include "config.h"
class LoadingSpinner; class LoadingSpinner;
class QListWidgetItem; class QListWidgetItem;
class Ui_StackedSettingsDialog; class Ui_StackedSettingsDialog;