The branch, dharma-pre has been updated
via d1978de9c21d7fcdb01e66e832e8d56132978cde (commit)
via 570c3771488c2e7da851a31ea89a61a9a123b87b (commit)
via f9ecce44dbb69c8a51a308f8232f4b55d011825e (commit)
from 8e85593fae7f7f17407a3f9356aa4605b111f1fa (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=d1978de9c21d7fcdb01e66e832e8d56132978cde
commit d1978de9c21d7fcdb01e66e832e8d56132978cde
Author: Zeljko Ametovic <[email protected]>
Date: Mon Nov 29 12:15:56 2010 +0400
[script.rss.editor] -v 1.6.0
-fixed: language in setEditor was crashing
-changed: use getAddonInfo('path') instead of os.getcwd()
diff --git a/script.rss.editor/addon.xml b/script.rss.editor/addon.xml
index e916c04..ca7de58 100755
--- a/script.rss.editor/addon.xml
+++ b/script.rss.editor/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.rss.editor"
name="RSS Editor"
- version="1.5.9"
+ version="1.6.0"
provider-name="rwparris2">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.rss.editor/default.py b/script.rss.editor/default.py
index a0c57ea..da5b0b9 100644
--- a/script.rss.editor/default.py
+++ b/script.rss.editor/default.py
@@ -5,18 +5,19 @@ import xbmcaddon
# Script constants
__scriptname__ = "RSS Editor"
-__author__ = "rwparris2"
-__url__ = "http://code.google.com/p/xbmc-addons/";
-__credits__ = "Team XBMC"
-__version__ = "1.5.6"
-__settings__ = xbmcaddon.Addon(id='script.rss.editor')
-__language__ = __settings__.getLocalizedString
+__author__ = "rwparris2"
+__url__ = "http://code.google.com/p/xbmc-addons/";
+__credits__ = "Team XBMC"
+__version__ = "1.5.6"
+__settings__ = xbmcaddon.Addon(id='script.rss.editor')
+__language__ = __settings__.getLocalizedString
+__cwd__ = __settings__.getAddonInfo('path')
print "[SCRIPT] '%s: version %s' initialized!" % (__scriptname__, __version__,
)
if (__name__ == "__main__"):
import resources.lib.rssEditor as rssEditor
- ui = rssEditor.GUI("script-RSS_Editor-rssEditor.xml", os.getcwd(),
"default", setNum = 'set1')
+ ui = rssEditor.GUI("script-RSS_Editor-rssEditor.xml", __cwd__, "default",
setNum = 'set1')
del ui
sys.modules.clear()
diff --git a/script.rss.editor/resources/lib/rssEditor.py
b/script.rss.editor/resources/lib/rssEditor.py
index a7e5cd3..8690fc2 100644
--- a/script.rss.editor/resources/lib/rssEditor.py
+++ b/script.rss.editor/resources/lib/rssEditor.py
@@ -4,8 +4,8 @@ import os, sys
from xmlParser import XMLParser
#enable localization
-getLS = sys.modules[ "__main__" ].__language__
-
+getLS = sys.modules[ "__main__" ].__language__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
class GUI(xbmcgui.WindowXMLDialog):
@@ -79,7 +79,7 @@ class GUI(xbmcgui.WindowXMLDialog):
#change/modify set
elif controlId == self.control_changeSet_button_id:
import setEditor
- setEditorUI = setEditor.GUI("script-RSS_Editor-setEditor.xml",
os.getcwd(), "default", setNum = self.setNum)
+ setEditorUI = setEditor.GUI("script-RSS_Editor-setEditor.xml",
__cwd__, "default", setNum = self.setNum)
self.close()
del setEditorUI
#save xml
diff --git a/script.rss.editor/resources/lib/setEditor.py
b/script.rss.editor/resources/lib/setEditor.py
index 78cc2a9..2249036 100644
--- a/script.rss.editor/resources/lib/setEditor.py
+++ b/script.rss.editor/resources/lib/setEditor.py
@@ -1,10 +1,11 @@
import xbmc
import xbmcgui
-import os
+import os, sys
from xmlParser import XMLParser
#enable localization
-getLS = xbmc.Language(os.getcwd()).getLocalizedString
+getLS = sys.modules[ "__main__" ].__language__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
class GUI(xbmcgui.WindowXMLDialog):
@@ -57,7 +58,7 @@ class GUI(xbmcgui.WindowXMLDialog):
def closeDialog(self):
"""Close the Set Editor Dialog and open RSS Editor Dialog"""
import rssEditor
- rssEditorUI = rssEditor.GUI("script-RSS_Editor-rssEditor.xml",
os.getcwd(), "default", setNum = self.setNum)
+ rssEditorUI = rssEditor.GUI("script-RSS_Editor-rssEditor.xml",
__cwd__, "default", setNum = self.setNum)
self.close()
del rssEditorUI
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=570c3771488c2e7da851a31ea89a61a9a123b87b
commit 570c3771488c2e7da851a31ea89a61a9a123b87b
Author: Zeljko Ametovic <[email protected]>
Date: Mon Nov 29 12:06:24 2010 +0400
[script.gmail.checker] -v 1.0.3
-changed: use getAddonInfo('path') instead of os.getcwd()
diff --git a/script.gmail.checker/addon.xml b/script.gmail.checker/addon.xml
index bcdb7d8..4cbeebe 100644
--- a/script.gmail.checker/addon.xml
+++ b/script.gmail.checker/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.gmail.checker"
name="Gmail Checker"
- version="1.0.2"
+ version="1.0.3"
provider-name="Amet">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.gmail.checker/default.py b/script.gmail.checker/default.py
index b2892dc..34cd56f 100644
--- a/script.gmail.checker/default.py
+++ b/script.gmail.checker/default.py
@@ -11,15 +11,13 @@ __version__ = "1.0.0"
__XBMC_Revision__ = "22240"
-BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( os.getcwd(),
'resources', 'lib' ) )
+__settings__ = xbmcaddon.Addon(id='script.gmail.checker')
+__language__ = __settings__.getLocalizedString
+__cwd__ = __settings__.getAddonInfo('path')
+BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( os.getcwd(),
'resources', 'lib' ) )
sys.path.append (BASE_RESOURCE_PATH)
-__settings__ = xbmcaddon.Addon(id='script.gmail.checker')
-
-__language__ = __settings__.getLocalizedString
-
-
if __name__ == "__main__":
import gui
ui = gui.GUI( "script-GmailChecker-main.xml" , os.getcwd(), "Default")
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=f9ecce44dbb69c8a51a308f8232f4b55d011825e
commit f9ecce44dbb69c8a51a308f8232f4b55d011825e
Author: Zeljko Ametovic <[email protected]>
Date: Mon Nov 29 12:01:45 2010 +0400
[script.cu.lyrics] -v 0.9.9
- changed: use getAddonInfo('path') instead of os.getcwd()
diff --git a/script.cu.lyrics/addon.xml b/script.cu.lyrics/addon.xml
index 6cbc16f..1ff8341 100644
--- a/script.cu.lyrics/addon.xml
+++ b/script.cu.lyrics/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.cu.lyrics"
name="CU Lyrics"
- version="0.9.8"
+ version="0.9.9"
provider-name="Amet">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.cu.lyrics/changelog.txt b/script.cu.lyrics/changelog.txt
index b83b80b..b4087b5 100644
--- a/script.cu.lyrics/changelog.txt
+++ b/script.cu.lyrics/changelog.txt
@@ -1,3 +1,6 @@
+0.9.9
+- changed: use getAddonInfo('path') instead of os.getcwd()
+
0.9.8
- fixed: script wouldn't detect song change with .mp3 + .cue or .flac + .cue
files. Thanks pike!
diff --git a/script.cu.lyrics/default.py b/script.cu.lyrics/default.py
index 905e396..dc3373d 100644
--- a/script.cu.lyrics/default.py
+++ b/script.cu.lyrics/default.py
@@ -13,17 +13,18 @@ __version__ = "0.9.2"
__XBMC_Revision__ = "30001"
# Shared resources
-BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( os.getcwd(),
'resources', 'lib' ) )
+__settings__ = xbmcaddon.Addon(id=__scriptid__)
+__language__ = __settings__.getLocalizedString
+__cwd__ = __settings__.getAddonInfo('path')
-sys.path.append (BASE_RESOURCE_PATH)
+BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( __cwd__, 'resources',
'lib' ) )
-__settings__ = xbmcaddon.Addon(id=__scriptid__)
-__language__ = __settings__.getLocalizedString
+sys.path.append (BASE_RESOURCE_PATH)
if ( __name__ == "__main__" ):
import gui as gui
window = "main"
- ui = gui.GUI( "script-XBMC_Lyrics-main.xml" , os.getcwd(), "Default" )
+ ui = gui.GUI( "script-XBMC_Lyrics-main.xml" , __cwd__, "Default" )
ui.doModal()
del ui
sys.modules.clear()
\ No newline at end of file
diff --git a/script.cu.lyrics/resources/lib/gui.py
b/script.cu.lyrics/resources/lib/gui.py
index 4ceefdd..9aab439 100755
--- a/script.cu.lyrics/resources/lib/gui.py
+++ b/script.cu.lyrics/resources/lib/gui.py
@@ -18,9 +18,10 @@ except:
current_win_id = xbmcgui.getCurrentWindowId()
__scriptname__ = sys.modules[ "__main__" ].__scriptname__
-__version__ = sys.modules[ "__main__" ].__version__
-__settings__ = sys.modules[ "__main__" ].__settings__
-__language__ = sys.modules[ "__main__" ].__language__
+__version__ = sys.modules[ "__main__" ].__version__
+__settings__ = sys.modules[ "__main__" ].__settings__
+__language__ = sys.modules[ "__main__" ].__language__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
SELECT_ITEM = ( 11, 256, 61453, )
EXIT_SCRIPT = ( 6, 10, 247, 275, 61467, 216, 257, 61448, )
diff --git a/script.cu.lyrics/resources/lib/lyricsScraper.py
b/script.cu.lyrics/resources/lib/lyricsScraper.py
index 2724e40..161ce3c 100644
--- a/script.cu.lyrics/resources/lib/lyricsScraper.py
+++ b/script.cu.lyrics/resources/lib/lyricsScraper.py
@@ -9,8 +9,9 @@ from song import *
import lyrics
-__language__ = sys.modules[ "__main__" ].__language__
-__title__ = __language__(30003)
+__language__ = sys.modules[ "__main__" ].__language__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
+__title__ = __language__(30003)
__allow_exceptions__ = True
class WikiaFormat:
@@ -213,10 +214,10 @@ class LyricsFetcher:
""" Sets exceptions for formatting artist """
try:
if ( __name__ == "__main__" ):
- ex_path = os.path.join( os.getcwd(), "exceptions.txt" )
+ ex_path = os.path.join( __cwd__, "exceptions.txt" )
else:
name = __name__.replace( "resources.scrapers.", "" ).replace(
".lyricsScraper", "" )
- ex_path = os.path.join( xbmc.translatePath( "P:\\script_data"
), os.getcwd(), "scrapers", name, "exceptions.txt" )
+ ex_path = os.path.join( xbmc.translatePath( "P:\\script_data"
), __cwd__, "scrapers", name, "exceptions.txt" )
ex_file = open( ex_path, "r" )
self.exceptions = eval( ex_file.read() )
ex_file.close()
@@ -246,7 +247,7 @@ class LyricsFetcher:
usock = urllib.urlopen( url % ( artist, song, ) )
else:
- usock = open( os.path.join( os.getcwd(), "lyrics_source.txt"
), "r" )
+ usock = open( os.path.join( __cwd__, "lyrics_source.txt" ),
"r" )
# read source
jsonSource = usock.read()
print str(jsonSource)
@@ -270,7 +271,7 @@ class LyricsFetcher:
# Save htmlSource to a file for testing scraper (if debugWrite)
if ( debugWrite ):
- file_object = open( os.path.join( os.getcwd(),
"lyrics_source.txt" ), "w" )
+ file_object = open( os.path.join( __cwd__, "lyrics_source.txt"
), "w" )
file_object.write( jsonSource )
file_object.close()
# exec jsonSource to a native python dictionary
@@ -291,14 +292,14 @@ class LyricsFetcher:
if ( not debug ):
usock = urllib.urlopen( url % ( artist, ) )
else:
- usock = open( os.path.join( os.getcwd(), "songs_source.txt" ),
"r" )
+ usock = open( os.path.join( __cwd__, "songs_source.txt" ), "r"
)
# read source
jsonSource = usock.read()
# close socket
usock.close()
# Save htmlSource to a file for testing scraper (if debugWrite)
if ( debugWrite ):
- file_object = open( os.path.join( os.getcwd(),
"songs_source.txt" ), "w" )
+ file_object = open( os.path.join( __cwd__, "songs_source.txt"
), "w" )
file_object.write( jsonSource )
file_object.close()
# exec jsonSource to a native python dictionary
diff --git a/script.cu.lyrics/resources/lib/song.py
b/script.cu.lyrics/resources/lib/song.py
index 1fd1052..774bcf0 100644
--- a/script.cu.lyrics/resources/lib/song.py
+++ b/script.cu.lyrics/resources/lib/song.py
@@ -1,8 +1,11 @@
import os
import utilities
import xbmc
+import sys
-BASE_DATA_PATH = os.path.join( xbmc.translatePath( "special://profile/" ),
"addon_data", os.path.basename( os.getcwd() ) )
+__cwd__ = sys.modules[ "__main__" ].__cwd__
+
+BASE_DATA_PATH = os.path.join( xbmc.translatePath( "special://profile/" ),
"addon_data", os.path.basename( __cwd__ ) )
lyrics_path = os.path.join( BASE_DATA_PATH, "lyrics")
class Song:
diff --git a/script.cu.lyrics/resources/lib/utilities.py
b/script.cu.lyrics/resources/lib/utilities.py
index 88d2f6d..4cd8cf0 100644
--- a/script.cu.lyrics/resources/lib/utilities.py
+++ b/script.cu.lyrics/resources/lib/utilities.py
@@ -10,12 +10,13 @@ DEBUG_MODE = 0
_ = sys.modules[ "__main__" ].__language__
__scriptname__ = sys.modules[ "__main__" ].__scriptname__
__version__ = sys.modules[ "__main__" ].__version__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
# comapatble versions
SETTINGS_VERSIONS = ( "1.7", )
# base paths
-BASE_DATA_PATH = os.path.join( xbmc.translatePath( "special://profile/" ),
"addon_data", os.path.basename( os.getcwd() ) )
-BASE_SETTINGS_PATH = os.path.join( xbmc.translatePath( "special://profile/" ),
"addon_data", os.path.basename( os.getcwd() ), "settings.txt" )
+BASE_DATA_PATH = os.path.join( xbmc.translatePath( "special://profile/" ),
"addon_data", os.path.basename( __cwd__ ) )
+BASE_SETTINGS_PATH = os.path.join( xbmc.translatePath( "special://profile/" ),
"addon_data", os.path.basename( __cwd__ ), "settings.txt" )
BASE_RESOURCE_PATH = sys.modules[ "__main__" ].BASE_RESOURCE_PATH
# special button codes
SELECT_ITEM = ( 11, 256, 61453, )
-----------------------------------------------------------------------
Summary of changes:
script.cu.lyrics/addon.xml | 2 +-
script.cu.lyrics/changelog.txt | 3 +++
script.cu.lyrics/default.py | 11 ++++++-----
script.cu.lyrics/resources/lib/gui.py | 7 ++++---
script.cu.lyrics/resources/lib/lyricsScraper.py | 17 +++++++++--------
script.cu.lyrics/resources/lib/song.py | 5 ++++-
script.cu.lyrics/resources/lib/utilities.py | 5 +++--
script.gmail.checker/addon.xml | 2 +-
script.gmail.checker/default.py | 10 ++++------
script.rss.editor/addon.xml | 2 +-
script.rss.editor/default.py | 15 ++++++++-------
script.rss.editor/resources/lib/rssEditor.py | 6 +++---
script.rss.editor/resources/lib/setEditor.py | 7 ++++---
13 files changed, 51 insertions(+), 41 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
