The branch, eden has been updated
via 2bde8a353a7533d8d9149f3cdaf619ddc8cca3dd (commit)
via f138814ee3dd850ce375518c5afb12879ac66a3f (commit)
from ee4e444c80bf67679e82d75505ec460f55427292 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=2bde8a353a7533d8d9149f3cdaf619ddc8cca3dd
commit 2bde8a353a7533d8d9149f3cdaf619ddc8cca3dd
Author: amet <[email protected]>
Date: Mon Sep 24 10:53:41 2012 +0400
[script.module.buggalo] -v1.1.2
[B]Version 1.1.2 - 2012-09-09[/B]
- Improved UI compatibility with skins other than Confluence
- Updated movie quotes
[B]Version 1.1.1 - 2012-09-09[/B]
- Reworked error dialog layout a bit
[B]Version 1.1.0 - 2012-07-11[/B]
- Added custom error dialog with details view
- Added support for tracking userflow
- More robust handling of extra data
diff --git a/script.module.buggalo/README.md b/script.module.buggalo/README.md
index 3f39904..2a16a8f 100644
--- a/script.module.buggalo/README.md
+++ b/script.module.buggalo/README.md
@@ -13,7 +13,7 @@ It is also better integrated into the user experience, the
user only
has to decide if they want to submit the bug report or not.
The user will see a dialog as seen in this screenshot:
-http://tommy.winther.nu/files/2011/12/script_error.png
+http://forum.xbmc.org/showthread.php?tid=121925&pid=1137307#pid1137307
HOW TO USE
==========
@@ -76,9 +76,30 @@ such as date and time.
Python version and sys.argv
* Exception information
Type of exception, message and full stack trace
+* User flow information
+ For plugin-type addons each request is recorded with parameters and
timestamp
+ For script-type addons the author must record relevant information by
invoking the trackUserFlow() method
For further details take a look at the code in buggalo.py
+TRACKING USER FLOW
+==================
+A new feature in version 1.1.0 is the option to track the users flow when the
user navigate through
+the addon. This can somewhat be compared to an access log from the apache
webserver.
+
+Buggalo will keep track of the userflow for individual addons and store it up
to 24 hours.
+This also means that when an error report is sent it contains the userflow for
the last 24 hours.
+
+```python
+buggalo.trackUserFlow('event information')
+```
+
+* For plugin-type addons the userflow is automatically tracked.
+ It is possible for the addon author to track additional events by invoking
the trackuserFlow() method.
+
+* For script-type addons the addon author must invoke the trackUserFlow()
method with relevant information.
+ This could be pretty much anything, it could fx be used to track navigation
insde a customer UI.
+
---------------------------------------------------------------------
The latest code is always available at github:
@@ -88,4 +109,4 @@ The module is named after a creature in my favorite animated
show:
http://theinfosphere.org/Where_the_Buggalo_Roam
---------------------------------------------------------------------
- 2012.02.18 - twinther
+2012.09.19 - twinther
diff --git a/script.module.buggalo/addon.xml b/script.module.buggalo/addon.xml
index 42943fc..5d5ff1d 100644
--- a/script.module.buggalo/addon.xml
+++ b/script.module.buggalo/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.buggalo" name="Buggalo Exception Collector"
version="1.0.1" provider-name="twinther [[email protected]]">
+<addon id="script.module.buggalo" name="Buggalo Exception Collector"
version="1.1.2" provider-name="twinther [[email protected]]">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/script.module.buggalo/changelog.txt
b/script.module.buggalo/changelog.txt
index a2c01c4..6bb5216 100644
--- a/script.module.buggalo/changelog.txt
+++ b/script.module.buggalo/changelog.txt
@@ -1,3 +1,15 @@
+[B]Version 1.1.2 - 2012-09-09[/B]
+- Improved UI compatibility with skins other than Confluence
+- Updated movie quotes
+
+[B]Version 1.1.1 - 2012-09-09[/B]
+- Reworked error dialog layout a bit
+
+[B]Version 1.1.0 - 2012-07-11[/B]
+- Added custom error dialog with details view
+- Added support for tracking userflow
+- More robust handling of extra data
+
[B]Version 1.0.1 - 2012-03-16[/B]
- Added option to pass extra data along in the error report
either through addExtraData(key, value) or directly in
diff --git a/script.module.buggalo/lib/buggalo.py
b/script.module.buggalo/lib/buggalo.py
index fc9636a..49c65a9 100644
--- a/script.module.buggalo/lib/buggalo.py
+++ b/script.module.buggalo/lib/buggalo.py
@@ -18,33 +18,48 @@
# http://www.gnu.org/copyleft/gpl.html
#
#
-import os
import sys
import traceback as tb
-import datetime
-import urllib2
-import simplejson
import random
-import platform
-import xbmc
-import xbmcgui
import xbmcaddon
+import xbmcplugin
+
+import buggalo_client as client
+import buggalo_gui as gui
+import buggalo_userflow as userflow
# The full URL to where the gathered data should be posted.
SUBMIT_URL = None
-
EXTRA_DATA = dict()
+SCRIPT_ADDON = len(sys.argv) == 1
+
+if not SCRIPT_ADDON:
+ # Automatically track userflow for plugin type addons
+ userflow.trackUserFlow('%s%s' % (sys.argv[0], sys.argv[2]))
def addExtraData(key, value):
EXTRA_DATA[key] = value
+def trackUserFlow(value):
+ """
+ Registers an entry in the user's flow through the addon.
+ The values is stored in a dict with the current time as key and the
provided value as the value.
+
+ For plugin-type addons the user flow is automatically registered for each
page the user loads.
+ The value can be any string, so it's also useful in script-type addons.
+
+ @param value: the value indicating the user's flow.
+ @type value: str
+ """
+ userflow.trackUserFlow(value)
+
def getRandomHeading():
"""
Get a random heading for use in dialogs, etc.
The heading contains a random movie quote from the English strings.xml
"""
- return getLocalizedString(random.randint(90000, 90005))
+ return getLocalizedString(random.randint(90000, 90011))
def getLocalizedString(id):
@@ -85,99 +100,17 @@ def onExceptionRaised(extraData = None):
(type, value, traceback) = sys.exc_info()
tb.print_exception(type, value, traceback)
- heading = getRandomHeading()
- line1 = getLocalizedString(91000)
- line2 = getLocalizedString(91001)
- line3 = getLocalizedString(91002)
- yes = getLocalizedString(91003)
- no = getLocalizedString(91004)
- thanks = getLocalizedString(91005)
-
- if xbmcgui.Dialog().yesno(heading, line1, line2, line3, no, yes):
- data = _gatherData(type, value, traceback, extraData)
- _submitData(data)
- xbmcgui.Dialog().ok(heading, thanks)
-
-
-def _gatherData(type, value, traceback, extraData):
- data = dict()
- data['version'] = 3
- data['timestamp'] = datetime.datetime.now().isoformat()
-
- system = dict()
- try:
- if hasattr(os, 'uname'):
- # Works on recent unix flavors
- (sysname, nodename, release, version, machine) = os.uname()
- else:
- # Works on Windows (and others?)
- (sysname, nodename, release, version, machine, processor) =
platform.uname()
-
- system['nodename'] = nodename
- system['sysname'] = sysname
- system['release'] = release
- system['version'] = version
- system['machine'] = machine
- except Exception, ex:
- system['sysname'] = sys.platform
- system['exception'] = str(ex)
- data['system'] = system
-
- addon = xbmcaddon.Addon()
- addonInfo = dict()
- addonInfo['id'] = addon.getAddonInfo('id')
- addonInfo['name'] = addon.getAddonInfo('name')
- addonInfo['version'] = addon.getAddonInfo('version')
- addonInfo['path'] = addon.getAddonInfo('path')
- addonInfo['profile'] = addon.getAddonInfo('profile')
- data['addon'] = addonInfo
-
- xbmcInfo = dict()
- xbmcInfo['buildVersion'] = xbmc.getInfoLabel('System.BuildVersion')
- xbmcInfo['buildDate'] = xbmc.getInfoLabel('System.BuildDate')
- xbmcInfo['skin'] = xbmc.getSkinDir()
- xbmcInfo['language'] = xbmc.getInfoLabel('System.Language')
- data['xbmc'] = xbmcInfo
-
- execution = dict()
- execution['python'] = sys.version
- execution['sys.argv'] = sys.argv
- data['execution'] = execution
-
- exception = dict()
- exception['type'] = str(type)
- exception['value'] = str(value)
- exception['stacktrace'] = tb.format_tb(traceback)
- data['exception'] = exception
-
- extraDataInfo = dict()
- try:
- for (key, value) in EXTRA_DATA.items():
- extraDataInfo[key] = str(value)
-
- if type(extraData) == dict:
- for (key, value) in extraData.items():
- extraDataInfo[key] = str(value)
- elif extraData is not None:
- extraDataInfo[''] = str(extraData)
- except Exception, ex:
- extraDataInfo['exception'] = str(ex)
- data['extraData'] = extraDataInfo
-
- return simplejson.dumps(data)
-
-
-def _submitData(data):
- for attempt in range(0, 3):
+ if not SCRIPT_ADDON:
try:
- req = urllib2.Request(SUBMIT_URL, data)
- req.add_header('Content-Type', 'text/json')
- u = urllib2.urlopen(req)
- u.read()
- u.close()
- break # success; no further attempts
+ # signal error to XBMC to hide progress dialog
+ HANDLE = int(sys.argv[1])
+ xbmcplugin.endOfDirectory(HANDLE, succeeded=False)
except Exception:
- pass # probably timeout; retry
-
+ pass
+ heading = getRandomHeading()
+ data = client.gatherData(type, value, traceback, extraData, EXTRA_DATA)
+ d = gui.BuggaloDialog(SUBMIT_URL, heading, data)
+ d.doModal()
+ del d
diff --git a/script.module.buggalo/resources/language/Danish/strings.xml
b/script.module.buggalo/resources/language/Danish/strings.xml
index 70efa88..ae41c51 100644
--- a/script.module.buggalo/resources/language/Danish/strings.xml
+++ b/script.module.buggalo/resources/language/Danish/strings.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
- <string id="91000">Der er desværre opstået en fejl i addon'en.</string>
- <string id="91001">Du kan hjælpe med at løse fejlen ved at indsende
en</string>
- <string id="91002">fejlrapport. Der sendes ikke personlige
oplysninger.</string>
+ <string id="91000">Der er desværre opstået en fejl i [B]%s[/B]
addon'en.</string>
+ <string id="91001">Du kan hjælpe med at løse fejlen ved at indsende en
fejlrapport.</string>
+ <string id="91002">Klik [I]Vis fejlrapport[/I] for detaljer. Der sendes
ikke personlige oplysninger.</string>
<string id="91003">Indsend fejlrapport</string>
<string id="91004">Indsend ikke</string>
<string id="91005">Tak for dit bidrag!</string>
+ <string id="91006">Vis fejlrapport</string>
+ <string id="91007">Skjul fejlrapport</string>
+ <string id="91008">Der opstod desværre et problem med at vise
detaljerne...</string>
</strings>
diff --git a/script.module.buggalo/resources/language/English/strings.xml
b/script.module.buggalo/resources/language/English/strings.xml
index 93a51a7..04cd3e0 100644
--- a/script.module.buggalo/resources/language/English/strings.xml
+++ b/script.module.buggalo/resources/language/English/strings.xml
@@ -1,17 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
- <string id="90000">Game over, man! [I]Game over![/I]</string>
- <string id="90001">You can't handle the truth!</string>
- <string id="90002">Danger Will Robinson</string>
- <string id="90003">Why does it cry, Sméagol?</string>
- <string id="90004">Houston, we have a problem...</string>
- <string id="90005">E.T. phone home</string>
+ <string id="90000">[B]That's it man, game over man, [I]Game over![/I][/B]
~ Aliens (1986)</string>
+ <string id="90001">[B]You can't handle the truth![/B] ~ A Few Good Men
(1992)</string>
+ <string id="90002">[B]Danger Will Robinson[/B] ~ Lost in Space
(1998)</string>
+ <string id="90003">[B]Why does it cry, Sméagol?[/B] ~ The Two Towers
(2002)</string>
+ <string id="90004">[B]Houston, we have a problem...[/B] ~ Apollo 13
(1995)</string>
+ <string id="90005">[B]E.T. phone home[/B] ~ E.T. (1982)</string>
+ <string id="90006">[B]Frankly, my dear, I don't give a damn[/B] ~ Gone
with the Wind (1939)</string>
+ <string id="90007">[B]Go ahead, make my day[/B] ~ Sudden Impact
(1983)</string>
+ <string id="90008">[B]May the Force be with you[/B] ~ Star Wars
(1977)</string>
+ <string id="90009">[B]You talkin' to me?[/B] ~ Taxi Driver (1976)</string>
+ <string id="90010">[B]Round up the usual suspects[/B] ~ Casablanca
(1942)</string>
+ <string id="90011">[B]You're gonna need a bigger boat[/B] ~ Jaws
(1975)</string>
- <string id="91000">Unfortunately an error occurred in the addon.</string>
- <string id="91001">You can help with fixing the problem by
submitting</string>
- <string id="91002">an error report. No personal information is
sent.</string>
+ <string id="91000">Unfortunately an error occurred in the [B]%s[/B]
addon.</string>
+ <string id="91001">You can help with fixing the problem by submitting an
error report. </string>
+ <string id="91002">Click [I]Show error report[/I] for details. No personal
information is sent.</string>
<string id="91003">Submit error report</string>
<string id="91004">Don't submit</string>
<string id="91005">Thank you for contributing!</string>
+ <string id="91006">Show error report</string>
+ <string id="91007">Hide error report</string>
+ <string id="91008">Unfortunately a problem occurred while showing the
details...</string>
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=f138814ee3dd850ce375518c5afb12879ac66a3f
commit f138814ee3dd850ce375518c5afb12879ac66a3f
Author: amet <[email protected]>
Date: Mon Sep 24 10:50:43 2012 +0400
[weather.ozweather] -v0.4.3
- Fixes for fixes
diff --git a/weather.ozweather/addon.xml b/weather.ozweather/addon.xml
index 4bebe93..0cd0d5b 100644
--- a/weather.ozweather/addon.xml
+++ b/weather.ozweather/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.ozweather" name="Oz Weather" version="0.4.2"
provider-name="Bossanova808">
+<addon id="weather.ozweather" name="Oz Weather" version="0.4.3"
provider-name="Bossanova808">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.parsedom" version="1.2.0"/>
diff --git a/weather.ozweather/changelog.txt b/weather.ozweather/changelog.txt
index b1724ba..db3db7f 100644
--- a/weather.ozweather/changelog.txt
+++ b/weather.ozweather/changelog.txt
@@ -1,3 +1,6 @@
+V0.4.3
+- Fixes for fixes for capatilisation :)
+
V0.4.2
- Fixes for capatilisation
- Fixes for parsedom 1.2 unicode behaviour
diff --git a/weather.ozweather/resources/lib/utilities.py
b/weather.ozweather/resources/lib/utilities.py
index e5fec19..c61758f 100644
--- a/weather.ozweather/resources/lib/utilities.py
+++ b/weather.ozweather/resources/lib/utilities.py
@@ -16,7 +16,7 @@ WEATHER_CODES = { 'Clearing Shower' : '39',
'Drizzle' : '11',
'Drizzle Clearing' : '39',
'Fog Then Sunny' : '34',
- 'Frost Then Tunny' : '34',
+ 'Frost Then Sunny' : '34',
'Hazy' : '21',
'Heavy Rain' : '40',
'Heavy Showers' : '12',
@@ -29,7 +29,7 @@ WEATHER_CODES = { 'Clearing Shower' : '39',
'Possible Shower' : '11',
'Possible Thunderstorm' : '37',
'Rain' : '40',
- 'Rain and Snow' : '5',
+ 'Rain And Snow' : '5',
'Rain Clearing' : '39',
'Rain Developing' : '12',
'Rain Tending To Snow' : '5',
@@ -45,7 +45,7 @@ WEATHER_CODES = { 'Clearing Shower' : '39',
'Thunderstorms' : '38',
'Thunderstorms Clearing' : '37',
'Windy' : '23',
- 'Windy Rith Rain' : '2',
+ 'Windy With Rain' : '2',
'Windy With Showers' : '2',
'Windy With Snow' : '43',
'Wind And Rain Increasing' : '2',
-----------------------------------------------------------------------
Summary of changes:
script.module.buggalo/README.md | 25 ++-
script.module.buggalo/addon.xml | 2 +-
script.module.buggalo/changelog.txt | 12 +
script.module.buggalo/lib/buggalo.py | 135 +++--------
.../lib/{buggalo.py => buggalo_client.py} | 125 +++-------
script.module.buggalo/lib/buggalo_gui.py | 114 +++++++++
script.module.buggalo/lib/buggalo_userflow.py | 85 +++++++
.../resources/language/Danish/strings.xml | 9 +-
.../resources/language/English/strings.xml | 27 ++-
.../skins/Default/720p/buggalo-dialog.xml | 264 ++++++++++++++++++++
.../skins/Default/media/buggalo-black.png | Bin 880 -> 914 bytes
.../skins/Default/media/buggalo-button-focus.png | Bin 0 -> 2122 bytes
.../skins/Default/media/buggalo-button.png | Bin 0 -> 2444 bytes
.../skins/Default/media/buggalo-error.png | Bin 0 -> 43093 bytes
.../skins/Default/media/buggalo-glasspane.png | Bin 0 -> 1737 bytes
weather.ozweather/addon.xml | 2 +-
weather.ozweather/changelog.txt | 3 +
weather.ozweather/resources/lib/utilities.py | 6 +-
18 files changed, 600 insertions(+), 209 deletions(-)
copy script.module.buggalo/lib/{buggalo.py => buggalo_client.py} (55%)
create mode 100644 script.module.buggalo/lib/buggalo_gui.py
create mode 100644 script.module.buggalo/lib/buggalo_userflow.py
create mode 100644
script.module.buggalo/resources/skins/Default/720p/buggalo-dialog.xml
copy script.xbmc.subtitles/resources/skins/Default/media/flags/sr.gif =>
script.module.buggalo/resources/skins/Default/media/buggalo-black.png (70%)
create mode 100644
script.module.buggalo/resources/skins/Default/media/buggalo-button-focus.png
create mode 100644
script.module.buggalo/resources/skins/Default/media/buggalo-button.png
create mode 100644
script.module.buggalo/resources/skins/Default/media/buggalo-error.png
create mode 100644
script.module.buggalo/resources/skins/Default/media/buggalo-glasspane.png
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
