Commits

Anonymous committed 22c76f2

Changes to fetch.py so it runs on windows and returns the subprocess object rather than waiting for execution to complete.

  • Participants
  • Parent commits 4cef522

Comments (0)

Files changed (1)

File python-iview/iview/fetch.py

 
 def rtmpdump(rtmp_url, rtmp_host, rtmp_app, rtmp_playpath, output_filename, resume=False, execvp=False):
 	executables = (
-			'rtmpdump',
+			'rtmpdump.exe',
 			'rtmpdump_x86',
 			'flvstreamer',
 			'flvstreamer_x86',
 	for exec_attempt in executables:
 		print 'Starting %s...' % exec_attempt
 		args[0] = exec_attempt
-		try:
-			if execvp:
-				os.execvp(args[0], args)
-			else:
-				return subprocess.Popen(args, stderr=subprocess.PIPE)
-		except OSError:
-			print 'Could not load %s, trying another...' % exec_attempt
-			continue
+		p = subprocess.Popen(args, stderr=subprocess.STDOUT,
+				stdout=subprocess.PIPE)
+		return p
 
 	print "It looks like you don't have a compatible downloader backend installed."
 	print "See the README file for more information about setting this up properly."