mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-14 02:26:53 -07:00
Fix quotes - standardize to single-quoted strings
This commit is contained in:
Labrys of Knossos
parent
85b4e22046
commit
c5343889fb
30 changed files with 1257 additions and 1257 deletions
|
|
@ -66,13 +66,13 @@ class CheckVersion(object):
|
|||
"""
|
||||
|
||||
if not core.VERSION_NOTIFY and not force:
|
||||
logger.log(u"Version checking is disabled, not checking for the newest version")
|
||||
logger.log(u'Version checking is disabled, not checking for the newest version')
|
||||
return False
|
||||
|
||||
logger.log(u"Checking if {install} needs an update".format(install=self.install_type))
|
||||
logger.log(u'Checking if {install} needs an update'.format(install=self.install_type))
|
||||
if not self.updater.need_update():
|
||||
core.NEWEST_VERSION_STRING = None
|
||||
logger.log(u"No update needed")
|
||||
logger.log(u'No update needed')
|
||||
return False
|
||||
|
||||
self.updater.set_newest_text()
|
||||
|
|
@ -116,19 +116,19 @@ class GitUpdateManager(UpdateManager):
|
|||
test_cmd = 'version'
|
||||
|
||||
if core.GIT_PATH:
|
||||
main_git = '"{git}"'.format(git=core.GIT_PATH)
|
||||
main_git = '\'{git}\''.format(git=core.GIT_PATH)
|
||||
else:
|
||||
main_git = 'git'
|
||||
|
||||
logger.log(u"Checking if we can use git commands: {git} {cmd}".format
|
||||
logger.log(u'Checking if we can use git commands: {git} {cmd}'.format
|
||||
(git=main_git, cmd=test_cmd), logger.DEBUG)
|
||||
output, err, exit_status = self._run_git(main_git, test_cmd)
|
||||
|
||||
if exit_status == 0:
|
||||
logger.log(u"Using: {git}".format(git=main_git), logger.DEBUG)
|
||||
logger.log(u'Using: {git}'.format(git=main_git), logger.DEBUG)
|
||||
return main_git
|
||||
else:
|
||||
logger.log(u"Not using: {git}".format(git=main_git), logger.DEBUG)
|
||||
logger.log(u'Not using: {git}'.format(git=main_git), logger.DEBUG)
|
||||
|
||||
# trying alternatives
|
||||
|
||||
|
|
@ -143,18 +143,18 @@ class GitUpdateManager(UpdateManager):
|
|||
alternative_git.append(main_git.lower())
|
||||
|
||||
if alternative_git:
|
||||
logger.log(u"Trying known alternative git locations", logger.DEBUG)
|
||||
logger.log(u'Trying known alternative git locations', logger.DEBUG)
|
||||
|
||||
for cur_git in alternative_git:
|
||||
logger.log(u"Checking if we can use git commands: {git} {cmd}".format
|
||||
logger.log(u'Checking if we can use git commands: {git} {cmd}'.format
|
||||
(git=cur_git, cmd=test_cmd), logger.DEBUG)
|
||||
output, err, exit_status = self._run_git(cur_git, test_cmd)
|
||||
|
||||
if exit_status == 0:
|
||||
logger.log(u"Using: {git}".format(git=cur_git), logger.DEBUG)
|
||||
logger.log(u'Using: {git}'.format(git=cur_git), logger.DEBUG)
|
||||
return cur_git
|
||||
else:
|
||||
logger.log(u"Not using: {git}".format(git=cur_git), logger.DEBUG)
|
||||
logger.log(u'Not using: {git}'.format(git=cur_git), logger.DEBUG)
|
||||
|
||||
# Still haven't found a working git
|
||||
logger.debug('Unable to find your git executable - '
|
||||
|
|
@ -169,14 +169,14 @@ class GitUpdateManager(UpdateManager):
|
|||
err = None
|
||||
|
||||
if not git_path:
|
||||
logger.log(u"No git specified, can't use git commands", logger.DEBUG)
|
||||
logger.log(u'No git specified, can\'t use git commands', logger.DEBUG)
|
||||
exit_status = 1
|
||||
return output, err, exit_status
|
||||
|
||||
cmd = '{git} {args}'.format(git=git_path, args=args)
|
||||
|
||||
try:
|
||||
logger.log(u"Executing {cmd} with your shell in {directory}".format
|
||||
logger.log(u'Executing {cmd} with your shell in {directory}'.format
|
||||
(cmd=cmd, directory=core.APP_ROOT), logger.DEBUG)
|
||||
p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
||||
shell=True, cwd=core.APP_ROOT)
|
||||
|
|
@ -188,22 +188,22 @@ class GitUpdateManager(UpdateManager):
|
|||
if output:
|
||||
output = output.strip()
|
||||
if core.LOG_GIT:
|
||||
logger.log(u"git output: {output}".format(output=output), logger.DEBUG)
|
||||
logger.log(u'git output: {output}'.format(output=output), logger.DEBUG)
|
||||
|
||||
except OSError:
|
||||
logger.log(u"Command {cmd} didn't work".format(cmd=cmd))
|
||||
logger.log(u'Command {cmd} didn\'t work'.format(cmd=cmd))
|
||||
exit_status = 1
|
||||
|
||||
exit_status = 128 if ('fatal:' in output) or err else exit_status
|
||||
if exit_status == 0:
|
||||
logger.log(u"{cmd} : returned successful".format(cmd=cmd), logger.DEBUG)
|
||||
logger.log(u'{cmd} : returned successful'.format(cmd=cmd), logger.DEBUG)
|
||||
exit_status = 0
|
||||
elif core.LOG_GIT and exit_status in (1, 128):
|
||||
logger.log(u"{cmd} returned : {output}".format
|
||||
logger.log(u'{cmd} returned : {output}'.format
|
||||
(cmd=cmd, output=output), logger.DEBUG)
|
||||
else:
|
||||
if core.LOG_GIT:
|
||||
logger.log(u"{cmd} returned : {output}, treat as error for now".format
|
||||
logger.log(u'{cmd} returned : {output}, treat as error for now'.format
|
||||
(cmd=cmd, output=output), logger.DEBUG)
|
||||
exit_status = 1
|
||||
|
||||
|
|
@ -223,7 +223,7 @@ class GitUpdateManager(UpdateManager):
|
|||
if exit_status == 0 and output:
|
||||
cur_commit_hash = output.strip()
|
||||
if not re.match('^[a-z0-9]+$', cur_commit_hash):
|
||||
logger.log(u"Output doesn't look like a hash, not using it", logger.ERROR)
|
||||
logger.log(u'Output doesn\'t look like a hash, not using it', logger.ERROR)
|
||||
return False
|
||||
self._cur_commit_hash = cur_commit_hash
|
||||
if self._cur_commit_hash:
|
||||
|
|
@ -256,56 +256,56 @@ class GitUpdateManager(UpdateManager):
|
|||
output, err, exit_status = self._run_git(self._git_path, 'fetch origin')
|
||||
|
||||
if not exit_status == 0:
|
||||
logger.log(u"Unable to contact github, can't check for update", logger.ERROR)
|
||||
logger.log(u'Unable to contact github, can\'t check for update', logger.ERROR)
|
||||
return
|
||||
|
||||
# get latest commit_hash from remote
|
||||
output, err, exit_status = self._run_git(self._git_path, 'rev-parse --verify --quiet "@{upstream}"')
|
||||
output, err, exit_status = self._run_git(self._git_path, 'rev-parse --verify --quiet \'@{upstream}\'')
|
||||
|
||||
if exit_status == 0 and output:
|
||||
cur_commit_hash = output.strip()
|
||||
|
||||
if not re.match('^[a-z0-9]+$', cur_commit_hash):
|
||||
logger.log(u"Output doesn't look like a hash, not using it", logger.DEBUG)
|
||||
logger.log(u'Output doesn\'t look like a hash, not using it', logger.DEBUG)
|
||||
return
|
||||
|
||||
else:
|
||||
self._newest_commit_hash = cur_commit_hash
|
||||
else:
|
||||
logger.log(u"git didn't return newest commit hash", logger.DEBUG)
|
||||
logger.log(u'git didn\'t return newest commit hash', logger.DEBUG)
|
||||
return
|
||||
|
||||
# get number of commits behind and ahead (option --count not supported git < 1.7.2)
|
||||
output, err, exit_status = self._run_git(self._git_path, 'rev-list --left-right "@{upstream}"...HEAD')
|
||||
output, err, exit_status = self._run_git(self._git_path, 'rev-list --left-right \'@{upstream}\'...HEAD')
|
||||
|
||||
if exit_status == 0 and output:
|
||||
|
||||
try:
|
||||
self._num_commits_behind = int(output.count("<"))
|
||||
self._num_commits_ahead = int(output.count(">"))
|
||||
self._num_commits_behind = int(output.count('<'))
|
||||
self._num_commits_ahead = int(output.count('>'))
|
||||
|
||||
except Exception:
|
||||
logger.log(u"git didn't return numbers for behind and ahead, not using it", logger.DEBUG)
|
||||
logger.log(u'git didn\'t return numbers for behind and ahead, not using it', logger.DEBUG)
|
||||
return
|
||||
|
||||
logger.log(u"cur_commit = {current} % (newest_commit)= {new}, "
|
||||
u"num_commits_behind = {x}, num_commits_ahead = {y}".format
|
||||
logger.log(u'cur_commit = {current} % (newest_commit)= {new}, '
|
||||
u'num_commits_behind = {x}, num_commits_ahead = {y}'.format
|
||||
(current=self._cur_commit_hash, new=self._newest_commit_hash,
|
||||
x=self._num_commits_behind, y=self._num_commits_ahead), logger.DEBUG)
|
||||
|
||||
def set_newest_text(self):
|
||||
if self._num_commits_ahead:
|
||||
logger.log(u"Local branch is ahead of {branch}. Automatic update not possible.".format
|
||||
logger.log(u'Local branch is ahead of {branch}. Automatic update not possible.'.format
|
||||
(branch=self.branch), logger.ERROR)
|
||||
elif self._num_commits_behind:
|
||||
logger.log(u"There is a newer version available (you're {x} commit{s} behind)".format
|
||||
logger.log(u'There is a newer version available (you\'re {x} commit{s} behind)'.format
|
||||
(x=self._num_commits_behind, s=u's' if self._num_commits_behind > 1 else u''), logger.MESSAGE)
|
||||
else:
|
||||
return
|
||||
|
||||
def need_update(self):
|
||||
if not self._find_installed_version():
|
||||
logger.error("Unable to determine installed version via git, please check your logs!")
|
||||
logger.error('Unable to determine installed version via git, please check your logs!')
|
||||
return False
|
||||
|
||||
if not self._cur_commit_hash:
|
||||
|
|
@ -314,7 +314,7 @@ class GitUpdateManager(UpdateManager):
|
|||
try:
|
||||
self._check_github_for_update()
|
||||
except Exception as error:
|
||||
logger.log(u"Unable to contact github, can't check for update: {msg!r}".format(msg=error), logger.ERROR)
|
||||
logger.log(u'Unable to contact github, can\'t check for update: {msg!r}'.format(msg=error), logger.ERROR)
|
||||
return False
|
||||
|
||||
if self._num_commits_behind > 0:
|
||||
|
|
@ -358,7 +358,7 @@ class SourceUpdateManager(UpdateManager):
|
|||
with open(version_file, 'r') as fp:
|
||||
self._cur_commit_hash = fp.read().strip(' \n\r')
|
||||
except EnvironmentError as error:
|
||||
logger.log(u"Unable to open 'version.txt': {msg}".format(msg=error), logger.DEBUG)
|
||||
logger.log(u'Unable to open \'version.txt\': {msg}'.format(msg=error), logger.DEBUG)
|
||||
|
||||
if not self._cur_commit_hash:
|
||||
self._cur_commit_hash = None
|
||||
|
|
@ -372,7 +372,7 @@ class SourceUpdateManager(UpdateManager):
|
|||
try:
|
||||
self._check_github_for_update()
|
||||
except Exception as error:
|
||||
logger.log(u"Unable to contact github, can't check for update: {msg!r}".format(msg=error), logger.ERROR)
|
||||
logger.log(u'Unable to contact github, can\'t check for update: {msg!r}'.format(msg=error), logger.ERROR)
|
||||
return False
|
||||
|
||||
if not self._cur_commit_hash or self._num_commits_behind > 0:
|
||||
|
|
@ -418,7 +418,7 @@ class SourceUpdateManager(UpdateManager):
|
|||
# when _cur_commit_hash doesn't match anything _num_commits_behind == 100
|
||||
self._num_commits_behind += 1
|
||||
|
||||
logger.log(u"cur_commit = {current} % (newest_commit)= {new}, num_commits_behind = {x}".format
|
||||
logger.log(u'cur_commit = {current} % (newest_commit)= {new}, num_commits_behind = {x}'.format
|
||||
(current=self._cur_commit_hash, new=self._newest_commit_hash, x=self._num_commits_behind), logger.DEBUG)
|
||||
|
||||
def set_newest_text(self):
|
||||
|
|
@ -427,9 +427,9 @@ class SourceUpdateManager(UpdateManager):
|
|||
core.NEWEST_VERSION_STRING = None
|
||||
|
||||
if not self._cur_commit_hash:
|
||||
logger.log(u"Unknown current version number, don't know if we should update or not", logger.ERROR)
|
||||
logger.log(u'Unknown current version number, don\'t know if we should update or not', logger.ERROR)
|
||||
elif self._num_commits_behind > 0:
|
||||
logger.log(u"There is a newer version available (you're {x} commit{s} behind)".format
|
||||
logger.log(u'There is a newer version available (you\'re {x} commit{s} behind)'.format
|
||||
(x=self._num_commits_behind, s=u's' if self._num_commits_behind > 1 else u''), logger.MESSAGE)
|
||||
else:
|
||||
return
|
||||
|
|
@ -447,47 +447,47 @@ class SourceUpdateManager(UpdateManager):
|
|||
sb_update_dir = os.path.join(core.APP_ROOT, u'sb-update')
|
||||
|
||||
if os.path.isdir(sb_update_dir):
|
||||
logger.log(u"Clearing out update folder {dir} before extracting".format(dir=sb_update_dir))
|
||||
logger.log(u'Clearing out update folder {dir} before extracting'.format(dir=sb_update_dir))
|
||||
shutil.rmtree(sb_update_dir)
|
||||
|
||||
logger.log(u"Creating update folder {dir} before extracting".format(dir=sb_update_dir))
|
||||
logger.log(u'Creating update folder {dir} before extracting'.format(dir=sb_update_dir))
|
||||
os.makedirs(sb_update_dir)
|
||||
|
||||
# retrieve file
|
||||
logger.log(u"Downloading update from {url!r}".format(url=tar_download_url))
|
||||
logger.log(u'Downloading update from {url!r}'.format(url=tar_download_url))
|
||||
tar_download_path = os.path.join(sb_update_dir, u'nzbtomedia-update.tar')
|
||||
urlretrieve(tar_download_url, tar_download_path)
|
||||
|
||||
if not os.path.isfile(tar_download_path):
|
||||
logger.log(u"Unable to retrieve new version from {url}, can't update".format
|
||||
logger.log(u'Unable to retrieve new version from {url}, can\'t update'.format
|
||||
(url=tar_download_url), logger.ERROR)
|
||||
return False
|
||||
|
||||
if not tarfile.is_tarfile(tar_download_path):
|
||||
logger.log(u"Retrieved version from {url} is corrupt, can't update".format
|
||||
logger.log(u'Retrieved version from {url} is corrupt, can\'t update'.format
|
||||
(url=tar_download_url), logger.ERROR)
|
||||
return False
|
||||
|
||||
# extract to sb-update dir
|
||||
logger.log(u"Extracting file {path}".format(path=tar_download_path))
|
||||
logger.log(u'Extracting file {path}'.format(path=tar_download_path))
|
||||
tar = tarfile.open(tar_download_path)
|
||||
tar.extractall(sb_update_dir)
|
||||
tar.close()
|
||||
|
||||
# delete .tar.gz
|
||||
logger.log(u"Deleting file {path}".format(path=tar_download_path))
|
||||
logger.log(u'Deleting file {path}'.format(path=tar_download_path))
|
||||
os.remove(tar_download_path)
|
||||
|
||||
# find update dir name
|
||||
update_dir_contents = [x for x in os.listdir(sb_update_dir) if
|
||||
os.path.isdir(os.path.join(sb_update_dir, x))]
|
||||
if len(update_dir_contents) != 1:
|
||||
logger.log(u"Invalid update data, update failed: {0}".format(update_dir_contents), logger.ERROR)
|
||||
logger.log(u'Invalid update data, update failed: {0}'.format(update_dir_contents), logger.ERROR)
|
||||
return False
|
||||
content_dir = os.path.join(sb_update_dir, update_dir_contents[0])
|
||||
|
||||
# walk temp folder and move files to main folder
|
||||
logger.log(u"Moving files from {source} to {destination}".format
|
||||
logger.log(u'Moving files from {source} to {destination}'.format
|
||||
(source=content_dir, destination=core.APP_ROOT))
|
||||
for dirname, dirnames, filenames in os.walk(content_dir): # @UnusedVariable
|
||||
dirname = dirname[len(content_dir) + 1:]
|
||||
|
|
@ -504,7 +504,7 @@ class SourceUpdateManager(UpdateManager):
|
|||
os.remove(new_path)
|
||||
os.renames(old_path, new_path)
|
||||
except Exception as error:
|
||||
logger.log(u"Unable to update {path}: {msg}".format
|
||||
logger.log(u'Unable to update {path}: {msg}'.format
|
||||
(path=new_path, msg=error), logger.DEBUG)
|
||||
os.remove(old_path) # Trash the updated file without moving in new path
|
||||
continue
|
||||
|
|
@ -518,14 +518,14 @@ class SourceUpdateManager(UpdateManager):
|
|||
with open(version_path, 'w') as ver_file:
|
||||
ver_file.write(self._newest_commit_hash)
|
||||
except EnvironmentError as error:
|
||||
logger.log(u"Unable to write version file, update not complete: {msg}".format
|
||||
logger.log(u'Unable to write version file, update not complete: {msg}'.format
|
||||
(msg=error), logger.ERROR)
|
||||
return False
|
||||
|
||||
except Exception as error:
|
||||
logger.log(u"Error while trying to update: {msg}".format
|
||||
logger.log(u'Error while trying to update: {msg}'.format
|
||||
(msg=error), logger.ERROR)
|
||||
logger.log(u"Traceback: {error}".format(error=traceback.format_exc()), logger.DEBUG)
|
||||
logger.log(u'Traceback: {error}'.format(error=traceback.format_exc()), logger.DEBUG)
|
||||
return False
|
||||
|
||||
return True
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue