Skip to content

Commit d5dfb0e

Browse files
KenV99KenV99
committed
Correct another with open...
Include branch name in log
1 parent a9811c8 commit d5dfb0e

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎default.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
testdebug = False # TODO: check
2323
testTasks = False # TODO: check
2424
branch = 'master'
25-
build = '1017'
25+
build = '1018'
2626

2727
from resources.lib.utils.debugger import startdebugger
2828

@@ -134,7 +134,7 @@ def start():
134134

135135

136136
def main():
137-
msg = _(u'$$$ [kodi.callbacks] - Staring kodi.callbacks ver: %s (build %s) python: %s').encode('utf-8') % (str(_addonversion_), build, sys.version)
137+
msg = _(u'$$$ [kodi.callbacks] - Staring kodi.callbacks ver: %s (%s:build %s) python: %s').encode('utf-8') % (str(_addonversion_), branch, build, sys.version)
138138
xbmc.log(msg=msg, level=xbmc.LOGNOTICE)
139139
if branch != 'master':
140140
xbmcaddon.Addon().setSetting('installed branch', branch)

‎resources/language/English/strings.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ msgid "Publisher(s) started"
181181
msgstr ""
182182

183183
msgctxt "#32038"
184-
msgid "$$$ [kodi.callbacks] - Staring kodi.callbacks ver: %s (build %s)"
184+
msgid "$$$ [kodi.callbacks] - Staring kodi.callbacks ver: %s (%s:build %s) python: %s"
185185
msgstr ""
186186

187187
msgctxt "#32039"

‎resources/lib/utils/poutil.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
import xml.etree.cElementTree as ET
3232
except ImportError:
3333
import xml.etree.ElementTree as ET
34-
from pyexpat import ExpatError
34+
35+
3536
def logprint(msg='', level=0):
3637
if msg != '' and level > -1:
3738
print msg
@@ -374,29 +375,28 @@ def _write_to_file(dict_msgctxt, url):
374375
:rtype:
375376
"""
376377
addoninfo = PoDict.get_addoninfo()
377-
fo = codecs.open(url, 'wb', 'UTF-8')
378-
PoDict.write_po_header(fo, addoninfo)
379-
str_max = max(dict_msgctxt.iteritems(), key=operator.itemgetter(0))[0]
380-
str_min = min(dict_msgctxt.iteritems(), key=operator.itemgetter(0))[0]
381-
382-
fo.write(u'msgctxt "Addon Summary"\n')
383-
fo.write(u'msgid "%s"\n' % addoninfo['summary'].replace('\n',''))
384-
fo.write(u'msgstr ""\n\n')
385-
fo.write(u'msgctxt "Addon Description"\n')
386-
fo.write(u'msgid "%s"\n' % addoninfo['description'].replace('\n',''))
387-
fo.write(u'msgstr ""\n\n')
388-
fo.write(u'msgctxt "Addon Disclaimer"\n')
389-
fo.write(u'msgid "%s"\n' % addoninfo['disclaimer'].replace('\n',''))
390-
fo.write(u'msgstr ""\n\n')
391-
fo.write(u'#Add-on messages id=%s to %s\n\n' % (str_min, str_max))
392-
last = int(str_min) - 1
393-
for str_msgctxt in sorted(dict_msgctxt):
394-
if not str_msgctxt.startswith('Addon'):
395-
if int(str_msgctxt) != last + 1:
396-
fo.write(u'#empty strings from id %s to %s\n\n' % (str(last + 1), str(int(str_msgctxt) - 1)))
397-
PoDict.write_to_po(fo, str_msgctxt, PoDict.format_string_forpo(dict_msgctxt[str_msgctxt]))
398-
last = int(str_msgctxt)
399-
fo.close()
378+
with codecs.open(url, 'wb', 'UTF-8') as fo:
379+
PoDict.write_po_header(fo, addoninfo)
380+
str_max = max(dict_msgctxt.iteritems(), key=operator.itemgetter(0))[0]
381+
str_min = min(dict_msgctxt.iteritems(), key=operator.itemgetter(0))[0]
382+
383+
fo.write(u'msgctxt "Addon Summary"\n')
384+
fo.write(u'msgid "%s"\n' % addoninfo['summary'].replace('\n',''))
385+
fo.write(u'msgstr ""\n\n')
386+
fo.write(u'msgctxt "Addon Description"\n')
387+
fo.write(u'msgid "%s"\n' % addoninfo['description'].replace('\n',''))
388+
fo.write(u'msgstr ""\n\n')
389+
fo.write(u'msgctxt "Addon Disclaimer"\n')
390+
fo.write(u'msgid "%s"\n' % addoninfo['disclaimer'].replace('\n',''))
391+
fo.write(u'msgstr ""\n\n')
392+
fo.write(u'#Add-on messages id=%s to %s\n\n' % (str_min, str_max))
393+
last = int(str_min) - 1
394+
for str_msgctxt in sorted(dict_msgctxt):
395+
if not str_msgctxt.startswith('Addon'):
396+
if int(str_msgctxt) != last + 1:
397+
fo.write(u'#empty strings from id %s to %s\n\n' % (str(last + 1), str(int(str_msgctxt) - 1)))
398+
PoDict.write_to_po(fo, str_msgctxt, PoDict.format_string_forpo(dict_msgctxt[str_msgctxt]))
399+
last = int(str_msgctxt)
400400

401401
@staticmethod
402402
def get_addoninfo(addonid=None):

‎timestamp.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"resources/lib/tests/__init__.py": "2016-01-14T15:24:21Z", "resources/lib/watchdog/observers/polling.py": "2016-01-17T07:10:59Z", "resources/__init__.py": "2016-01-14T15:24:21Z", "resources/lib/publishers/__init__.py": "2016-01-14T15:24:21Z", "resources/lib/pathtools/README.rst": "2016-01-25T10:11:22Z", "resources/lib/taskExample.py": "2016-03-07T15:48:16Z", "resources/lib/pathtools/README": "2016-01-25T10:11:22Z", "resources/skins/Default/720p/DialogTextBox.xml": "2016-01-14T15:24:21Z", "resources/lib/watchdog/utils/delayed_queue.py": "2016-01-17T07:10:59Z", "resources/lib/kodisettings/generate_xml.py": "2016-05-29T08:00:00Z", "resources/lib/watchdog/watchmedo.py": "2016-01-17T07:10:59Z", ".gitignore": "2016-04-04T07:13:26Z", "resources/lib/tests/tstScript.sh": "2016-06-06T09:40:54Z", "default.py": "2016-06-05T10:53:12Z", "resources/lib/watchdog/LICENSE.txt": "2016-01-25T10:10:48Z", "resources/lib/watchdog/utils/event_backport.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/utils/compat.py": "2016-01-17T07:10:59Z", "resources/lib/publishers/watchdogStartup.py": "2016-05-30T15:07:04Z", "resources/lib/pathtools/AUTHORS": "2016-01-25T10:11:22Z", "resources/lib/tasks/taskScript.py": "2016-06-06T09:40:54Z", "resources/lib/tasks/__init__.py": "2016-01-14T15:24:21Z", "resources/lib/publishers/schedule.py": "2016-04-16T05:41:18Z", "resources/lib/tests/testTasks.py": "2016-03-29T14:16:28Z", "resources/lib/kodisettings/struct.py": "2016-05-29T07:37:29Z", "icon.png": "2016-03-27T10:13:37Z", "resources/lib/watchdog/observers/__init__.py": "2016-01-19T05:48:22Z", "resources/lib/utils/selector.py": "2016-03-10T17:12:51Z", "resources/language/English/strings.po": "2016-06-06T14:40:23Z", "resources/lib/pubsub.py": "2016-05-30T15:07:04Z", "resources/lib/watchdog/observers/fsevents.py": "2016-01-17T07:10:59Z", "resources/lib/tasks/taskHttp.py": "2016-06-06T09:40:54Z", "resources/lib/events.py": "2016-04-02T09:09:38Z", "resources/language/English/strings2.po": "2016-05-29T15:33:29Z", "resources/lib/subscriberfactory.py": "2016-05-30T15:07:04Z", "resources/lib/watchdog/AUTHORS": "2016-01-25T10:10:48Z", "resources/lib/utils/detectPath.py": "2016-06-03T06:47:39Z", "resources/lib/publishers/dummy.py": "2016-03-29T14:16:26Z", "resources/lib/kodilogging.py": "2016-06-06T09:40:54Z", "resources/lib/pathtools/__init__.py": "2016-01-17T07:10:43Z", "resources/lib/watchdog/observers/inotify_c.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/tricks/__init__.py": "2016-01-17T07:10:59Z", "script.py": "2016-04-14T06:35:41Z", "resources/lib/utils/testpo/strings.po": "2016-04-28T08:42:32Z", "resources/settings.xml": "2016-06-06T14:40:23Z", "resources/lib/watchdog/utils/dirsnapshot.py": "2016-02-01T11:27:31Z", "resources/lib/watchdog/utils/bricks.py": "2016-01-17T07:10:59Z", "resources/lib/tasks/taskPython.py": "2016-06-05T10:49:17Z", "resources/lib/publishers/loop.py": "2016-03-29T14:16:26Z", "resources/lib/kodisettings/__init__.py": "2016-03-06T11:30:01Z", "timestamp.json": "2016-06-06T14:40:30Z", "testme.py": "2016-01-27T17:12:23Z", "resources/lib/watchdog/version.py": "2016-01-17T07:10:59Z", "resources/lib/utils/updateaddon.py": "2016-04-04T07:13:26Z", "resources/lib/utils/testpo/testPo.py": "2016-05-11T08:59:11Z", "resources/lib/watchdog/utils/unicode_paths.py": "2016-01-17T07:10:59Z", "resources/lib/publisherfactory.py": "2016-03-24T17:00:38Z", "resources/lib/schedule/__init__.py": "2016-02-26T13:45:25Z", "resources/lib/watchdog/__init__.py": "2016-01-17T07:10:59Z", "addon.xml": "2016-05-30T15:07:04Z", "resources/lib/watchdog/utils/platform.py": "2016-01-17T07:10:59Z", "resources/lib/tasks/taskBuiltin.py": "2016-03-06T11:30:01Z", "resources/lib/watchdog/utils/importlib2.py": "2016-01-17T07:10:59Z", "README.md": "2016-02-01T07:40:27Z", "resources/lib/pathtools/path.py": "2016-01-17T07:10:43Z", "resources/lib/tests/direct_test.py": "2016-04-09T09:38:56Z", "resources/lib/pathtools/LICENSE.txt": "2016-01-25T10:08:08Z", "resources/lib/watchdog/utils/echo.py": "2016-01-17T07:10:59Z", "resources/lib/pathtools/patterns.py": "2016-01-17T07:10:43Z", "resources/lib/publishers/monitor.py": "2016-04-04T07:13:26Z", "resources/lib/watchdog/observers/fsevents2.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/observers/kqueue.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/observers/read_directory_changes.py": "2016-01-17T07:10:59Z", "resources/lib/tests/tstScript.bat": "2016-02-27T07:24:43Z", "resources/lib/utils/__init__.py": "2016-01-24T07:36:06Z", "resources/lib/watchdog/utils/decorators.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/observers/inotify.py": "2016-01-17T07:10:59Z", "resources/lib/utils/poutil.py": "2016-06-06T09:40:54Z", "resources/lib/publishers/player.py": "2016-05-30T15:07:04Z", "LICENSE.txt": "2016-01-25T10:16:54Z", "resources/lib/watchdog/observers/winapi.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/events.py": "2016-01-17T07:10:59Z", "changelog.txt": "2016-05-30T15:07:04Z", "resources/lib/watchdog/utils/__init__.py": "2016-02-14T17:00:24Z", "resources/lib/tests/testPublishers.py": "2016-03-27T08:38:33Z", "resources/lib/taskABC.py": "2016-06-05T10:17:32Z", "resources/lib/watchdog/README.rst": "2016-01-25T10:10:48Z", "resources/lib/pathtools/version.py": "2016-01-17T07:10:43Z", "resources/lib/publishers/log.py": "2016-05-30T15:07:04Z", "resources/lib/utils/copyToDir.py": "2016-04-04T07:13:26Z", "resources/lib/watchdog/observers/inotify_buffer.py": "2016-01-17T07:10:59Z", "fanart.jpg": "2016-02-26T13:45:25Z", "resources/lib/utils/kodipathtools.py": "2016-06-05T10:17:32Z", "resources/lib/utils/debugger.py": "2016-06-05T10:17:32Z", "resources/lib/watchdog/utils/win32stat.py": "2016-01-17T07:10:59Z", "resources/lib/tasks/taskJson.py": "2016-06-06T09:40:54Z", "resources/lib/publishers/watchdog.py": "2016-03-29T14:16:26Z", "resources/lib/dialogtb.py": "2016-05-30T15:07:04Z", "resources/lib/settings.py": "2016-05-30T15:07:04Z", "restartaddon.py": "2016-02-13T15:07:18Z", "resources/lib/watchdog/observers/api.py": "2016-01-17T07:10:59Z", "resources/lib/tests/tstPythonGlobal.py": "2016-04-03T08:08:06Z", "resources/lib/__init__.py": "2016-04-09T09:38:56Z", ".gitattributes": "2016-04-04T07:13:26Z", "resources/lib/watchdog/COPYING": "2016-01-25T10:10:48Z"}
1+
{"resources/lib/tests/__init__.py": "2016-01-14T15:24:21Z", "resources/lib/watchdog/observers/polling.py": "2016-01-17T07:10:59Z", "resources/__init__.py": "2016-01-14T15:24:21Z", "resources/lib/publishers/__init__.py": "2016-01-14T15:24:21Z", "resources/lib/pathtools/README.rst": "2016-01-25T10:11:22Z", "resources/lib/taskExample.py": "2016-03-07T15:48:16Z", "resources/lib/pathtools/README": "2016-01-25T10:11:22Z", "resources/skins/Default/720p/DialogTextBox.xml": "2016-01-14T15:24:21Z", "resources/lib/watchdog/utils/delayed_queue.py": "2016-01-17T07:10:59Z", "resources/lib/kodisettings/generate_xml.py": "2016-05-29T08:00:00Z", "resources/lib/watchdog/watchmedo.py": "2016-01-17T07:10:59Z", ".gitignore": "2016-04-04T07:13:26Z", "resources/lib/tests/tstScript.sh": "2016-06-11T07:14:31Z", "default.py": "2016-06-11T07:16:33Z", "resources/lib/watchdog/LICENSE.txt": "2016-01-25T10:10:48Z", "resources/lib/watchdog/utils/event_backport.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/utils/compat.py": "2016-01-17T07:10:59Z", "resources/lib/publishers/watchdogStartup.py": "2016-05-30T15:07:04Z", "resources/lib/pathtools/AUTHORS": "2016-01-25T10:11:22Z", "resources/lib/tasks/taskScript.py": "2016-06-11T07:03:17Z", "resources/lib/tasks/__init__.py": "2016-01-14T15:24:21Z", "resources/lib/publishers/schedule.py": "2016-04-16T05:41:18Z", "resources/lib/tests/testTasks.py": "2016-03-29T14:16:28Z", "resources/lib/kodisettings/struct.py": "2016-05-29T07:37:29Z", "icon.png": "2016-03-27T10:13:37Z", "resources/lib/watchdog/observers/__init__.py": "2016-01-19T05:48:22Z", "resources/lib/utils/selector.py": "2016-03-10T17:12:51Z", "resources/language/English/strings.po": "2016-06-11T07:20:55Z", "resources/lib/pubsub.py": "2016-06-11T07:03:17Z", "resources/lib/watchdog/observers/fsevents.py": "2016-01-17T07:10:59Z", "resources/lib/tasks/taskHttp.py": "2016-06-11T07:03:17Z", "resources/lib/events.py": "2016-04-02T09:09:38Z", "resources/language/English/strings2.po": "2016-05-29T15:33:29Z", "resources/lib/subscriberfactory.py": "2016-05-30T15:07:04Z", "resources/lib/watchdog/AUTHORS": "2016-01-25T10:10:48Z", "resources/lib/utils/detectPath.py": "2016-06-11T07:03:17Z", "resources/lib/publishers/dummy.py": "2016-03-29T14:16:26Z", "resources/lib/kodilogging.py": "2016-06-11T07:03:16Z", "resources/lib/pathtools/__init__.py": "2016-01-17T07:10:43Z", "resources/lib/watchdog/observers/inotify_c.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/tricks/__init__.py": "2016-01-17T07:10:59Z", "script.py": "2016-04-14T06:35:41Z", "resources/lib/utils/testpo/strings.po": "2016-04-28T08:42:32Z", "resources/settings.xml": "2016-06-11T07:20:55Z", "resources/lib/watchdog/utils/dirsnapshot.py": "2016-02-01T11:27:31Z", "resources/lib/watchdog/utils/bricks.py": "2016-01-17T07:10:59Z", "resources/lib/tasks/taskPython.py": "2016-06-11T07:03:17Z", "resources/lib/publishers/loop.py": "2016-03-29T14:16:26Z", "resources/lib/kodisettings/__init__.py": "2016-03-06T11:30:01Z", "timestamp.json": "2016-06-11T07:20:59Z", "testme.py": "2016-01-27T17:12:23Z", "resources/lib/watchdog/version.py": "2016-01-17T07:10:59Z", "resources/lib/utils/updateaddon.py": "2016-04-04T07:13:26Z", "resources/lib/utils/testpo/testPo.py": "2016-05-11T08:59:11Z", "resources/lib/watchdog/utils/unicode_paths.py": "2016-01-17T07:10:59Z", "resources/lib/publisherfactory.py": "2016-03-24T17:00:38Z", "resources/lib/schedule/__init__.py": "2016-02-26T13:45:25Z", "resources/lib/watchdog/__init__.py": "2016-01-17T07:10:59Z", "addon.xml": "2016-06-09T08:04:08Z", "resources/lib/watchdog/utils/platform.py": "2016-01-17T07:10:59Z", "resources/lib/tasks/taskBuiltin.py": "2016-06-11T07:03:17Z", "resources/lib/watchdog/utils/importlib2.py": "2016-01-17T07:10:59Z", "README.md": "2016-02-01T07:40:27Z", "resources/lib/pathtools/path.py": "2016-01-17T07:10:43Z", "resources/lib/tests/direct_test.py": "2016-04-09T09:38:56Z", "resources/lib/pathtools/LICENSE.txt": "2016-01-25T10:08:08Z", "resources/lib/watchdog/utils/echo.py": "2016-01-17T07:10:59Z", "resources/lib/pathtools/patterns.py": "2016-01-17T07:10:43Z", "resources/lib/publishers/monitor.py": "2016-04-04T07:13:26Z", "resources/lib/watchdog/observers/fsevents2.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/observers/kqueue.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/observers/read_directory_changes.py": "2016-01-17T07:10:59Z", "resources/lib/tests/tstScript.bat": "2016-02-27T07:24:43Z", "resources/lib/utils/__init__.py": "2016-01-24T07:36:06Z", "resources/lib/watchdog/utils/decorators.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/observers/inotify.py": "2016-01-17T07:10:59Z", "resources/lib/utils/poutil.py": "2016-06-11T07:20:52Z", "resources/lib/publishers/player.py": "2016-05-30T15:07:04Z", "LICENSE.txt": "2016-01-25T10:16:54Z", "resources/lib/watchdog/observers/winapi.py": "2016-01-17T07:10:59Z", "resources/lib/watchdog/events.py": "2016-01-17T07:10:59Z", "changelog.txt": "2016-05-30T15:07:04Z", "resources/lib/watchdog/utils/__init__.py": "2016-02-14T17:00:24Z", "resources/lib/tests/testPublishers.py": "2016-03-27T08:38:33Z", "resources/lib/taskABC.py": "2016-06-11T07:03:16Z", "resources/lib/watchdog/README.rst": "2016-01-25T10:10:48Z", "resources/lib/pathtools/version.py": "2016-01-17T07:10:43Z", "resources/lib/publishers/log.py": "2016-06-11T07:03:16Z", "resources/lib/utils/copyToDir.py": "2016-04-04T07:13:26Z", "resources/lib/watchdog/observers/inotify_buffer.py": "2016-01-17T07:10:59Z", "fanart.jpg": "2016-02-26T13:45:25Z", "resources/lib/utils/kodipathtools.py": "2016-06-11T07:03:16Z", "resources/lib/utils/debugger.py": "2016-06-11T07:03:17Z", "resources/lib/watchdog/utils/win32stat.py": "2016-01-17T07:10:59Z", "resources/lib/tasks/taskJson.py": "2016-06-11T07:03:17Z", "resources/lib/publishers/watchdog.py": "2016-06-10T11:49:31Z", "resources/lib/dialogtb.py": "2016-05-30T15:07:04Z", "resources/lib/settings.py": "2016-05-30T15:07:04Z", "restartaddon.py": "2016-02-13T15:07:18Z", "resources/lib/watchdog/observers/api.py": "2016-01-17T07:10:59Z", "resources/lib/tests/tstPythonGlobal.py": "2016-04-03T08:08:06Z", "resources/lib/__init__.py": "2016-04-09T09:38:56Z", ".gitattributes": "2016-04-04T07:13:26Z", "resources/lib/watchdog/COPYING": "2016-01-25T10:10:48Z"}

0 commit comments

Comments
 (0)