From 9a13d475a6f7857b55e245932e69b39cc63cc0b5 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 26 Dec 2011 20:14:42 +0100
Subject: [PATCH] Use python.exe as interpreter for .py files on windows.
---
src/libtomahawk/resolvers/scriptresolver.cpp | 60 +++++++++++++-------
src/libtomahawk/resolvers/scriptresolver.h | 2 +
2 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/src/libtomahawk/resolvers/scriptresolver.cpp b/src/libtomahawk/resolvers/scriptresolver.cpp
index 56d027f65..b452c7b56 100644
--- a/src/libtomahawk/resolvers/scriptresolver.cpp
+++ b/src/libtomahawk/resolvers/scriptresolver.cpp
@@ -45,24 +45,13 @@ ScriptResolver::ScriptResolver( const QString& exe )
connect( &m_proc, SIGNAL( readyReadStandardOutput() ), SLOT( readStdout() ) );
connect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), SLOT( cmdExited( int, QProcess::ExitStatus ) ) );
- QString runPath = filePath();
-#ifdef WIN32
- // have to enclose in quotes if path contains spaces on windows...
- runPath = QString( "\"%1\"" ).arg( filePath() );
-#endif
-
- if ( !QFile::exists( filePath() ) )
- m_error = Tomahawk::ExternalResolver::FileNotFound;
- else
- m_proc.start( runPath );
+ startProcess();
if ( !TomahawkUtils::nam() )
return;
// set the name to the binary, if we launch properly we'll get the name the resolver reports
m_name = QFileInfo( filePath() ).baseName();
-
- sendConfig();
}
@@ -141,15 +130,7 @@ ScriptResolver::sendConfig()
void
ScriptResolver::reload()
{
- if ( !QFile::exists( filePath() ) )
- m_error = Tomahawk::ExternalResolver::FileNotFound;
- else
- {
- m_error = Tomahawk::ExternalResolver::NoError;
- m_proc.start( filePath() );
-
- sendConfig();
- }
+ startProcess();
}
@@ -309,7 +290,7 @@ ScriptResolver::cmdExited( int code, QProcess::ExitStatus status )
{
m_num_restarts++;
tLog() << "*** Restart num" << m_num_restarts;
- m_proc.start( filePath() );
+ startProcess();
sendConfig();
}
else
@@ -381,6 +362,41 @@ ScriptResolver::setupConfWidget( const QVariantMap& m )
}
+void ScriptResolver::startProcess()
+{
+ if ( !QFile::exists( filePath() ) )
+ m_error = Tomahawk::ExternalResolver::FileNotFound;
+ else
+ {
+ m_error = Tomahawk::ExternalResolver::NoError;
+ }
+
+ QFileInfo fi( filePath() );
+
+ QString interpreter;
+ QString runPath = filePath();
+
+#ifdef Q_OS_WIN
+ if(fi.completeSuffix() == "py")
+ {
+ interpreter = "python.exe";
+ }
+ else
+ {
+ // have to enclose in quotes if path contains spaces on windows...
+ runPath = QString( "\"%1\"" ).arg( filePath() );
+ }
+#endif // Q_OS_WIN
+
+ if( interpreter.isEmpty() )
+ m_proc.start( runPath );
+ else
+ m_proc.start( interpreter, QStringList() << filePath() );
+
+ sendConfig();
+}
+
+
void
ScriptResolver::saveConfig()
{
diff --git a/src/libtomahawk/resolvers/scriptresolver.h b/src/libtomahawk/resolvers/scriptresolver.h
index c7cd9a9e4..f8e94b0ff 100644
--- a/src/libtomahawk/resolvers/scriptresolver.h
+++ b/src/libtomahawk/resolvers/scriptresolver.h
@@ -75,6 +75,8 @@ private:
void doSetup( const QVariantMap& m );
void setupConfWidget( const QVariantMap& m );
+ void startProcess();
+
QProcess m_proc;
QString m_name;
unsigned int m_weight, m_preference, m_timeout, m_num_restarts;