Skip to content

cosmetic: tabs -> spaces / strip trailing spaces #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghost wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cosmetic: tabs -> spaces / strip trailing spaces #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions scraper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
def normalize(s):
return ''.join((c for c in unicodedata.normalize('NFKD', unicode(s)) if unicodedata.category(c) != 'Mn'))

def fixExtension(file):
def fixExtension(file):
newfile="%s.%s" % (os.path.splitext(file)[0],imghdr.what(file))
os.rename(file, newfile)
return newfile
Expand Down Expand Up @@ -112,20 +112,20 @@ def getGameInfo(file,platformID):
else:
URL = "http://thegamesdb.net/api/GetGame.php"
platform = getPlatformName(platformID)
if SCUMMVM:
if SCUMMVM:
title = getScummvmTitle(title)
args.fix = True #Scummvm doesn't have a proper platformID so we search all
if platform == "Arcade" or platform == "NeoGeo": title = getRealArcadeTitle(title)
if platform == "Arcade" or platform == "NeoGeo": title = getRealArcadeTitle(title)

if args.fix:
try:
try:
fixreq = urllib2.Request("http://thegamesdb.net/api/GetGamesList.php", urllib.urlencode({'name' : title, 'platform' : platform}), headers={'User-Agent' : "RetroPie Scraper Browser"})
fixdata=ET.parse(urllib2.urlopen(fixreq)).getroot()
if fixdata.find("Game") is not None:
if fixdata.find("Game") is not None:

#values={ 'id': fixdata.findall("Game/id")[chooseResult(fixdata)].text if args.m else fixdata.find("Game/id").text }
values={ 'id': fixdata.findall("Game/id")[chooseResult(fixdata)].text if args.m else fixdata.findall("Game/id")[autoChooseBestResult(fixdata,title)].text }

except:
return None
else:
Expand Down Expand Up @@ -166,7 +166,7 @@ def getGamePlatform(nodes):
return getText(nodes.find("system_title"))
else:
return getText(nodes.find("Platform"))

def getScummvmTitle(title):
print "Fetching real title for %s from scummvm.org" % title
URL = "http://scummvm.org/compatibility/DEV/%s" % title.split("-")[0]
Expand All @@ -177,7 +177,7 @@ def getScummvmTitle(title):
return m.groups()[0]
else:
print "No title found for %s on scummvm.org" % title
return title
return title

def getRealArcadeTitle(title):
print "Fetching real title for %s from mamedb.com" % title
Expand Down Expand Up @@ -267,8 +267,8 @@ def chooseResult(nodes):
return int(raw_input("Select a result (or press Enter to skip): "))
else:
return 0


def autoChooseBestResult(nodes,t):
results=nodes.findall('Game')
t = t.split('(', 1)[0]
Expand Down Expand Up @@ -341,28 +341,28 @@ def scanFiles(SystemInfo):
try:
filepath=os.path.abspath(os.path.join(root, files))
filename = os.path.splitext(files)[0]

if gamelistExists and not args.f:
if skipGame(existinglist,filepath):
continue

print "Trying to identify %s.." % files

data=getGameInfo(filepath, platformID)

if data is None:
continue
else:
result=data

str_title=getTitle(result)
str_des=getDescription(result)
str_img=getImage(result)
str_rd=getRelDate(result)
str_pub=getPublisher(result)
str_dev=getDeveloper(result)
lst_genres=getGenres(result)

if str_title is not None:
game = SubElement(gamelist, 'game')
path = SubElement(game, 'path')
Expand All @@ -373,41 +373,41 @@ def scanFiles(SystemInfo):
publisher=SubElement(game, 'publisher')
developer=SubElement(game, 'developer')
genres=SubElement(game, 'genres')

path.text=filepath
name.text=str_title
print "Game Found: %s" % str_title

if str_des is not None:
desc.text=str_des

if str_img is not None and args.noimg is False:
if args.newpath is True:
imgpath="./" + filename+os.path.splitext(str_img)[1]
else:
imgpath=os.path.abspath(os.path.join(root, filename+os.path.splitext(str_img)[1]))

print "Downloading boxart.."

downloadBoxart(str_img,imgpath)
imgpath=fixExtension(imgpath)
image.text=imgpath

if args.w:
try:
resizeImage(Image.open(imgpath),imgpath)
except:
print "Image resize error"

if str_rd is not None:
releasedate.text=str_rd

if str_pub is not None:
publisher.text=str_pub

if str_dev is not None:
developer.text=str_dev

if lst_genres is not None:
for genre in lst_genres:
newgenre = SubElement(genres, 'genre')
Expand Down