Small fixes

Author: sasq64

csdb.py

@@ -53,7 +53,7 @@ def __repr__(self):
 		return "[" + str(self.id) + "] " + name + " (" + self.type + ")"
 
 	def update(self):
-		
+
 		m = re.compile('.*(\d\d\d\d)').match(self.date)
 		if m :
 			self.year = m.group(1)
@@ -79,17 +79,18 @@ def load(self):
 
 		anyword = re.compile('\w+')
 		name = '?'
-		gid = -1
+		#gid = -1
 		group = '?'
 		type = '?'
 		rdate = '?'
 		downloads = None		
 
 		try :
 			name = start.find('font').string
-			ag = start.find(text=re.compile('Release.*by')).findNext('a')
-			gid = int(re.compile('id=(\w+)').findall(ag.attrs[0][1])[0])
-			group = start.find(text=re.compile('Release.*by')).findNext(text=anyword)
+			release_by = start.find(text=re.compile('Release.*by'))
+			ag = release_by.findNext('a')
+			#gid = int(re.compile('id=(\w+)').findall(ag.attrs[0][1])[0])
+			group = release_by.findNext(text=anyword)
 		except :
 			pass
 		try :					
@@ -103,6 +104,7 @@ def load(self):
 			pass
 		#print "'%s' by '%s' (%d), Release date '%s'" % (name, group, gid, rdate)
 
+
 		if name != '?' :
 			self.name = fixhtml(name)
 		if group != '?' :
@@ -134,8 +136,8 @@ def download_from_url(self, url, targetdir, to_d64 = False, to_prg = False):
 		fname = fixname(os.path.basename(u.geturl()))
 
 		filter = None
-		if to_prg and self.name and self.name != '?' :
-			filter = fixname(self.name).lower()
+		#if to_prg and self.name and self.name != '?' :
+		#	filter = fixname(self.name).lower()
 
 		try :
 			path = tempfile.mkdtemp()
@@ -348,7 +350,7 @@ def main(argv) :
 	#line = raw_input('>')
 	#line = argv
 
-	p = optparse.OptionParser(usage ="usage: %prog [options] <command> [args...]\n\nCommands:\n find <groupname>  = Search for a group by name\n list			  = List releases (with filtering) for a groupid\n dl				= Download releases (with filtering) for a groupid")
+	p = optparse.OptionParser(usage ="usage: %prog [options] <command> [args...]\n\nCommands:\n findgrp <groupname> = Search for a group by name\n list = List releases (with filtering) for a groupid\n findrel = Find releases")
 	p.add_option("-D", "--download",
 				  action="store_true", dest="download", default=False,
 				  help="Download matching releases")
@@ -414,7 +416,7 @@ def main(argv) :
 	#l = argv #line.split()
 	l = arguments;
 	if len(l) >= 1 :
-		if l[0] == 'find' :
+		if l[0] == 'findgrp' :
 			groups = csdb.findGroups(l[1])
 			if groups :
 				for g in groups :
@@ -433,7 +435,7 @@ def main(argv) :
 						print "\n"
 						rels.append(group.releases.sort(lambda x, y : x.year > y.year))
 
-		elif l[0] == 'search' :
+		elif l[0] == 'findrel' :
 			print "Searching for %s" % l[1]
 			rels = CSDBSpider.findReleases(l[1])
 

tools64.py

@@ -110,7 +110,9 @@ def unpack(archive, targetdir, to_d64 = False, to_prg = False, filter = None):
 		d64 = None
 		for r in res :
 			if r[-4:].upper() == '.D64' :
-				subprocess.call(['cbmconvert', '-N', '-d', r], cwd=targetdir)
+				rc = subprocess.call(['cbmconvert', '-N', '-d', r], cwd=targetdir)
+				if rc != 0 :
+					print "### CBMCONVERT RETURNED %d" % (rc,)
 				foundprog = False
 				for r2 in os.listdir(targetdir) :
 					if r2[-4:].upper() == '.DEL' or r2[-4:].upper() == '.USR':
@@ -141,6 +143,7 @@ def unpack(archive, targetdir, to_d64 = False, to_prg = False, filter = None):
 		for r in res :
 			rl = r.lower()
 			rsplit = os.path.splitext(rl)
+			print "Considering %s with ext %s" % (rl, rsplit[1])
 			if rsplit[1] == '.prg' :
 				hits = 0
 				for f in fsplit :
@@ -158,8 +161,13 @@ def unpack(archive, targetdir, to_d64 = False, to_prg = False, filter = None):
 	res = os.listdir(targetdir)
 	for r in res :
 		dname = os.path.splitext(r)
-		if dname[1].upper() == '.SEQ' :
+		ext = dname[1].upper()
+		if ext == '.PRG' or ext == '.D64' or ext == '.T64' or ext == '.DIZ' or ext == '.TXT' or ext == '.REU' :
+			pass
+		elif ext == '.SEQ' :
 			os.rename(targetdir + '/' + r, targetdir + '/' + dname[0] + '.prg')
+		else :
+			os.remove(targetdir + '/' + r)
 
 	fat32names(targetdir)
 

urlgetter.py

@@ -36,7 +36,7 @@ def __init__(self, url):
 		try :
 			f = open('urlcache/' + self.uname, 'r')
 			self.realu = f.readline().strip()
-			self.contents = f.read(8*1024*1024)
+			self.contents = f.read(32*1024*1024)
 			f.close()
 			print "Using cached result"
 			return