GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 14:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

move versionWithBuild into anki module

Browse source
This commit is contained in:
Damien Elmes 2019-02-28 08:37:42 +10:00
parent 47eab46f05
commit a389b8b4a0
6 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -7,4 +7,4 @@
aqt/forms aqt/forms
locale locale
tools/runanki.system tools/runanki.system
aqt/buildhash.py anki/buildhash.py

2
anki/sync.py
View file

@ -10,7 +10,7 @@ import requests
from anki.db import DB, DBError from anki.db import DB, DBError
from anki.utils import ids2str, intTime, json, platDesc, checksum, devMode from anki.utils import ids2str, intTime, json, platDesc, checksum, devMode
from anki.consts import * from anki.consts import *
from aqt.utils import versionWithBuild from anki.utils import versionWithBuild
from .hooks import runHook from .hooks import runHook
import anki import anki
from .lang import ngettext from .lang import ngettext

10
anki/utils.py
View file

@ -407,3 +407,13 @@ class TimedLog:
sys.stderr.write("%5dms: %s(): %s\n" % ((time.time() - self._last)*1000, fn, s)) sys.stderr.write("%5dms: %s(): %s\n" % ((time.time() - self._last)*1000, fn, s))
self._last = time.time() self._last = time.time()
# Version
##############################################################################
def versionWithBuild():
from anki import version
try:
from anki.buildhash import build
except:
build = "dev"
return "%s (%s)" % (version, build)

3
aqt/about.py
View file

@ -4,7 +4,8 @@
from aqt.qt import * from aqt.qt import *
import aqt.forms import aqt.forms
from aqt.utils import versionWithBuild, supportText, tooltip from anki.utils import versionWithBuild
from aqt.utils import supportText, tooltip
class ClosableQDialog(QDialog): class ClosableQDialog(QDialog):
def reject(self): def reject(self):

6
aqt/update.py
View file

@ -7,10 +7,8 @@ import requests
from aqt.qt import * from aqt.qt import *
import aqt import aqt
from aqt.utils import openLink from aqt.utils import openLink, showText
from anki.utils import json, platDesc from anki.utils import platDesc, versionWithBuild
from aqt.utils import showText
from aqt.utils import versionWithBuild
class LatestVersionFinder(QThread): class LatestVersionFinder(QThread):

14
aqt/utils.py
View file

@ -3,10 +3,11 @@
# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
from aqt.qt import * from aqt.qt import *
import re, os, sys, urllib.request, urllib.parse, urllib.error, subprocess import re, os, sys, subprocess
import aqt import aqt
from anki.sound import stripSounds from anki.sound import stripSounds
from anki.utils import isWin, isMac, invalidFilename, noBundledLibs from anki.utils import isWin, isMac, invalidFilename, noBundledLibs, \
versionWithBuild
def openHelp(section): def openHelp(section):
link = aqt.appHelpSite link = aqt.appHelpSite
@ -565,18 +566,9 @@ def qtMenuShortcutWorkaround(qmenu):
###################################################################### ######################################################################
def versionWithBuild():
from aqt import appVersion
try:
from aqt.buildhash import build
except:
build = "dev"
return "%s (%s)" % (appVersion, build)
def supportText(): def supportText():
import platform import platform
from aqt import mw from aqt import mw
from aqt.utils import versionWithBuild
if isWin: if isWin:
platname = "Windows " + platform.win32_ver()[0] platname = "Windows " + platform.win32_ver()[0]