<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120357] branches/gsoc14-pip2port/tester.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120357">120357</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-05-24 00:33:59 -0700 (Sat, 24 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added progressbar for fetching</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2porttesterpy">branches/gsoc14-pip2port/tester.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2porttesterpy"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/tester.py (120356 => 120357)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/tester.py 2014-05-24 06:17:16 UTC (rev 120356)
+++ branches/gsoc14-pip2port/tester.py 2014-05-24 07:33:59 UTC (rev 120357)
</span><span class="lines">@@ -1,11 +1,13 @@
</span><span class="cx"> # -*- coding: utf-8 -*-
</span><span class="cx"> #! /usr/bin/env python
</span><span class="cx">
</span><del>-import urllib
</del><ins>+import urllib2
+#import urllib
</ins><span class="cx"> import hashlib
</span><span class="cx"> import argparse
</span><span class="cx"> import sys
</span><span class="cx"> import os
</span><ins>+from progressbar import *
</ins><span class="cx"> try:
</span><span class="cx"> import xmlrpclib
</span><span class="cx"> except ImportError:
</span><span class="lines">@@ -53,18 +55,40 @@
</span><span class="cx"> def fetch(pkg_name,url):
</span><span class="cx"> checksum_md5 = url.split('#')[-1].split('=')[-1]
</span><span class="cx"> parent_dir = './sources/'
</span><del>- src_dir = parent_dir +pkg_name+"/"
</del><ins>+ src_dir = parent_dir + "/"+pkg_name+"/"
</ins><span class="cx"> if not os.path.exists(parent_dir):
</span><span class="cx"> os.makedirs(parent_dir)
</span><span class="cx"> if not os.path.exists(src_dir):
</span><span class="cx"> os.makedirs(src_dir)
</span><span class="cx">
</span><span class="cx"> file_name = src_dir + url.split('/')[-1].split('#')[0]
</span><del>- urllib.urlretrieve(url,file_name)
</del><ins>+
+# urllib.urlretrieve(url,file_name)
+ u = urllib2.urlopen(url)
+ f = open(file_name,'wb')
+ meta = u.info()
+ file_size = int(meta.getheaders("Content-Length")[0])
+
+ widgets = ['Fetching: ', Percentage(), ' ', Bar(marker=RotatingMarker(),left='[',right=']'), ' ', ETA(), ' ', FileTransferSpeed()]
+ pbar = ProgressBar(widgets=widgets, maxval=int(file_size))
+ pbar.start()
+
+ file_size_dl = 0
+ block_sz = 8192
+ while True:
+ buffer = u.read(block_sz)
+ if not buffer:
+ break
+
+ file_size_dl += len(buffer)
+ f.write(buffer)
+ pbar.update(file_size_dl)
+
+ pbar.finish()
+ print
+ f.close()
+
</ins><span class="cx"> checksum_md5_calc = hashlib.md5(open(file_name).read()).hexdigest()
</span><del>- print "HASHES"
- print checksum_md5_calc
- print checksum_md5
</del><span class="cx"> if str(checksum_md5_calc) == str(checksum_md5):
</span><span class="cx"> print 'Successfully fetched\n'
</span><span class="cx"> else:
</span><span class="lines">@@ -127,7 +151,7 @@
</span><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> if options.action == 'fetch':
</span><del>- print options,"\n"
</del><ins>+# print options,"\n"
</ins><span class="cx"> if options.package_name == None:
</span><span class="cx"> if options.package_url == None:
</span><span class="cx"> parser.error("No package name and url specified")
</span><span class="lines">@@ -136,7 +160,7 @@
</span><span class="cx"> elif options.package_url == None:
</span><span class="cx"> parser.error("No url specified")
</span><span class="cx"> else:
</span><del>- print options
</del><ins>+# print options
</ins><span class="cx"> fetch(options.package_name,options.package_url)
</span><span class="cx"> return
</span><span class="cx"> else:
</span></span></pre>
</div>
</div>
</body>
</html>