admin/jellycon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some options

Browse Source
This commit is contained in:
faush01
2014-11-25 14:20:04 +11:00
parent c2a23b862b
commit ca21e77731
3 changed files with 11 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
resources/language/English/strings.xml
View File

@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30000">Primary Server Address</string>
<string id="30001">Auto enter single folder items:</string>
<string id="30002">Play from HTTP instead of SMB:</string>
<string id="30000">Server Address</string>
<string id="30030">Server Port:</string>
<string id="30004">Log Level:</string>
<string id="30005">Username: </string>
<string id="30006">Password: </string>
<string id="30007">Samba Username: </string>
<string id="30008">Samba Password: </string>
<string id="30009">Transcode: </string>
<string id="30010">Enable performance profiling</string>
<string id="30014">MediaBrowser</string>
@@ -18,61 +16,38 @@
<string id="30022">Advanced</string>
<string id="30024">Username:</string>
<string id="30025">Password:</string>
<string id="30030">Port Number:</string>
<string id="30036">Number of recent Movies to show:</string>
<string id="30037">Number of recent TV episodes to show:</string>
<string id="30035">Number of recent Music Albums to show:</string>
<string id="30038">Mark watched at start of playback:</string>
<string id="30039">Set Season poster for episodes</string>
<string id="30044">Incorrect Username/Password</string>
<string id="30045">Username not found</string>
<string id="30053">Waiting for server to delete</string>
<string id="30091">Confirm file delete?</string>
<string id="30092">Delete this item? This action will delete media and associated data files.</string>
<string id="30110">Interface</string>
<string id="30111">Include Stream Info</string>
<string id="30112">Include People</string>
<string id="30113">Include Overview</string>
<string id="30114">On Resume Jump Back Seconds</string>
<string id="30115">Mark Played When Stopping Above %</string>
<string id="30116">Add Item and Played Counts</string>
<string id="30117"> - Background Art Refresh Rate (seconds)</string>
<string id="30117">Background Art Refresh Rate (seconds)</string>
<string id="30118">Add Resume Percent</string>
<string id="30119">Add Episode Number</string>
<string id="30120">Show Load Progress</string>
<string id="30125">Done</string>
<string id="30126">Processing Item : </string>
<string id="30127">Offer delete for watched episodes</string>
<string id="30128">Play Error</string>
<string id="30129">This item is not playable</string>
<string id="30130">Local path detected</string>
<string id="30131">Your MB3 Server contains local paths. Please change server paths to UNC or change MBCon setting 'Play from Stream' to true. Path: </string>
<string id="30132">Warning</string>
<string id="30133">Debug logging enabled.</string>
<string id="30134">This will affect performance.</string>
<string id="30135">Error</string>
<string id="30136">MBCon service is not running</string>
<string id="30137">Please restart XBMC</string>
<string id="30138">Search</string>
<string id="30150">Skin does not support setting views</string>
<string id="30151">Select item action (Requires Restart)</string>
<string id="30159">Artwork</string>
<string id="30162">Add Season Number</string>
<string id="30163">Flatten Seasons</string>
<string id="30167">Server Detection Succeeded</string>
<string id="30168">Found server</string>
<string id="30169">Address : </string>
<string id="30200">Select User</string>
<string id="30201">Profiling enabled.</string>
<string id="30203">Error in ArtworkRotationThread</string>
<string id="30204">Unable to connect to host</string>
<string id="30205">Error in LoadMenuOptionsThread</string>

10
resources/lib/Functions.py
View File

@@ -985,11 +985,6 @@ def processDirectory(url, results, progress, pluginhandle):
result = results.get("Items")
if(result == None):
result = []
if len(result) == 1 and __settings__.getSetting('autoEnterSingle') == "true":
if result[0].get("Type") == "Season":
jsonData = downloadUtils.downloadUrl("http://" + server + "/mediabrowser/Users/" + userid + "/items?ParentId=" + result[0].get("Id") + '&IsVirtualUnAired=false&IsMissing=false&Fields=' + detailsString + '&SortBy=SortName&format=json', suppress=False, popup=1 )
results = json.loads(jsonData)
result=results.get("Items")
item_count = len(result)
current_item = 1;
@@ -1249,10 +1244,7 @@ def processDirectory(url, results, progress, pluginhandle):
SortByTemp = __settings__.getSetting('sortby')
if SortByTemp == '' and not (item_type == 'Series' or item_type == 'Season' or item_type == 'BoxSet' or item_type == 'MusicAlbum' or item_type == 'MusicArtist'):
SortByTemp = 'SortName'
if item_type=='Series' and __settings__.getSetting('flattenSeasons')=='true':
u = 'http://' + server + '/mediabrowser/Users/'+ userid + '/items?ParentId=' +id +'&IncludeItemTypes=Episode&Recursive=true&IsVirtualUnAired=false&IsMissing=false&Fields=' + detailsString + '&SortBy=SortName'+'&format=json'
else:
u = 'http://' + server + '/mediabrowser/Users/'+ userid + '/items?ParentId=' +id +'&IsVirtualUnAired=false&IsMissing=false&Fields=' + detailsString + '&SortBy='+SortByTemp+'&format=json'
u = 'http://' + server + '/mediabrowser/Users/'+ userid + '/items?ParentId=' +id +'&IsVirtualUnAired=false&IsMissing=false&Fields=' + detailsString + '&SortBy='+SortByTemp+'&format=json'
if (item.get("RecursiveItemCount") != 0):
dirItems.append(addGUIItem(u, details, extraData))
else:

15
resources/settings.xml
View File

@@ -6,28 +6,23 @@
<setting type="sep" />
<setting id="username" type="text" label="30024" />
<setting id="password" type="text" option="hidden" label="30025" />
</category>
<category label="30015"> <!-- Network -->
<setting id="deviceName" type="text" label="30016" default="MBCon" visible="true" enable="true" />
<setting type="sep" />
<setting id="smbusername" type="text" label="30007" default="" visible="true" enable="true" />
<setting id="smbpassword" type="text" label="30008" default="" option="hidden" visible="true" enable="true" />
<setting id="deviceName" type="text" label="30016" default="MBCon" visible="true" enable="true" />
</category>
<category label="30110"> <!-- Interface -->
<setting id="selectAction" type="enum" label="30151" values="Play|Info" default="0" />
<category label="30110">
<setting id="selectAction" type="enum" label="30151" values="Play|Info" default="1" />
<setting id="resumeJumpBack" type="number" label="30114" default="10" visible="true" enable="true" />
<setting id="addCounts" type="bool" label="30116" default="true" visible="true" enable="true" />
<setting id="addSeasonNumber" type="bool" label="30162" default="false" visible="true" enable="true" />
<setting id="addEpisodeNumber" type="bool" label="30119" default="true" visible="true" enable="true" />
<setting id="addResumePercent" type="bool" label="30118" default="true" visible="true" enable="true" />
<setting id="flattenSeasons" type="bool" label="30163" default="false" visible="true" enable="true" />
<setting id="autoEnterSingle" type="bool" label="30001" default="true" visible="true" enable="true" />
<setting id="showLoadProgress" type="bool" label="30120" default="false" visible="true" enable="true" />
</category>
<category label="30159"> <!-- Artwork -->
<setting id="backgroundRefresh" type="number" label="30117" default="30" visible="true" enable="true" />
</category>
<category label="30022"> <!-- Advanced -->
<setting id="logLevel" type="enum" label="30004" values="None(0)|Info(1)|Debug(2)" default="0" />
<setting id="logLevel" type="enum" label="30004" values="None|Info|Debug" default="0" />
<setting id="profile" type="bool" label="30010" default="false" visible="true" enable="true" />
</category>
</settings>