The branch, dharma has been updated
via 1603906da383c206e8e5a90a36ea2081a1dda1e0 (commit)
from c3fe2ee0037bf84880f64c4c2ecf4a0cbf59235c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1603906da383c206e8e5a90a36ea2081a1dda1e0
commit 1603906da383c206e8e5a90a36ea2081a1dda1e0
Author: spiff <[email protected]>
Date: Mon Sep 19 16:40:38 2011 +0200
[plugin.video.drivecast] updated to version 0.3
diff --git a/plugin.video.drivecast/default.py
b/plugin.video.drivecast/default.py
index c01e579..09b3219 100644
--- a/plugin.video.drivecast/default.py
+++ b/plugin.video.drivecast/default.py
@@ -18,7 +18,8 @@
# -*- coding: utf-8 -*-
-import sys, xbmc, xbmcaddon, xbmcplugin, xbmcgui, urllib, urllib2,
unicodedata, httplib, threading
+import sys, xbmc, xbmcaddon, xbmcplugin, xbmcgui, urllib, urllib2,
unicodedata, httplib, threading, os, stat
+from random import random
from simplejson import load, loads
from base64 import b64encode, b64decode
from xml.dom.minidom import parseString
@@ -41,8 +42,7 @@ def log_menu():
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=sys.argv[0]+"?guest",listitem=trying,
isFolder=True)
log_form=
xbmcgui.ListItem(__language__(30013),iconImage=__thumbnails__+"user.png",
thumbnailImage=__thumbnails__+"user.png")
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=sys.argv[0]+"?form",listitem=log_form,isFolder=True)
- qr= qrcode_post()
- qr_menu= xbmcgui.ListItem(__language__(30010), iconImage=qr,
thumbnailImage=qr)
+ qr_menu= xbmcgui.ListItem(__language__(30010)+"
[B]"+__settings__.getSetting("qr")+"[/B] "+__language__(30014),
iconImage=__thumbnails__+"qr.png", thumbnailImage=__thumbnails__+"qr.png")
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=sys.argv[0]+"?qrcode",listitem=qr_menu,
isFolder=True)
xbmcplugin.endOfDirectory(int(sys.argv[1]))
@@ -56,7 +56,6 @@ def qrcode_post():
data= loads(response.read())
conn.close()
__settings__.setSetting("qr",str(data["paircode"]))
- return str(data["QRcode"])+".png"
def qrcode_click():
qr= __settings__.getSetting("qr")
@@ -108,7 +107,7 @@ def playlists():
u=sys.argv[0]+"??"+pl["name"]
item= xbmcgui.ListItem(label=pl["name"],
thumbnailImage=__thumbnails__+"playlist.png", path=u)
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=u,
listitem=item, isFolder=True)
- lo= xbmcgui.ListItem(label="Logout...",
thumbnailImage=__thumbnails__+"user.png", path=sys.argv[0]+"?logout")
+ lo= xbmcgui.ListItem(label="[I]Logout[/I]...",
thumbnailImage=__thumbnails__+"user.png", path=sys.argv[0]+"?logout")
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),
url=sys.argv[0]+"?logout", listitem=lo, isFolder=True)
xbmcplugin.endOfDirectory(int(sys.argv[1]))
@@ -116,9 +115,8 @@ def playlists():
# ELENCO ITEMS
<<<OK>>>>
#========================================================================================
def manage_RSS(playlist):
- feed= read_RSS()
empty= True
- for item in feed.getElementsByTagName('item'):
+ for item in __feed__.getElementsByTagName('item'):
playl=item.getElementsByTagName('carcast:playlists_string')
if playl:
pl= playl[0].firstChild.data.encode('utf-8')
@@ -210,6 +208,7 @@ mode= sys.argv[2][1:]
if __rss__ == "":
if mode=="":
+ qrcode_post()
log_menu()
elif mode=="guest":
guest()
@@ -218,6 +217,7 @@ if __rss__ == "":
elif mode=="qrcode":
qrcode_click()
else:
+ __feed__= read_RSS()
if mode == "logout":
logout()
elif mode == "":
diff --git a/plugin.video.drivecast/resources/language/English/strings.xml
b/plugin.video.drivecast/resources/language/English/strings.xml
index 19cae82..46fc46f 100644
--- a/plugin.video.drivecast/resources/language/English/strings.xml
+++ b/plugin.video.drivecast/resources/language/English/strings.xml
@@ -11,7 +11,8 @@
<string id="30007">Refreshing folder</string>
<string id="30008">Error</string>
<string id="30009">Empty playlist</string>
- <string id="30010">Use QR code (click after pairing)...</string>
+ <string id="30010">Use QR code with code:</string>
+ <string id="30014">(click after pairing)...</string>
<string id="30011">Try DriveCast as guest user...</string>
<string id="30012">No pairing detected</string>
<string id="30013">Login...</string>
diff --git a/plugin.video.drivecast/resources/language/Italian/strings.xml
b/plugin.video.drivecast/resources/language/Italian/strings.xml
index 54e9957..13122fe 100644
--- a/plugin.video.drivecast/resources/language/Italian/strings.xml
+++ b/plugin.video.drivecast/resources/language/Italian/strings.xml
@@ -11,7 +11,8 @@
<string id="30007">Aggiornamento cartella</string>
<string id="30008">Errore</string>
<string id="30009">Playlist vuota</string>
- <string id="30010">Usa il QR Code (clicca dopo il pairing)</string>
+ <string id="30010">Usa il QR Code con codice:</string>
+ <string id="30014">(clicca dopo il pairing)...</string>
<string id="30011">Utilizza DriveCast come utente di prova...</string>
<string id="30012">Nessun pairing rilevato...</string>
<string id="30013">Login...</string>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.drivecast/changelog.txt | 3 +++
plugin.video.drivecast/default.py | 14 +++++++-------
.../resources/language/English/strings.xml | 3 ++-
.../resources/language/Italian/strings.xml | 3 ++-
plugin.video.drivecast/thumbnails/change_user.png | Bin 69883 -> 0 bytes
plugin.video.drivecast/thumbnails/prova.png | Bin 25601 -> 0 bytes
plugin.video.drivecast/thumbnails/qr.png | Bin 0 -> 589 bytes
plugin.video.drivecast/thumbnails/settings.png | Bin 69876 -> 0 bytes
8 files changed, 14 insertions(+), 9 deletions(-)
create mode 100644 plugin.video.drivecast/changelog.txt
delete mode 100644 plugin.video.drivecast/thumbnails/change_user.png
delete mode 100644 plugin.video.drivecast/thumbnails/prova.png
create mode 100644 plugin.video.drivecast/thumbnails/qr.png
delete mode 100644 plugin.video.drivecast/thumbnails/settings.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
