renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1115 from chrox/master

Browse Source 
normalize version when checking packages in OTA manager
This commit is contained in:
HW
2014-11-10 13:28:36 +01:00
parent 099a314585 befa3aa63c
commit 3740a48be9
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/apps/reader/modules/readerscreenshot.lua
View File

@@ -8,7 +8,7 @@ local _ = require("gettext")
local DEBUG = require("dbg")
local ReaderScreenshot = InputContainer:new{
datetime_name = "screenshots/Screenshot_%Y-%b-%d_%Hh%M.png",
datetime_name = "screenshots/Screenshot_%Y-%b-%d_%H%M%S.png",
}
function ReaderScreenshot:init()

21
frontend/ui/otamanager.lua
View File

@@ -77,14 +77,25 @@ function OTAManager:checkUpdate()
end
zsync:close()
end
local local_version = io.open("git-rev", "r"):read()
local ota_version = nil
if ota_package then
ota_version = ota_package:match(".-(v%d.-)%.tar")
local normalized_version = function(rev)
local version = rev:match("(v%d.-)-g"):gsub("[^%d]", "")
return tonumber(version)
end
local local_ok, local_version = pcall(function()
local rev_file = io.open("git-rev", "r")
if rev_file then
local rev = rev_file:read()
rev_file:close()
return normalized_version(rev)
end
end)
local ota_ok, ota_version = pcall(function()
return normalized_version(ota_package)
end)
-- return ota package version if package on OTA server has version
-- larger than the local package version
if ota_version and ota_version > local_version then
if local_ok and ota_ok and ota_version and local_version and
ota_version > local_version then
return ota_version
elseif ota_version and ota_version == local_version then
return 0