Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-11-04 03:27:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Switch version check to new server

Browse Source
This commit is contained in:
Kovid Goyal 2015-01-12 11:40:39 +05:30
parent 0050a3aba7
commit 1a8c28ecb9
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/linux-installer.py
View File

@ -13,7 +13,6 @@ from contextlib import closing
is64bit = platform.architecture()[0] == '64bit' is64bit = platform.architecture()[0] == '64bit'
url = 'http://status.calibre-ebook.com/dist/linux'+('64' if is64bit else '32') url = 'http://status.calibre-ebook.com/dist/linux'+('64' if is64bit else '32')
signature_url = 'http://code.calibre-ebook.com/signatures/%s.sha512'
url = os.environ.get('CALIBRE_INSTALLER_LOCAL_URL', url) url = os.environ.get('CALIBRE_INSTALLER_LOCAL_URL', url)
py3 = sys.version_info[0] > 2 py3 = sys.version_info[0] > 2
enc = getattr(sys.stdout, 'encoding', 'UTF-8') or 'utf-8' enc = getattr(sys.stdout, 'encoding', 'UTF-8') or 'utf-8'
@ -609,7 +608,7 @@ def extract_tarball(raw, destdir):
def get_tarball_info(): def get_tarball_info():
global signature, calibre_version global signature, calibre_version
print ('Downloading tarball signature securely...') print ('Downloading tarball signature securely...')
raw = get_https_resource_securely('https://status.calibre-ebook.com/tarball-info/' + raw = get_https_resource_securely('https://code.calibre-ebook.com/tarball-info/' +
('x86_64' if is64bit else 'i686')) ('x86_64' if is64bit else 'i686'))
signature, calibre_version = raw.rpartition(b'@')[::2] signature, calibre_version = raw.rpartition(b'@')[::2]
if not signature or not calibre_version: if not signature or not calibre_version:

14
setup/upload.py
View File

@ -282,16 +282,10 @@ class UploadToServer(Command): # {{{
def run(self, opts): def run(self, opts):
upload_signatures() upload_signatures()
check_call('gpg --armor --detach-sign dist/calibre-*.tar.xz', check_call('gpg --armor --detach-sign dist/calibre-*.tar.xz', shell=True)
shell=True) check_call('scp dist/calibre-*.tar.xz.asc code:/srv/code/signatures/', shell=True)
check_call('scp dist/calibre-*.tar.xz.asc divok:%s/signatures/'%DOWNLOADS, check_call('ssh code /etc/cron.hourly/update-calibre-code.py'.split())
shell=True) check_call(('ssh code /apps/update-calibre-version.py ' + __version__).split())
check_call('ssh divok /usr/local/bin/update-calibre',
shell=True)
check_call('''ssh divok echo %s \\> %s/latest_version'''
%(__version__, DOWNLOADS), shell=True)
check_call('ssh divok /etc/init.d/apache2 graceful',
shell=True)
# }}} # }}}
# Testing {{{ # Testing {{{

30
src/calibre/gui2/update.py
View File

@ -1,22 +1,22 @@
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import re, binascii, cPickle import re, binascii, cPickle, ssl
from future_builtins import map from future_builtins import map
from threading import Thread, Event from threading import Thread, Event
from PyQt5.Qt import (QObject, pyqtSignal, Qt, QUrl, QDialog, QGridLayout, from PyQt5.Qt import (QObject, pyqtSignal, Qt, QUrl, QDialog, QGridLayout,
QLabel, QCheckBox, QDialogButtonBox, QIcon, QPixmap) QLabel, QCheckBox, QDialogButtonBox, QIcon, QPixmap)
import mechanize
from calibre.constants import (__appname__, __version__, iswindows, isosx, from calibre.constants import (__appname__, __version__, iswindows, isosx,
isportable, is64bit, numeric_version) isportable, is64bit, numeric_version)
from calibre import browser, prints, as_unicode from calibre import prints, as_unicode
from calibre.utils.config import prefs from calibre.utils.config import prefs
from calibre.utils.https import get_https_resource_securely
from calibre.gui2 import config, dynamic, open_url from calibre.gui2 import config, dynamic, open_url
from calibre.gui2.dialogs.plugin_updater import get_plugin_updates_available from calibre.gui2.dialogs.plugin_updater import get_plugin_updates_available
URL = 'http://status.calibre-ebook.com/latest' URL = 'https://code.calibre-ebook.com/latest'
# URL = 'http://localhost:8000/latest' # URL = 'http://localhost:8000/latest'
NO_CALIBRE_UPDATE = (0, 0, 0) NO_CALIBRE_UPDATE = (0, 0, 0)
@ -28,13 +28,21 @@ def get_download_url():
return 'http://calibre-ebook.com/download_' + which return 'http://calibre-ebook.com/download_' + which
def get_newest_version(): def get_newest_version():
br = browser() headers={
req = mechanize.Request(URL) 'CALIBRE-VERSION':__version__,
req.add_header('CALIBRE_VERSION', __version__) 'CALIBRE-OS': ('win' if iswindows else 'osx' if isosx else 'oth'),
req.add_header('CALIBRE_OS', 'CALIBRE-INSTALL-UUID': prefs['installation_uuid']
'win' if iswindows else 'osx' if isosx else 'oth') }
req.add_header('CALIBRE_INSTALL_UUID', prefs['installation_uuid']) try:
version = br.open(req).read().strip() version = get_https_resource_securely(URL, headers=headers)
except ssl.SSLError as err:
if getattr(err, 'reason', None) != 'CERTIFICATE_VERIFY_FAILED':
raise
# certificate verification failed, since the version check contains no
# critical information, ignore and proceed
# We have to do this as if the calibre CA certificate ever
# needs to be revoked, then we wont be able to do version checks
version = get_https_resource_securely(URL, headers=headers, cacerts=None)
try: try:
version = version.decode('utf-8').strip() version = version.decode('utf-8').strip()
except UnicodeDecodeError: except UnicodeDecodeError: