Skip to content

Leo5374 patch 2 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lliu5374 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Leo5374 patch 2 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f03ec08
fix for new login challenge and file listing
lliu5374 Nov 19, 2018
70daa15
Merge pull request #2 from leo5374/leo5374-patch-1
lliu5374 Nov 19, 2018
ef85643
fixed token validation and server environment
lliu5374 Nov 28, 2018
f79014b
cleanup debug print statements
lliu5374 Nov 28, 2018
6f361ec
fixed a syntax error
lliu5374 Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def main_menu():
break
else:
cookie,tokens = get_auth.run(user_info['username'], user_info['password'])
if tokens['bdstoken']:
if tokens and tokens['bdstoken']:
save_user_info(user_info['username'], user_info['password'], cookie, tokens)
else:
items.extend([{'label': u'重新登录', 'path': plugin.url_for('relogin')}])
Expand Down Expand Up @@ -331,6 +331,8 @@ def save_user_info(username, password, cookie, tokens):

def MakeList(pcs_files):
item_list = []
item_list_dir = []
item_list_file = []
ContextMenu = [
('搜索', actions.background(plugin.url_for('search'))),
('刷新', actions.background(plugin.url_for('refresh'))),
Expand All @@ -344,7 +346,7 @@ def MakeList(pcs_files):
'is_playable': False,
'context_menu': ContextMenu,
}
item_list.append(item)
item_list_dir.append(item)
elif result['category'] == 1:
if 'thumbs' in result and 'url2' in result['thumbs']:
ThumbPath = result['thumbs']['url2']
Expand All @@ -362,15 +364,17 @@ def MakeList(pcs_files):
'is_playable': False,
'context_menu': ContextMenu,
}
item_list.append(item)
item_list_file.append(item)
elif result['category'] == 2:
item = {
'label': result['server_filename'],
'path': plugin.url_for('play_music', filepath=result['path'].encode('utf-8')),
'is_playable': False,
'context_menu': ContextMenu,
}
item_list.append(item)
item_list_file.append(item)
item_list_file=sorted(item_list_file,key=lambda item:item['label'])
item_list=item_list_dir+item_list_file
return item_list


Expand Down
Loading