The branch, dharma has been updated
via 3c0051205bca78dad89acd60542c00fbed03f5f4 (commit)
via 6d1a8f98fd0e15314b78a52509913f7069e97133 (commit)
from 5647aeec0231e1a9859f422a4031707ae218689e (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3c0051205bca78dad89acd60542c00fbed03f5f4
commit 3c0051205bca78dad89acd60542c00fbed03f5f4
Author: spiff <[email protected]>
Date: Sun Dec 26 00:47:55 2010 +0100
[plugin.image.xbmcflicks] updated to version 1.0.8
diff --git a/.gitignore b/.gitignore
index 84f5547..0acf00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ plugin.audio.podcatcher/icon.xcf
plugin.video.vega/.git
plugin.video.eyetv.parser/.git
plugin.video.xbmcflicks/.git
+plugin.video.gamestar/.git
+plugin.video.gamestar/.gitignore
diff --git a/plugin.video.xbmcflicks/addon.xml
b/plugin.video.xbmcflicks/addon.xml
index effe2ae..1d609c1 100644
--- a/plugin.video.xbmcflicks/addon.xml
+++ b/plugin.video.xbmcflicks/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.xbmcflicks"
name="XBMC Flicks - Netflix for XBMC"
- version="1.0.7"
+ version="1.0.8"
provider-name="TeamUMX">
<requires>
<import addon="xbmc.python" version="1.0"/>
@@ -14,6 +14,6 @@
<extension point="xbmc.addon.metadata">
<platform>windx wingl osx</platform>
<summary lang="en">XBMC Flicks</summary>
- <description lang="en">Netflix for XBMC.. NOTE: You will need to
modify the playercorefactory.xml and advanced settings.xml in order to use this
addon for playback. Examples can be found with the plugin in the resources
folder</description>
+ <description lang="en">Netflix for XBMC.. NOTE: This plugin will
create the playercorefactory.xml and advanced settings.xml, if you already have
an external player configured, you will need to modify it to add in IE as a
player. Examples of those files are in the resources folder.
</extension>
</addon>
diff --git a/plugin.video.xbmcflicks/changelog.txt
b/plugin.video.xbmcflicks/changelog.txt
index 756fb6e..90bf9e0 100644
--- a/plugin.video.xbmcflicks/changelog.txt
+++ b/plugin.video.xbmcflicks/changelog.txt
@@ -1,3 +1,4 @@
1.0.5 - Initial Release
1.0.6 - Added images for folders in the main menu
-1.0.7 - fixed path issue within the plugin and git repo, fixed issue with
missing userinfo.txt and missing links folder
\ No newline at end of file
+1.0.7 - fixed path issue within the plugin and git repo, fixed issue with
missing userinfo.txt and missing links folder
+1.0.8 - changed icon for app, add'd diff for redundant text, added automatic
create of playercorefactory and advancedsettings based on os path info
diff --git a/plugin.video.xbmcflicks/icon.png b/plugin.video.xbmcflicks/icon.png
index bb0ba51..3efb6b9 100644
Binary files a/plugin.video.xbmcflicks/icon.png and
b/plugin.video.xbmcflicks/icon.png differ
diff --git a/plugin.video.xbmcflicks/resources/lib/iqueue.py
b/plugin.video.xbmcflicks/resources/lib/iqueue.py
index 02aff0c..05206c2 100644
--- a/plugin.video.xbmcflicks/resources/lib/iqueue.py
+++ b/plugin.video.xbmcflicks/resources/lib/iqueue.py
@@ -83,8 +83,8 @@ def getAuth(netflix, verbose):
#now save out the settings
saveUserInfo()
#exit script, user must restart
- dialog.ok("Settings completed", "You must restart the xbmcflicks
plugin")
- print "Settings completed", "You must restart the xbmcflicks plugin"
+ dialog.ok("Settings completed", "You must restart XBMC")
+ print "Settings completed", "You must restart XBMC"
exit
sys.exit(1)
@@ -98,6 +98,31 @@ def saveUserInfo():
f.close()
# END AUTH
+def checkplayercore():
+ checkFile = XBMCPROFILE + 'playercorefactory.xml'
+ havefile = os.path.isfile(checkFile)
+ if(not havefile):
+ #copy file data from addon folder
+ fileWithData = ROOT_FOLDER + 'resources/playercorefactory.xml'
+ if not os.path.exists('C:\Program Files (x86)'):
+ fileWithData = ROOT_FOLDER + 'resources/playercorefactory32.xml'
+ if not os.path.exists('C:\Program Files'):
+ fileWithData = ROOT_FOLDER + 'resources/playercorefactoryOSX.xml'
+ data = open(str(fileWithData),'r').read()
+ f = open(checkFile,'r+')
+ f.write(data)
+ f.close()
+
+def checkadvsettings():
+ checkFile = XBMCPROFILE + 'advancedsettings.xml'
+ havefile = os.path.isfile(checkFile)
+ if(not havefile):
+ #copy file from addon folder
+ fileWithData = ROOT_FOLDER + 'resources/advancedsettings.xml'
+ data = open(str(fileWithData),'r').read()
+ f = open(checkFile,'r+')
+ f.write(data)
+ f.close()
def addLink(name,url,curX,rootID=None):
ok=True
@@ -683,6 +708,7 @@ def initApp():
global REAL_LINK_PATH
global IMAGE_FOLDER
global USERINFO_FOLDER
+ global XBMCPROFILE
arg = int(sys.argv[1])
APP_NAME = 'xbmcflix'
@@ -712,12 +738,17 @@ def initApp():
LINKS_FOLDER = WORKING_FOLDER + 'links/'
REAL_LINK_PATH = xbmc.translatePath(WORKING_FOLDER + 'links/')
USERINFO_FOLDER = WORKING_FOLDER
-
- print "root folder: " + ROOT_FOLDER
- print "working folder: " + WORKING_FOLDER
- print "real link path: " + REAL_LINK_PATH
- print "image folder: " + IMAGE_FOLDER
- print "userinfo folder: " + USERINFO_FOLDER
+ XBMCPROFILE = xbmc.translatePath('special://profile')
+ if(DEBUG):
+ print "root folder: " + ROOT_FOLDER
+ print "working folder: " + WORKING_FOLDER
+ print "real link path: " + REAL_LINK_PATH
+ print "image folder: " + IMAGE_FOLDER
+ print "userinfo folder: " + USERINFO_FOLDER
+
+ #check playercorefactory and advancedsettings, create if missing
+ checkplayercore()
+ checkadvsettings()
reobj = re.compile(r"200(.{10}).*?644(.*?)4x2(.).*?5118")
match = reobj.search(API_SECRET)
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6d1a8f98fd0e15314b78a52509913f7069e97133
commit 6d1a8f98fd0e15314b78a52509913f7069e97133
Author: spiff <[email protected]>
Date: Sun Dec 26 00:46:07 2010 +0100
[plugin.image.mypicsdb] updated to version 0.5.1
diff --git a/plugin.image.mypicsdb/addon.xml b/plugin.image.mypicsdb/addon.xml
index f02af5f..1676afc 100644
--- a/plugin.image.mypicsdb/addon.xml
+++ b/plugin.image.mypicsdb/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon
id="plugin.image.mypicsdb"
- version="0.5"
+ version="0.5.1"
name="My Pictures Database"
provider-name="alexsolex®">
<requires>
diff --git a/plugin.image.mypicsdb/default.py b/plugin.image.mypicsdb/default.py
index b97e9fb..a077977 100644
--- a/plugin.image.mypicsdb/default.py
+++ b/plugin.image.mypicsdb/default.py
@@ -14,27 +14,29 @@ import os,sys
from os.path import join,isfile,basename,dirname
-import xbmc
+import xbmc, xbmcaddon
+Addon = xbmcaddon.Addon(id='plugin.image.mypicsdb')
-home = os.getcwd().replace(';','')
+#home = os.getcwd().replace(';','')
+home = Addon.getAddonInfo('path')
#these few lines are taken from AppleMovieTrailers script
# Shared resources
BASE_RESOURCE_PATH = join( home, "resources" )
-DATA_PATH = xbmc.translatePath(
"special://profile/addon_data/plugin.image.mypicsdb/")
+#DATA_PATH = xbmc.translatePath(
"special://profile/addon_data/plugin.image.mypicsdb/")
+DATA_PATH = Addon.getAddonInfo('profile')
PIC_PATH = join( BASE_RESOURCE_PATH, "images")
DB_PATH = xbmc.translatePath( "special://database/")
sys.path.append( join( BASE_RESOURCE_PATH, "lib" ) )
from urllib import quote_plus,unquote_plus
-import xbmcplugin,xbmcgui,xbmcaddon
+import xbmcplugin,xbmcgui
from time import strftime,strptime
from traceback import print_exc
-Addon = xbmcaddon.Addon(id='plugin.image.mypicsdb')
__language__ = Addon.getLocalizedString
sys_enc = sys.getfilesystemencoding()
@@ -519,17 +521,17 @@ class Main:
update = dialog.yesno(__language__(30000),__language__(30203))
and 1 or 0 # Remove files from database if pictures does not exists?
#ajoute le rootfolder dans la base
MPDB.AddRoot(newroot,recursive,update,0)#TODO : traiter le
exclude (=0 pour le moment) pour gérer les chemins à exclure
- xbmc.executebuiltin(
"Notification(%s,%s,%s,%s)"%(__language__(30000).encode("utf8"),__language__(30204).encode("utf8"),3000,join(os.getcwd(),"icon.png")
) )
+ xbmc.executebuiltin(
"Notification(%s,%s,%s,%s)"%(__language__(30000).encode("utf8"),__language__(30204).encode("utf8"),3000,join(home,"icon.png")
) )
if not(xbmc.getInfoLabel(
"Window.Property(DialogAddonScan.IsAlive)" ) == "true"): #si dialogaddonscan
n'est pas en cours d'utilisation...
if
dialog.yesno(__language__(30000),__language__(30206)):#do a scan now ?
- xbmc.executebuiltin( "RunScript(%s,--rootpath=%s) "%(
join( os.getcwd(), "scanpath.py"),
+ xbmc.executebuiltin( "RunScript(%s,--rootpath=%s) "%(
join( home, "scanpath.py"),
newroot
)
)
else:
#dialogaddonscan était en cours d'utilisation, on return
return
- #xbmc.executebuiltin( "Notification(My Pictures
Database,Folder has been scanned,%s,%s)"%(3000,join(os.getcwd(),"icon.png")))
+ #xbmc.executebuiltin( "Notification(My Pictures
Database,Folder has been scanned,%s,%s)"%(3000,join(home,"icon.png")))
elif self.args.do=="addrootfolder":
if str(self.args.exclude)=="1":
MPDB.AddRoot(unquote_plus(self.args.addpath),0,0,1)
@@ -540,12 +542,12 @@ class Main:
except IndexError,msg:
print IndexError,msg
#TODO : this notification does not work with é letters in the
string....
- xbmc.executebuiltin(
"Notification(%s,%s,%s,%s)"%(__language__(30000).encode("utf8"),__language__(30205).encode("utf8"),3000,join(os.getcwd(),"icon.png")))#+":".encode("utf8")+unquote_plus(self.args.delpath))
)
+ xbmc.executebuiltin(
"Notification(%s,%s,%s,%s)"%(__language__(30000).encode("utf8"),__language__(30205).encode("utf8"),3000,join(home,"icon.png")))#+":".encode("utf8")+unquote_plus(self.args.delpath))
)
elif self.args.do=="rootclic":#clic sur un chemin (Ã exclure ou Ã
scanner)
if not(xbmc.getInfoLabel(
"Window.Property(DialogAddonScan.IsAlive)" ) == "true"): #si dialogaddonscan
n'est pas en cours d'utilisation...
if str(self.args.exclude)=="0":#le chemin choisi n'est pas un
chemin à exclure...
path,recursive,update,exclude =
MPDB.getRoot(unquote_plus(self.args.rootpath))
- xbmc.executebuiltin( "RunScript(%s,--rootpath=%s)"%( join(
os.getcwd(), "scanpath.py"),
+ xbmc.executebuiltin( "RunScript(%s,--rootpath=%s)"%( join(
home, "scanpath.py"),
quote_plus(path)
)
)
@@ -558,7 +560,7 @@ class Main:
dialog = xbmcgui.Dialog()
dialog.ok(__language__(30000),str(xbmc.getInfoLabel(
"Window.Property(DialogAddonScan.IsAlive)" ) == "true"))
if not(xbmc.getInfoLabel(
"Window.Property(DialogAddonScan.IsAlive)" ) == "true"): #si dialogaddonscan
n'est pas en cours d'utilisation...
- xbmc.executebuiltin( "RunScript(%s,--database)"% join(
os.getcwd(), "scanpath.py") )
+ xbmc.executebuiltin( "RunScript(%s,--database)"% join( home,
"scanpath.py") )
return
else:
#dialogaddonscan était en cours d'utilisation, on return
@@ -603,7 +605,7 @@ class Main:
iconimage = join(PIC_PATH,"settings.png"),#icone
fanart = join(PIC_PATH,"fanart-setting.png"),
#menucontextuel
- contextmenu = [(
__language__(30206),"Notification(TODO : scan folder,scan this folder now
!,3000,%s)"%join(os.getcwd(),"icon.png") ),
+ contextmenu = [(
__language__(30206),"Notification(TODO : scan folder,scan this folder now
!,3000,%s)"%join(home,"icon.png") ),
(
__language__(30207),"Container.Update(\"%s?action='rootfolders'&do='delroot'&delpath='%s'&exclude='1'&viewmode='view'\",)"%(sys.argv[0],quote_plus(path)))
]
)
@@ -699,7 +701,7 @@ class Main:
xbmc.executebuiltin( "Notification(%s,%s
%s,%s,%s)"%(__language__(30000).encode("utf8"),
__language__(30154).encode("utf8"),
namecollection,
-
3000,join(os.getcwd(),"icon.png"))
+
3000,join(home,"icon.png"))
)
def add_folder_to_collection(self):
listcollection = ["[[%s]]"%__language__(30157)]+[col[0] for col in
MPDB.ListCollections()]
@@ -727,7 +729,7 @@ class Main:
xbmc.executebuiltin( "Notification(%s,%s
%s,%s,%s)"%(__language__(30000).encode("utf8"),
__language__(30161).encode("utf8")%len(filelist),
namecollection,
-
3000,join(os.getcwd(),"icon.png"))
+
3000,join(home,"icon.png"))
)
def remove_collection(self):
@@ -854,7 +856,7 @@ class Main:
#todo, ask for another name and if cancel, cancel the zip
process as well
xbmc.executebuiltin(
"Notification(%s,%s,%s,%s)"%(__language__(30000),
__language__(30066),#Archiving pictures canceled
-
3000,join(os.getcwd(),"icon.png")) )
+
3000,join(home,"icon.png")) )
return
else:
pass #user is ok to overwrite, let's go on
@@ -887,7 +889,7 @@ class Main:
if not msg:
if error: msg = __language__(30069)%(error,len(filelist))
#"%s Errors while zipping %s files"
else: msg = __language__(30070)%len(filelist)
#%s files successfully Zipped !!
- xbmc.executebuiltin(
"Notification(%s,%s,%s,%s)"%(__language__(30000),msg,3000,join(os.getcwd(),"icon.png"))
)
+ xbmc.executebuiltin(
"Notification(%s,%s,%s,%s)"%(__language__(30000),msg,3000,join(home,"icon.png"))
)
return
if self.args.viewmode=="export":
@@ -920,7 +922,7 @@ class Main:
dialog.ok(__language__(30000),"Error#%s :
%s"%msg.args)
else:
xbmc.executebuiltin( "Notification(%s,%s,%s,%s
)"%(__language__(30000),__language__(30183),#Files copy canceled !
-
3000,join(os.getcwd(),"icon.png")) )
+
3000,join(home,"icon.png")) )
return
@@ -944,7 +946,7 @@ class Main:
pDialog.update(100,__language__(30188),dstpath)#"Copying Finished !
xbmc.sleep(1000)
xbmc.executebuiltin( "Notification(%s,%s,%s,%s
)"%(__language__(30000),__language__(30189)%(cpt,dstpath),#%s files copied to %s
-
3000,join(os.getcwd(),"icon.png")) )
+
3000,join(home,"icon.png")) )
dialog.browse(2, __language__(30188),"files" ,"", True, False,
dstpath)#show the folder which contain pictures exported
return
@@ -1009,7 +1011,7 @@ if __name__=="__main__":
if Addon.getSetting('bootscan')=='true':
if not(xbmc.getInfoLabel(
"Window.Property(DialogAddonScan.IsAlive)" ) == "true"):
#si un scan n'est pas en cours, on lance le scan
- xbmc.executebuiltin( "RunScript(%s,--database) "%join(
os.getcwd(), "scanpath.py") )
+ xbmc.executebuiltin( "RunScript(%s,--database) "%join( home,
"scanpath.py") )
#puis on rafraichi le container sans remplacer le contenu,
avec un paramètre pour dire d'afficher le menu
xbmc.executebuiltin(
"Container.Update(\"%s?action='showhome'&viewmode='view'\" ,)"%(sys.argv[0]) , )
else:
diff --git a/plugin.image.mypicsdb/resources/language/English/strings.xml
b/plugin.image.mypicsdb/resources/language/English/strings.xml
index 62153b4..d7cbef8 100644
--- a/plugin.image.mypicsdb/resources/language/English/strings.xml
+++ b/plugin.image.mypicsdb/resources/language/English/strings.xml
@@ -8,8 +8,8 @@
<string id="30004">%Y</string> <!-- year format -->
<string id="30005">Mo.|Tu.|We.|Th.|Fr.|Sa.|Su.</string>
<string
id="30006">Jan.|Feb.|Mar|Apr.|May|Jun.|Jul.|Aug.|Sep.|Oct.|Nov.|Dec.</string>
- <string
id="30007">Monday|Tuesday|Wednesday|Thursday[Friday|Saturday|Sunday</string>
- <string
id="30008">January|February|March|April|May|June|Jully|August|September|October|November|December</string>
+ <string
id="30007">Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday</string>
+ <string
id="30008">January|February|March|April|May|June|July|August|September|October|November|December</string>
<string id="30009"></string>
<string id="30020">Picture folder</string>
diff --git a/plugin.image.mypicsdb/scanpath.py
b/plugin.image.mypicsdb/scanpath.py
index f1b250a..d8b9f84 100644
--- a/plugin.image.mypicsdb/scanpath.py
+++ b/plugin.image.mypicsdb/scanpath.py
@@ -24,23 +24,26 @@ usage :
"""
#import sys
from sys import path as syspath,modules as sysmodules
-from os import getcwd,stat,listdir as oslistdir
+from os import stat,listdir as oslistdir
from os.path import join,splitext,walk,basename,normpath,isdir,sep as
separator,dirname as osdirname
-home = getcwd().replace(';','')
+import xbmc,xbmcgui,xbmcaddon
+Addon = xbmcaddon.Addon(id='plugin.image.mypicsdb')
+
+#home = getcwd().replace(';','')
+home = Addon.getAddonInfo('path')
#these few lines are taken from AppleMovieTrailers script
# Shared resources
BASE_RESOURCE_PATH = join( home, "resources" )
-DATA_PATH = xbmc.translatePath(
"special://profile/addon_data/plugin.image.mypicsdb/")
+#DATA_PATH = xbmc.translatePath(
"special://profile/addon_data/plugin.image.mypicsdb/")
+DATA_PATH = Addon.getAddonInfo('profile')
PIC_PATH = join( BASE_RESOURCE_PATH, "images")
DB_PATH = xbmc.translatePath( "special://database/")
syspath.append( join( BASE_RESOURCE_PATH, "lib" ) )
-import xbmc,xbmcgui,xbmcaddon
-Addon = xbmcaddon.Addon(id='plugin.image.mypicsdb')
__language__ = Addon.getLocalizedString
from urllib import unquote_plus
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
plugin.image.mypicsdb/addon.xml | 2 +-
plugin.image.mypicsdb/default.py | 40 +++++++++--------
.../resources/language/English/strings.xml | 4 +-
plugin.image.mypicsdb/scanpath.py | 13 +++--
plugin.video.xbmcflicks/addon.xml | 4 +-
plugin.video.xbmcflicks/changelog.txt | 3 +-
plugin.video.xbmcflicks/icon.png | Bin 27130 -> 43884 bytes
plugin.video.xbmcflicks/resources/lib/iqueue.py | 47 ++++++++++++++++---
...ayercorefactory.xml => playercorefactory32.xml} | 2 +-
...yercorefactory.xml => playercorefactoryOSX.xml} | 6 +-
11 files changed, 81 insertions(+), 42 deletions(-)
copy plugin.video.xbmcflicks/resources/{playercorefactory.xml =>
playercorefactory32.xml} (76%)
copy plugin.video.xbmcflicks/resources/{playercorefactory.xml =>
playercorefactoryOSX.xml} (57%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
