Skip to content

Commit

Permalink
Merge pull request eddie3#52 from Kalanyr/master
Browse files Browse the repository at this point in the history
Resync Dev to Master
  • Loading branch information
Kalanyr authored Feb 3, 2022
2 parents 90598fb + 55e117c commit 0c9638c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions gogrepoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ def handle_game_renames(savedir,gamesdb,dryrun):
if not dryrun:
shutil.move(src_dir,dst_dir)
except Exception:
error(' -> rename failed "{}" -> "{}"'.format(olditem.title, newitem.title))
error(' -> rename failed "{}" -> "{}"'.format(game.old_title, game.title))
for item in game.downloads+game.galaxyDownloads+game.sharedDownloads+game.extras:
try:
_ = item.old_name
Expand Down Expand Up @@ -2614,7 +2614,7 @@ def __init__(self):
self.ES_SYSTEM_REQUIRED = 0x00000001
self.ES_DISPLAY_REQUIRED = 0x00000002
#Windows is not particularly consistent on what is required for a wakelock for a script that often uses a USB device, so define WAKELOCK for easy changing. This works on Windows 10 as of the October 2017 update.
self.ES_WAKELOCK = self.ES_CONTINUOUS | self.ES_SYSTEM_REQUIRED
self.ES_WAKELOCK = self.ES_CONTINUOUS | self.ES_SYSTEM_REQUIRED | self.ES_DISPLAY_REQUIRED

if (platform.system() == "Darwin"):

Expand All @@ -2633,7 +2633,7 @@ def __init__(self):


def _CFSTR(self,py_string):
return CoreFoundation.CFStringCreateWithCString(None, py_string, CoreFoundation.kCFStringEncodingASCII)
return CoreFoundation.CFStringCreateWithCString(None, py_string.encode('utf-8'), CoreFoundation.kCFStringEncodingUTF8)

def raw_ptr(self,pyobjc_string):
return objc.pyobjc_id(pyobjc_string.nsstring())
Expand Down

0 comments on commit 0c9638c

Please sign in to comment.