X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=5e500d5e0243052eeb762f9cdf15de3c3782ddae;hb=d11d05d07acdd11a93b02d750852dea4ae32be3b;hp=409e4386f74775ba6b862cb796e1791db9ae5428;hpb=d77c3dfd027e9af4d44fc7109fac0012451268c2;p=youtube-dl.git

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 409e4386f..5e500d5e0 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -22,6 +22,8 @@ __license__ = 'Public Domain'
 __version__ = '2012.02.27'
 
 UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'
+UPDATE_URL_VERSION = 'https://raw.github.com/rg3/youtube-dl/master/LATEST_VERSION'
+UPDATE_URL_EXE = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl.exe'
 
 
 import cookielib
@@ -36,41 +38,70 @@ import sys
 import urllib2
 import warnings
 
-from Utils import *
+from utils import *
 from FileDownloader import *
 from InfoExtractors import *
-from PostProcessing import *
+from PostProcessor import *
 
 def updateSelf(downloader, filename):
 	''' Update the program file with the latest version from the repository '''
 	# Note: downloader only used for options
+	
 	if not os.access(filename, os.W_OK):
 		sys.exit('ERROR: no write permissions on %s' % filename)
 
 	downloader.to_screen(u'Updating to latest version...')
 
-	try:
+	urlv = urllib2.urlopen(UPDATE_URL_VERSION)
+	newversion = urlv.read().strip()
+	if newversion == __version__:
+		downloader.to_screen(u'youtube-dl is up-to-date (' + __version__ + ')')
+		return
+	urlv.close()
+
+	if hasattr(sys, "frozen"): #py2exe
+		directory = os.path.dirname(filename)
+		exe = os.path.abspath(filename)
+		if not os.access(directory, os.W_OK):
+			sys.exit('ERROR: no write permissions on %s' % directory)
+			
+		try:
+			urllib.urlretrieve(UPDATE_URL_EXE, exe + '.new')
+		except (IOError, OSError), err:
+			sys.exit('ERROR: unable to download latest version')
+			
+		try:
+			bat = os.path.join(directory, 'youtube-dl-updater.bat')
+			b = open(bat, 'w')
+			
+			print >> b, """
+ping 127.0.0.1 -n 5 -w 1000 > NUL
+move /Y "%s.new" "%s"
+del "%s"
+			""" %(exe, exe, bat)
+			
+			b.close()
+			
+			os.startfile(bat)
+		except (IOError, OSError), err:
+			sys.exit('ERROR: unable to overwrite current version')
+
+	else:
 		try:
 			urlh = urllib2.urlopen(UPDATE_URL)
 			newcontent = urlh.read()
-			
-			vmatch = re.search("__version__ = '([^']+)'", newcontent)
-			if vmatch is not None and vmatch.group(1) == __version__:
-				downloader.to_screen(u'youtube-dl is up-to-date (' + __version__ + ')')
-				return
-		finally:
 			urlh.close()
-	except (IOError, OSError), err:
-		sys.exit('ERROR: unable to download latest version')
+		except (IOError, OSError), err:
+			sys.exit('ERROR: unable to download latest version')
 
-	try:
-		outf = open(filename, 'wb')
 		try:
-			outf.write(newcontent)
-		finally:
-			outf.close()
-	except (IOError, OSError), err:
-		sys.exit('ERROR: unable to overwrite current version')
+			outf = open(filename, 'wb')
+			try:
+				outf.write(newcontent)
+			finally:
+				outf.close()
+		except (IOError, OSError), err:
+			sys.exit('ERROR: unable to overwrite current version')
 
 	downloader.to_screen(u'Updated youtube-dl. Restart youtube-dl to use the new version.')
 
@@ -291,21 +322,18 @@ def gen_extractors():
 	""" Return a list of an instance of every supported extractor.
 	The order does matter; the first extractor matched is the one handling the URL.
 	"""
-	youtube_ie = YoutubeIE()
-	google_ie = GoogleIE()
-	yahoo_ie = YahooIE()
 	return [
-		YoutubePlaylistIE(youtube_ie),
-		YoutubeUserIE(youtube_ie),
-		YoutubeSearchIE(youtube_ie),
-		youtube_ie,
-		MetacafeIE(youtube_ie),
+		YoutubePlaylistIE(),
+		YoutubeUserIE(),
+		YoutubeSearchIE(),
+		YoutubeIE(),
+		MetacafeIE(),
 		DailymotionIE(),
-		google_ie,
-		GoogleSearchIE(google_ie),
+		GoogleIE(),
+		GoogleSearchIE(),
 		PhotobucketIE(),
-		yahoo_ie,
-		YahooSearchIE(yahoo_ie),
+		YahooIE(),
+		YahooSearchIE(),
 		DepositFilesIE(),
 		FacebookIE(),
 		BlipTVIE(),