monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-05 17:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #694 from echel0n/dev

Browse source 
Fixes update issues for source code downloaded versions
This commit is contained in:
echel0n 2014-08-07 23:34:47 -07:00
commit 12ce38dfd1
1 changed files with 9 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sickbeard/versionChecker.py
View file

@ -430,7 +430,9 @@ class GitUpdateManager(UpdateManager):
branch = branch_info.strip().replace('refs/heads/', '', 1)
if branch:
return branch
return ""
def _check_github_for_update(self):
"""
Uses git commands to check if there is a newer version that the provided
@ -567,7 +569,7 @@ class SourceUpdateManager(UpdateManager):
self._cur_commit_hash = None
self._newest_commit_hash = None
self._num_commits_behind = 0
def _find_installed_version(self):
installed_path = os.path.dirname(os.path.normpath(os.path.abspath(__file__)))
self._cur_commit_hash = self.hash_dir(installed_path)
@ -577,11 +579,11 @@ class SourceUpdateManager(UpdateManager):
sickbeard.CUR_COMMIT_HASH = str(self._cur_commit_hash)
def _find_installed_branch(self):
gh = github.GitHub(self.github_repo_user, self.github_repo, self.branch)
for branch in gh.branches():
if 'commit' in branch and self._cur_commit_hash and branch.commit['sha'] == self._cur_commit_hash:
return branch.name
if sickbeard.BRANCH == "":
return "master"
return ""
def need_update(self):
if self.branch != self._find_installed_branch():
@ -757,31 +759,3 @@ class SourceUpdateManager(UpdateManager):
def list_remote_branches(self):
gh = github.GitHub(self.github_repo_user, self.github_repo, self.branch)
return [x.name for x in gh.branches()]
def _lstree(self, files, dirs):
"""Make git ls-tree like output."""
for f, sha1 in files:
yield "100644 blob {}\t{}\0".format(sha1, f)
for d, sha1 in dirs:
yield "040000 tree {}\t{}\0".format(sha1, d)
def _mktree(self, files, dirs):
mkt = subprocess.Popen(["git", "mktree", "-z"], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
return mkt.communicate("".join(self._lstree(files, dirs)))[0].strip()
def hash_file(self, path):
"""Write file at path to Git index, return its SHA1 as a string."""
return subprocess.check_output(["git", "hash-object", "-w", "--", path]).strip()
def hash_dir(self, path):
"""Write directory at path to Git index, return its SHA1 as a string."""
dir_hash = {}
for root, dirs, files in os.walk(path, topdown=False):
f_hash = ((f, self.hash_file(os.path.join(root, f))) for f in files)
d_hash = ((d, dir_hash[os.path.join(root, d)]) for d in dirs)
# split+join normalizes paths on Windows (note the imports)
dir_hash[os.path.join(*os.path.split(root))] = self._mktree(f_hash, d_hash)
return dir_hash[path]