2012-09-13 15:27:34 +00:00
|
|
|
# This file is part of Mylar.
|
|
|
|
#
|
|
|
|
# Mylar is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# Mylar is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with Mylar. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
import platform, subprocess, re, os, urllib2, tarfile
|
|
|
|
|
|
|
|
import mylar
|
2015-06-23 06:02:08 +00:00
|
|
|
from mylar import logger, version
|
2012-09-13 15:27:34 +00:00
|
|
|
|
2016-09-07 04:04:42 +00:00
|
|
|
import requests
|
2015-06-22 03:38:10 +00:00
|
|
|
import re
|
2012-09-13 15:27:34 +00:00
|
|
|
|
|
|
|
def runGit(args):
|
|
|
|
|
2017-11-29 14:19:02 +00:00
|
|
|
git_locations = []
|
2017-11-29 02:45:31 +00:00
|
|
|
if mylar.CONFIG.GIT_PATH is not None:
|
2017-11-29 14:19:02 +00:00
|
|
|
git_locations.append(mylar.CONFIG.GIT_PATH)
|
2017-11-29 02:45:31 +00:00
|
|
|
|
|
|
|
git_locations.append('git')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if platform.system().lower() == 'darwin':
|
|
|
|
git_locations.append('/usr/local/git/bin/git')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
output = err = None
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
for cur_git in git_locations:
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2017-11-29 02:45:31 +00:00
|
|
|
cmd = '%s %s' % (cur_git, args)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
try:
|
2017-11-29 02:45:31 +00:00
|
|
|
#logger.debug('Trying to execute: %s with shell in %s' % (cmd, mylar.PROG_DIR))
|
2012-09-13 15:27:34 +00:00
|
|
|
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=mylar.PROG_DIR)
|
|
|
|
output, err = p.communicate()
|
2017-11-29 02:45:31 +00:00
|
|
|
#logger.debug('Git output: %s' % output)
|
2018-04-16 17:59:17 +00:00
|
|
|
except Exception as e:
|
|
|
|
logger.error('Command %s didn\'t work [%s]' % (cmd, e))
|
2012-09-13 15:27:34 +00:00
|
|
|
continue
|
2018-04-16 17:59:17 +00:00
|
|
|
else:
|
|
|
|
if all([err is not None, err != '']):
|
|
|
|
logger.error('Encountered error: %s' % err)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if 'not found' in output or "not recognized as an internal or external command" in output:
|
2018-04-16 17:59:17 +00:00
|
|
|
logger.error('[%s] Unable to find git with command: %s' % (output, cmd))
|
2012-09-13 15:27:34 +00:00
|
|
|
output = None
|
|
|
|
elif 'fatal:' in output or err:
|
2017-11-29 02:45:31 +00:00
|
|
|
logger.error('Error: %s' % err)
|
|
|
|
logger.error('Git returned bad info. Are you sure this is a git installation? [%s]' % output)
|
2012-09-13 15:27:34 +00:00
|
|
|
output = None
|
|
|
|
elif output:
|
|
|
|
break
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
return (output, err)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
def getVersion():
|
|
|
|
|
2017-10-25 18:33:56 +00:00
|
|
|
if mylar.CONFIG.GIT_BRANCH is not None and mylar.CONFIG.GIT_BRANCH.startswith('win32build'):
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
mylar.INSTALL_TYPE = 'win'
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
# Don't have a way to update exe yet, but don't want to set VERSION to None
|
2015-06-22 03:38:10 +00:00
|
|
|
return 'Windows Install', 'None'
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
elif os.path.isdir(os.path.join(mylar.PROG_DIR, '.git')):
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
mylar.INSTALL_TYPE = 'git'
|
|
|
|
output, err = runGit('rev-parse HEAD')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if not output:
|
|
|
|
logger.error('Couldn\'t find latest installed version.')
|
2015-06-22 03:38:10 +00:00
|
|
|
cur_commit_hash = None
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2013-01-13 18:08:21 +00:00
|
|
|
#branch_history, err = runGit("log --oneline --pretty=format:'%h - %ar - %s' -n 5")
|
|
|
|
#bh = []
|
|
|
|
#print ("branch_history: " + branch_history)
|
|
|
|
#bh.append(branch_history.split('\n'))
|
|
|
|
#print ("bh1: " + bh[0])
|
|
|
|
|
2015-06-22 03:38:10 +00:00
|
|
|
cur_commit_hash = str(output).strip()
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if not re.match('^[a-z0-9]+$', cur_commit_hash):
|
IMP: Ability to now specify search provider order (regardless of torrents or nzb) within the config.ini, IMP: (#667) Changed the db module to try to accomodate db locking errors and lowering the amount of actual write transactions that were committed along with a new scheduler system, IMP: Changed sabnzbd directory to post-processing, and included subdirs for sabnzbd & nzbget ComicRN scripts, IMP: NZBGet Post-Processing ComicRN.py script (updated for use with nzbget v11.0+)added & updated in post-processing/nzbget directory (thnx ministoat), FIX: If Issue Location was None, and status was Downloaded would cause error in GUI and break series, IMP: (#689) Minimum # of seeders added (will work with KAT), IMP: (#680) Added Boxcar 2 IO Notifications, IMP: Added PushBullet Notifications, IMP: Cleaned up some notification messages so it's not so cluttered, IMP: Added Clickable series link in History tab, IMP: Added Post-Processed as a status to History tab to show manually post-processed items, IMP: Removed log level dropdown from Logs page & added 'ThreadName' as a column, IMP: Added Force Check Availability & View Future Pull-list to Upcoming sub-tabs, IMP: Added '--safe' option to startup options which will redirect directly to Manage Comics screen incase things are broken, FIX: Added proper month conversions for manual post-processing when doing comparitive issue analysis for matches, FIX: (#613) Allow for negative issue numbers in post-processing when renaming and issue padding is enabled, FIX: File Permissions on post-processing would stop post-processing if couldn't change, now will just log the error and continue, IMP: Added Scheduler (from sickbeard) to allow for threadnaming and better scheduling, IMP: Filenames in the format of ' () ' will now get scanned in, IMP: During manual post-processing will now stop looking for matches upon a successful match, IMP: A Refresh/Weeklypull series check will now just scan in issue data, instead of series info,etc, IMP: Removed some legacy GCD code that is no longer in use, IMP: Exception/traceback handling will now be logged, FIX: Unable to grab torrents from KAT due to content-encoding detection failing, IMP: Added universal date-time conversion to allow for non-english based dates to be properly compared when checking search results against publication dates, FIX: Annuals will now get proper notification (prior was leaving out the word 'annual' from notification/logs), IMP: Improved future pull-list detection and increased retension (now ~5 months), IMP: Will now mark new issues as Wanted on a Refresh Series if autowant upcoming is enabled (was reverting to a status of None previously), IMP: Cannot change status to Downloaded if current status is Skipped or Wanted, FIX: (#704) UnSkipped will now work (X in options column on comic details page), IMP: future_check will check upcoming future issues (future pull-list) that have no series data yet (ie. #1's) and auto-add them to watchlist when the data is available and auto-want accordingly, IMP: (#706) Downloading issues to local machine (via comicdetails screen) with special characters in filename now will work, IMP: improved comparison checks during weekly pull list and improved speed abit since only refreshing issue data now instead of entire series, Other Referenced issues: (#670)(#690) and some others....
2014-05-25 18:32:11 +00:00
|
|
|
logger.error('Output does not look like a hash, not using it')
|
2015-06-22 03:38:10 +00:00
|
|
|
cur_commit_hash = None
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2017-10-25 18:33:56 +00:00
|
|
|
if mylar.CONFIG.GIT_BRANCH:
|
|
|
|
branch = mylar.CONFIG.GIT_BRANCH
|
2015-06-22 03:38:10 +00:00
|
|
|
|
|
|
|
else:
|
|
|
|
branch = None
|
|
|
|
|
2018-04-16 17:59:17 +00:00
|
|
|
branch_name, err = runGit('branch --contains %s' % cur_commit_hash)
|
|
|
|
if not branch_name:
|
|
|
|
logger.warn('Could not retrieve branch name [%s] from git. Defaulting to Master.' % branch)
|
2015-06-22 03:38:10 +00:00
|
|
|
branch = 'master'
|
|
|
|
else:
|
2018-04-16 17:59:17 +00:00
|
|
|
for line in branch_name.split('\n'):
|
|
|
|
if '*' in line:
|
|
|
|
branch = re.sub('[\*\n]','',line).strip()
|
|
|
|
break
|
|
|
|
|
|
|
|
if not branch and mylar.CONFIG.GIT_BRANCH:
|
|
|
|
logger.warn('Unable to retrieve branch name [%s] from git. Setting branch to configuration value of : %s' % (branch, mylar.CONFIG.GIT_BRANCH))
|
|
|
|
branch = mylar.CONFIG.GIT_BRANCH
|
|
|
|
if not branch:
|
|
|
|
logger.warn('Could not retrieve branch name [%s] from git. Defaulting to Master.' % branch)
|
|
|
|
branch = 'master'
|
|
|
|
else:
|
|
|
|
logger.info('Branch detected & set to : %s' % branch)
|
2015-06-22 03:38:10 +00:00
|
|
|
|
|
|
|
return cur_commit_hash, branch
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
else:
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
mylar.INSTALL_TYPE = 'source'
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
version_file = os.path.join(mylar.PROG_DIR, 'version.txt')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if not os.path.isfile(version_file):
|
2015-06-23 06:02:08 +00:00
|
|
|
current_version = None
|
|
|
|
else:
|
|
|
|
with open(version_file, 'r') as f:
|
|
|
|
current_version = f.read().strip(' \n\r')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if current_version:
|
2017-10-25 18:33:56 +00:00
|
|
|
if mylar.CONFIG.GIT_BRANCH:
|
|
|
|
logger.info('Branch detected & set to : ' + mylar.CONFIG.GIT_BRANCH)
|
|
|
|
return current_version, mylar.CONFIG.GIT_BRANCH
|
2015-06-22 13:01:17 +00:00
|
|
|
else:
|
2015-06-23 06:02:08 +00:00
|
|
|
logger.warn('No branch specified within config - will attempt to poll version from mylar')
|
|
|
|
try:
|
|
|
|
branch = version.MYLAR_VERSION
|
|
|
|
logger.info('Branch detected & set to : ' + branch)
|
|
|
|
except:
|
|
|
|
branch = 'master'
|
|
|
|
logger.info('Unable to detect branch properly - set branch in config.ini, currently defaulting to : ' + branch)
|
|
|
|
return current_version, branch
|
2012-09-13 15:27:34 +00:00
|
|
|
else:
|
2017-10-25 18:33:56 +00:00
|
|
|
if mylar.CONFIG.GIT_BRANCH:
|
|
|
|
logger.info('Branch detected & set to : ' + mylar.CONFIG.GIT_BRANCH)
|
|
|
|
return current_version, mylar.CONFIG.GIT_BRANCH
|
2015-06-23 06:02:08 +00:00
|
|
|
else:
|
|
|
|
logger.warn('No branch specified within config - will attempt to poll version from mylar')
|
|
|
|
try:
|
|
|
|
branch = version.MYLAR_VERSION
|
|
|
|
logger.info('Branch detected & set to : ' + branch)
|
|
|
|
except:
|
|
|
|
branch = 'master'
|
|
|
|
logger.info('Unable to detect branch properly - set branch in config.ini, currently defaulting to : ' + branch)
|
|
|
|
return current_version, branch
|
|
|
|
|
2015-06-22 13:01:17 +00:00
|
|
|
logger.warn('Unable to determine which commit is currently being run. Defaulting to Master branch.')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2018-04-16 17:59:17 +00:00
|
|
|
def checkGithub(current_version=None):
|
|
|
|
if current_version is None:
|
|
|
|
current_version = mylar.CURRENT_VERSION
|
2012-09-13 15:27:34 +00:00
|
|
|
|
|
|
|
# Get the latest commit available from github
|
2017-10-25 18:33:56 +00:00
|
|
|
url = 'https://api.github.com/repos/%s/mylar/commits/%s' % (mylar.CONFIG.GIT_USER, mylar.CONFIG.GIT_BRANCH)
|
2012-09-13 15:27:34 +00:00
|
|
|
try:
|
2015-06-22 03:38:10 +00:00
|
|
|
response = requests.get(url, verify=True)
|
|
|
|
git = response.json()
|
2012-09-13 15:27:34 +00:00
|
|
|
mylar.LATEST_VERSION = git['sha']
|
2018-03-11 15:51:52 +00:00
|
|
|
except Exception as e:
|
|
|
|
logger.warn('[ERROR] Could not get the latest commit from github: %s' % e)
|
2012-09-13 15:27:34 +00:00
|
|
|
mylar.COMMITS_BEHIND = 0
|
|
|
|
return mylar.CURRENT_VERSION
|
2015-05-22 08:32:51 +00:00
|
|
|
|
|
|
|
# See how many commits behind we are
|
2018-04-16 17:59:17 +00:00
|
|
|
if current_version is not None:
|
|
|
|
logger.fdebug('Comparing currently installed version [%s] with latest github version [%s]' % (current_version, mylar.LATEST_VERSION))
|
|
|
|
url = 'https://api.github.com/repos/%s/mylar/compare/%s...%s' % (mylar.CONFIG.GIT_USER, current_version, mylar.LATEST_VERSION)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
try:
|
2015-06-22 03:38:10 +00:00
|
|
|
response = requests.get(url, verify=True)
|
|
|
|
git = response.json()
|
2012-09-13 15:27:34 +00:00
|
|
|
mylar.COMMITS_BEHIND = git['total_commits']
|
2018-03-11 15:51:52 +00:00
|
|
|
except Exception as e:
|
|
|
|
logger.warn('[ERROR] Could not get commits behind from github: %s' % e)
|
2012-09-13 15:27:34 +00:00
|
|
|
mylar.COMMITS_BEHIND = 0
|
|
|
|
return mylar.CURRENT_VERSION
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if mylar.COMMITS_BEHIND >= 1:
|
|
|
|
logger.info('New version is available. You are %s commits behind' % mylar.COMMITS_BEHIND)
|
|
|
|
elif mylar.COMMITS_BEHIND == 0:
|
|
|
|
logger.info('Mylar is up to date')
|
|
|
|
elif mylar.COMMITS_BEHIND == -1:
|
|
|
|
logger.info('You are running an unknown version of Mylar. Run the updater to identify your version')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
else:
|
|
|
|
logger.info('You are running an unknown version of Mylar. Run the updater to identify your version')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
return mylar.LATEST_VERSION
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
def update():
|
|
|
|
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if mylar.INSTALL_TYPE == 'win':
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
logger.info('Windows .exe updating not supported yet.')
|
|
|
|
pass
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
|
|
|
|
elif mylar.INSTALL_TYPE == 'git':
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2017-10-25 18:33:56 +00:00
|
|
|
output, err = runGit('pull origin ' + mylar.CONFIG.GIT_BRANCH)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2017-11-29 02:45:31 +00:00
|
|
|
if output is None:
|
2012-09-13 15:27:34 +00:00
|
|
|
logger.error('Couldn\'t download latest version')
|
2017-11-29 02:45:31 +00:00
|
|
|
return
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
for line in output.split('\n'):
|
2017-10-25 18:33:56 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if 'Already up-to-date.' in line:
|
|
|
|
logger.info('No update available, not updating')
|
|
|
|
logger.info('Output: ' + str(output))
|
|
|
|
elif line.endswith('Aborting.'):
|
2015-05-22 08:32:51 +00:00
|
|
|
logger.error('Unable to update from git: ' +line)
|
2012-09-13 15:27:34 +00:00
|
|
|
logger.info('Output: ' + str(output))
|
2017-10-25 18:33:56 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
else:
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2017-10-25 18:33:56 +00:00
|
|
|
tar_download_url = 'https://github.com/%s/mylar/tarball/%s' % (mylar.CONFIG.GIT_USER, mylar.CONFIG.GIT_BRANCH)
|
2012-09-13 15:27:34 +00:00
|
|
|
update_dir = os.path.join(mylar.PROG_DIR, 'update')
|
|
|
|
version_path = os.path.join(mylar.PROG_DIR, 'version.txt')
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
try:
|
2015-06-22 03:38:10 +00:00
|
|
|
logger.info('Downloading update from: ' + tar_download_url)
|
|
|
|
response = requests.get(tar_download_url, verify=True, stream=True)
|
IMP: Cleaned up interface for StoryArcs / Story Arc Details, IMP: Cleaned up interface for Reading list Management, IMP: Added better reading list management - new status (added, downloaded, read), IMP: Added sync option for use with another device for reading list transfer (ie. tablet) Android only, IMP: Autopopulate new weekly pull releases to reading list, IMP: 'Watch' option in weekly pull list now fully functional. Will watch CV for series' that do not have any series data yet as they are new starting series. Will auto-add once available, IMP: Auto-watch check is run after every refresh/recreate of the weeklypull list, IMP: Improved the Add a Series option where it will now look for issues that are 'new' or 'wanted' during add sequence, IMP: Main page interface now has coloured have/total bars to denote series completion, IMP: New scheduler / threading locks in place in an attempt to avoid database locks, FIX: Removed some erroneous locking that was going on when importing a directory was being run, IMP: Stat counter now present when post-processing multiple issues in sequence, FIX: for issue number error when post-processing and issue number was a non-alphanumeric, FIX: for metatagging: when original file was .cbz, would try to convert and fail, FIX: for issues that were negative and were preceeded by a # in the filename (filechecker), FIX: for publisher having non-alphanumeric character in name when attempting to determine publisher, FIX: if annuals enabled, would incorrectly show as being 'already in library' when viewing search results if results constained annuals, FIX:(#944) for incorrect nzbname being used when post-processing was being performed from an nzb client (experimental mainly), IMP: Turned off logging for ComicVine API counter, FIX: Added retry attempts when connecting to ComicVine in order to avoid errors when adding a series, IMP:(#963) Added ability to add snatched to filter when viewing Wanted issues on Wanted tab, FIX: When importing and then selecting a series to import via the select screen, will now flip back to the importresults and add the selected series in the background, IMP:(#952) Main page is now sorted in ascending order by Continuing/Ended status (and subbed by whether is Active/Paused).Custom sorting is still available, FIX: Dupecheck will now automatically assume existing 0-byte files are to be overwritten when performing post-processing, FIX: If publication date for series contained a '?' (usually with brand new series) will force to 'Present' to allow for pull-list comparisons to take place, FIX: Mylar will now disallow search results which have 'covers only' or 'variant' in the filename, IMP: Better nzbname generation/retrieval (will check inside nzb for possible names) to be used when post-processing, IMP: DB Update will now perform update to all active comics in descending order by Latest Date (instead of random order), FIX: Enforce the 5hr limit rule when running DB update (will only update series that haven't been updated in >5 hours), FIX: Annuals will now have/retain the proper status upon doing DB Update, FIX: Have totals will now be updated when doing a recheck files (sometimes wouldn't get updated depending on various states of status'), FIX:(#966) Added urllib2.URLError exeception trap when attempting to check Git for updates, IMP: Removed the individual sqlite calls for weeklypull, and brought them into line with using the db module (which will minimize concurrent access, which seemed to be causing db locks), IMP: Cleaned up some code and shuffled some functions so they are in more appropriate locations
2015-03-27 17:27:59 +00:00
|
|
|
except (IOError, urllib2.URLError):
|
2015-06-22 03:38:10 +00:00
|
|
|
logger.error("Unable to retrieve new version from " + tar_download_url + ", can't update")
|
2012-09-13 15:27:34 +00:00
|
|
|
return
|
2013-02-28 18:03:26 +00:00
|
|
|
|
2015-05-22 08:32:51 +00:00
|
|
|
#try sanitizing the name here...
|
2017-10-25 18:33:56 +00:00
|
|
|
download_name = mylar.CONFIG.GIT_BRANCH + '-github' #data.geturl().split('/')[-1].split('?')[0]
|
2012-09-13 15:27:34 +00:00
|
|
|
tar_download_path = os.path.join(mylar.PROG_DIR, download_name)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
# Save tar to disk
|
2015-06-22 03:38:10 +00:00
|
|
|
with open(tar_download_path, 'wb') as f:
|
|
|
|
for chunk in response.iter_content(chunk_size=1024):
|
|
|
|
if chunk: # filter out keep-alive new chunks
|
|
|
|
f.write(chunk)
|
|
|
|
f.flush()
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
# Extract the tar to update folder
|
2017-11-29 02:45:31 +00:00
|
|
|
logger.info('Extracting file' + tar_download_path)
|
2012-09-13 15:27:34 +00:00
|
|
|
tar = tarfile.open(tar_download_path)
|
|
|
|
tar.extractall(update_dir)
|
|
|
|
tar.close()
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
# Delete the tar.gz
|
|
|
|
logger.info('Deleting file' + tar_download_path)
|
|
|
|
os.remove(tar_download_path)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
# Find update dir name
|
|
|
|
update_dir_contents = [x for x in os.listdir(update_dir) if os.path.isdir(os.path.join(update_dir, x))]
|
|
|
|
if len(update_dir_contents) != 1:
|
2015-05-22 08:32:51 +00:00
|
|
|
logger.error(u"Invalid update data, update failed: " +str(update_dir_contents))
|
2012-09-13 15:27:34 +00:00
|
|
|
return
|
|
|
|
content_dir = os.path.join(update_dir, update_dir_contents[0])
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
# walk temp folder and move files to main folder
|
|
|
|
for dirname, dirnames, filenames in os.walk(content_dir):
|
2015-05-22 08:32:51 +00:00
|
|
|
dirname = dirname[len(content_dir) +1:]
|
2012-09-13 15:27:34 +00:00
|
|
|
for curfile in filenames:
|
|
|
|
old_path = os.path.join(content_dir, dirname, curfile)
|
|
|
|
new_path = os.path.join(mylar.PROG_DIR, dirname, curfile)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
if os.path.isfile(new_path):
|
|
|
|
os.remove(new_path)
|
|
|
|
os.renames(old_path, new_path)
|
2015-05-22 08:32:51 +00:00
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
# Update version.txt
|
|
|
|
try:
|
2015-06-22 03:38:10 +00:00
|
|
|
with open(version_path, 'w') as f:
|
|
|
|
f.write(str(mylar.LATEST_VERSION))
|
2018-04-16 17:59:17 +00:00
|
|
|
except IOError as e:
|
|
|
|
logger.error("Unable to write current version to version.txt, update not complete: %s" % ex(e))
|
2012-09-13 15:27:34 +00:00
|
|
|
return
|
2018-04-16 17:59:17 +00:00
|
|
|
|
|
|
|
def versionload():
|
|
|
|
|
|
|
|
mylar.CURRENT_VERSION, mylar.CONFIG.GIT_BRANCH = getVersion()
|
|
|
|
|
|
|
|
if mylar.CURRENT_VERSION is not None:
|
|
|
|
hash = mylar.CURRENT_VERSION[:7]
|
|
|
|
else:
|
|
|
|
hash = "unknown"
|
|
|
|
|
|
|
|
if mylar.CONFIG.GIT_BRANCH == 'master':
|
|
|
|
vers = 'M'
|
|
|
|
elif mylar.CONFIG.GIT_BRANCH == 'development':
|
|
|
|
vers = 'D'
|
|
|
|
else:
|
|
|
|
vers = 'NONE'
|
|
|
|
|
|
|
|
mylar.USER_AGENT = 'Mylar/' +str(hash) +'(' +vers +') +http://www.github.com/evilhero/mylar/'
|
|
|
|
|
|
|
|
logger.info('Version information: %s [%s]' % (mylar.CONFIG.GIT_BRANCH, mylar.CURRENT_VERSION))
|
|
|
|
|
|
|
|
if mylar.CONFIG.CHECK_GITHUB_ON_STARTUP:
|
|
|
|
try:
|
|
|
|
mylar.LATEST_VERSION = checkGithub() #(CURRENT_VERSION)
|
|
|
|
except:
|
|
|
|
mylar.LATEST_VERSION = mylar.CURRENT_VERSION
|
|
|
|
else:
|
|
|
|
mylar.LATEST_VERSION = mylar.CURRENT_VERSION
|
|
|
|
|
|
|
|
if mylar.CONFIG.AUTO_UPDATE:
|
|
|
|
if mylar.CURRENT_VERSION != mylar.LATEST_VERSION and mylar.INSTALL_TYPE != 'win' and mylar.COMMITS_BEHIND > 0:
|
|
|
|
logger.info('Auto-updating has been enabled. Attempting to auto-update.')
|
|
|
|
#SIGNAL = 'update'
|