Skip to content

Commit

Permalink
changes for new domain, all-uc fix, misc
Browse files Browse the repository at this point in the history 
Fixed:
- Fixes site changes for new domain
- ALL-UC bug when no result in first request

New:
- Added Dev notice field to Site news

Changes:
- Clear text for Update to /dev menu item
- Warning icon for FAIL results in Interface Logger
  • Loading branch information
@coder-alpha
coder-alpha committed Nov 10, 2017
1 parent f0e54dd commit cf3132d
Show file tree
Hide file tree
Showing 8 changed files with 161 additions and 56 deletions.
135 changes: 110 additions & 25 deletions Contents/Code/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from DumbTools import DumbKeyboard
import AuthTools

SITE = "FMovies"
TITLE = common.TITLE
PREFIX = common.PREFIX
ART = "art-default.jpg"
Expand Down Expand Up @@ -67,6 +66,7 @@
ICON_DOWNLOADS = "icon-downloads.png"
ICON_REQUESTS = "icon-requests.png"
ICON_TOOLS = "icon-tools.png"
ICON_WARNING = "icon-warning.png"

MC = common.NewMessageContainer(common.PREFIX, common.TITLE)

Expand Down Expand Up @@ -124,8 +124,14 @@ def Start():
Log.Debug("HTTP Cache Time set to %s min." % int(CACHE_EXPIRY/60))

HTTP.Headers['User-Agent'] = common.client.randomagent()
fmovies.BASE_URL = Prefs["base_url"]
fmovies.BASE_URL = Prefs["new_base_url"]
if common.CHECK_BASE_URL_REDIRECTION == True:
RED_URL = common.client.request(fmovies.BASE_URL, output='geturl', timeout=7)
if RED_URL != None and fmovies.BASE_URL not in RED_URL:
Log("***Base URL has been overridden and set based on redirection: %s ***" % RED_URL[:-1])
fmovies.BASE_URL = RED_URL[:-1]
HTTP.Headers['Referer'] = fmovies.BASE_URL
common.BASE_URL = fmovies.BASE_URL

DumpPrefs()
ValidateMyPrefs()
Expand All @@ -140,8 +146,14 @@ def Start():
@route(PREFIX + "/MainMenu")
def MainMenu(**kwargs):

fmovies.BASE_URL = Prefs["base_url"]
fmovies.BASE_URL = Prefs["new_base_url"]
if common.CHECK_BASE_URL_REDIRECTION == True:
RED_URL = common.client.request(fmovies.BASE_URL, output='geturl', timeout=7)
if RED_URL != None and fmovies.BASE_URL not in RED_URL:
Log("*** Base URL has been overridden and set based on redirection: %s ***" % RED_URL[:-1])
fmovies.BASE_URL = RED_URL[:-1]
HTTP.Headers['Referer'] = fmovies.BASE_URL
common.BASE_URL = fmovies.BASE_URL

session = common.getSession()
common.set_control_settings(session=session)
Expand Down Expand Up @@ -1234,10 +1246,20 @@ def IntHostTools(choice=None, myhost=None, mssg=None):
msg = '%s Log has too many entries to display (last 100 shown here), full-text will be written to Channel Log !' % myhost.title()
oc.add(DirectoryObject(title=msg, summary=msg, key=Callback(MyMessage, title='Info', msg=msg), thumb=R(ICON_INFO)))
for i in range(0,100):
oc.add(DirectoryObject(title=items[i], summary=items[i], key=Callback(MyMessage, title='Info', msg=items[i]), thumb=R(ICON_ALERT) if 'ERROR' in items[i] else R(ICON_INFO)))
if 'ERROR' in items[i]:
oc.add(DirectoryObject(title=items[i], summary=items[i], key=Callback(MyMessage, title='Error', msg=items[i]), thumb=R(ICON_ALERT)))
elif 'FAIL' in items[i]:
oc.add(DirectoryObject(title=items[i], summary=items[i], key=Callback(MyMessage, title='Fail', msg=items[i]), thumb=R(ICON_WARNING)))
else:
oc.add(DirectoryObject(title=items[i], summary=items[i], key=Callback(MyMessage, title='Info', msg=items[i]), thumb=R(ICON_INFO)))
elif len(items) > 0:
for i in items:
oc.add(DirectoryObject(title=i, summary=i, key=Callback(MyMessage, title='Info', msg=i), thumb=R(ICON_ALERT) if 'ERROR' in i else R(ICON_INFO)))
if 'ERROR' in i:
oc.add(DirectoryObject(title=i, summary=i, key=Callback(MyMessage, title='Error', msg=i), thumb=R(ICON_ALERT)))
elif 'FAIL' in i:
oc.add(DirectoryObject(title=i, summary=i, key=Callback(MyMessage, title='Fail', msg=i), thumb=R(ICON_WARNING)))
else:
oc.add(DirectoryObject(title=i, summary=i, key=Callback(MyMessage, title='Info', msg=i), thumb=R(ICON_INFO)))
else:
mssg = '%s Log has no entries !' % myhost.title()

Expand Down Expand Up @@ -1275,10 +1297,20 @@ def IntProviderTools(choice=None, provider=None, mssg=None):
msg = '%s Log has too many entries to display (last 100 shown here), full-text will be written to Channel Log !' % provider.title()
oc.add(DirectoryObject(title=msg, summary=msg, key=Callback(MyMessage, title='Info', msg=msg), thumb=R(ICON_INFO)))
for i in range(0,100):
oc.add(DirectoryObject(title=items[i], summary=items[i], key=Callback(MyMessage, title='Info', msg=items[i]), thumb=R(ICON_ALERT) if 'ERROR' in items[i] else R(ICON_INFO)))
if 'ERROR' in items[i]:
oc.add(DirectoryObject(title=items[i], summary=items[i], key=Callback(MyMessage, title='Error', msg=items[i]), thumb=R(ICON_ALERT)))
elif 'FAIL' in items[i]:
oc.add(DirectoryObject(title=items[i], summary=items[i], key=Callback(MyMessage, title='Fail', msg=items[i]), thumb=R(ICON_WARNING)))
else:
oc.add(DirectoryObject(title=items[i], summary=items[i], key=Callback(MyMessage, title='Info', msg=items[i]), thumb=R(ICON_INFO)))
elif len(items) > 0:
for i in items:
oc.add(DirectoryObject(title=i, summary=i, key=Callback(MyMessage, title='Info', msg=i), thumb=R(ICON_ALERT) if 'ERROR' in i else R(ICON_INFO)))
if 'ERROR' in i:
oc.add(DirectoryObject(title=i, summary=i, key=Callback(MyMessage, title='Error', msg=i), thumb=R(ICON_ALERT)))
elif 'FAIL' in i:
oc.add(DirectoryObject(title=i, summary=i, key=Callback(MyMessage, title='Fail', msg=i), thumb=R(ICON_WARNING)))
else:
oc.add(DirectoryObject(title=i, summary=i, key=Callback(MyMessage, title='Info', msg=i), thumb=R(ICON_INFO)))
else:
mssg = '%s Log has no entries !' % provider.title()

Expand Down Expand Up @@ -1463,6 +1495,16 @@ def ShowMenu(title, session=None, **kwargs):

notices_all = []
try:
# Developer Notice
try:
notice_txt = ""
for notice in fmovies.DEV_NOTICE:
notice_txt += notice
if notice_txt != "":
notices_all.append(notice_txt.strip())
except:
pass

# Main page news
try:
notices_m = page_data.xpath(".//*[@id='body-wrapper']/div/div[@class='alert alert-primary notice']/text()")
Expand All @@ -1473,6 +1515,15 @@ def ShowMenu(title, session=None, **kwargs):
notices_all.append(notice_txt.strip())
except:
pass
try:
notices_m = page_data.xpath(".//*[@id='body-wrapper']/div/div[@class='alert alert-default notice']/p[1]/text()[1]")
notice_txt = ""
for notice in notices_m:
notice_txt += notice
if notice_txt != "":
notices_all.append(notice_txt.strip())
except:
pass

# Listing page
try:
Expand Down Expand Up @@ -3654,7 +3705,7 @@ def RecentWatchList(title, session=None, **kwargs):
for each in Dict:
longstring = str(Dict[each])

if ('fmovies.' in longstring or ES_API_URL.lower() in longstring.lower()) and 'RR44SS' in longstring:
if (('fmovies.' in longstring or 'bmovies.' in longstring) or ES_API_URL.lower() in longstring.lower()) and 'RR44SS' in longstring:
longstringsplit = longstring.split('RR44SS')
urls_list.append({'key': each, 'time': longstringsplit[4], 'val': longstring})

Expand Down Expand Up @@ -3690,8 +3741,10 @@ def RecentWatchList(title, session=None, **kwargs):
items_to_del.append(each['key'])
elif url.replace('fmovies.is',fmovies_base) in items_in_recent or c > NO_OF_ITEMS_IN_RECENT_LIST:
items_to_del.append(each['key'])
elif url.replace('bmovies.to',fmovies_base) in items_in_recent or c > NO_OF_ITEMS_IN_RECENT_LIST:
items_to_del.append(each['key'])
else:
if 'fmovies.' in longstring:
if 'fmovies.' in longstring or 'bmovies.' in longstring:
url = url.replace(common.client.geturlhost(url),fmovies_base)
items_in_recent.append(url)

Expand Down Expand Up @@ -3732,9 +3785,7 @@ def ClearRecentWatchList(**kwargs):
for each in Dict:
try:
longstring = Dict[each]
if longstring.find(SITE.lower()) != -1 and 'http' in longstring and 'RR44SS' in longstring:
remove_list.append(each)
elif ('fmovies.' in longstring or ES_API_URL.lower() in longstring) and 'RR44SS' in longstring:
if (('fmovies.' in longstring or 'bmovies.' in longstring) or ES_API_URL.lower() in longstring) and 'RR44SS' in longstring:
remove_list.append(each)
except:
continue
Expand Down Expand Up @@ -3768,7 +3819,7 @@ def Bookmarks(title, session = None, **kwargs):
for each in Dict:
longstring = str(Dict[each])

if ('fmovies.' in longstring or ES_API_URL.lower() in longstring.lower()) and 'Key5Split' in longstring:
if (('fmovies.' in longstring or 'bmovies.' in longstring) or ES_API_URL.lower() in longstring.lower()) and 'Key5Split' in longstring:
stitle = unicode(longstring.split('Key5Split')[0])
url = longstring.split('Key5Split')[1]
summary = unicode(longstring.split('Key5Split')[2])
Expand All @@ -3778,6 +3829,8 @@ def Bookmarks(title, session = None, **kwargs):

if 'fmovies.to' in url:
url = url.replace('fmovies.to',fmovies_base)
elif 'bmovies.to' in url:
url = url.replace('bmovies.to',fmovies_base)
elif 'fmovies.se' in url:
url = url.replace('fmovies.se',fmovies_base)
elif 'fmovies.is' in url:
Expand Down Expand Up @@ -4725,22 +4778,27 @@ def Check(title, url, **kwargs):
if longstring != None and (longstring.lower()).find(ES_API_URL.lower()) != -1:
return True

if longstring != None and (longstring.lower()).find(SITE.lower()) != -1 and url in longstring:
if longstring != None and url in longstring:
return True

surl = url.replace(fmovies_urlhost,'fmovies.to')
longstring = Dict[title+'-'+E(surl)]
if longstring != None and (longstring.lower()).find(SITE.lower()) != -1 and surl in longstring:
if longstring != None and surl in longstring:
return True

surl = url.replace(fmovies_urlhost,'bmovies.to')
longstring = Dict[title+'-'+E(surl)]
if longstring != None and surl in longstring:
return True

surl = url.replace(fmovies_urlhost,'fmovies.se')
longstring = Dict[title+'-'+E(surl)]
if longstring != None and (longstring.lower()).find(SITE.lower()) != -1 and surl in longstring:
if longstring != None and surl in longstring:
return True

surl = url.replace(fmovies_urlhost,'fmovies.is')
longstring = Dict[title+'-'+E(surl)]
if longstring != None and (longstring.lower()).find(SITE.lower()) != -1 and surl in longstring:
if longstring != None and surl in longstring:
return True


Expand Down Expand Up @@ -4775,6 +4833,10 @@ def RemoveBookmark(title, url, **kwargs):
del Dict[title+'-'+E(url.replace(fmovies_urlhost,'fmovies.to'))]
except:
pass
try:
del Dict[title+'-'+E(url.replace(fmovies_urlhost,'bmovies.to'))]
except:
pass
try:
del Dict[title+'-'+E(url.replace(fmovies_urlhost,'fmovies.se'))]
except:
Expand All @@ -4796,9 +4858,7 @@ def ClearBookmarks(**kwargs):
for each in Dict:
try:
url = Dict[each]
if url.find(SITE.lower()) != -1 and 'http' in url and 'RR44SS' not in url:
remove_list.append(each)
elif url.find(ES_API_URL.lower()) != -1 and 'http' in url and 'RR44SS' not in url:
if url.find(ES_API_URL.lower()) != -1 and 'http' in url and 'RR44SS' not in url:
remove_list.append(each)
except:
continue
Expand All @@ -4821,7 +4881,7 @@ def ClearSearches(**kwargs):
remove_list = []
for each in Dict:
try:
if each.find(SITE.lower()) != -1 and 'MyCustomSearch' in each:
if (each.find('fmovies') != -1 or each.find('bmovies') != -1 or each.find(common.TITLE.lower()) != -1) and 'MyCustomSearch' in each:
remove_list.append(each)
elif each.find(ES_API_URL.lower()) != -1 and 'MyCustomSearch' in each:
remove_list.append(each)
Expand Down Expand Up @@ -4856,7 +4916,7 @@ def Search(query=None, surl=None, page_count='1', mode='default', thumb=None, su
else:
if mode == 'default':
timestr = str(int(time.time()))
Dict[SITE.lower() +'MyCustomSearch'+query] = query + 'MyCustomSearch' + timestr
Dict[common.TITLE.lower() +'MyCustomSearch'+query] = query + 'MyCustomSearch' + timestr
Dict.Save()
url = fmovies.BASE_URL + fmovies.SEARCH_PATH + '?page=%s&keyword=%s' % (str(page_count), String.Quote(query, usePlus=True))
elif mode == 'other seasons':
Expand Down Expand Up @@ -5659,25 +5719,42 @@ def SearchQueueMenu(title, session = None, **kwargs):
oc = ObjectContainer(title2='Search Using Term', no_cache=common.isForceNoCache())

urls_list = []
items_to_delete = []
items_to_convert = []

for each in Dict:
query = Dict[each]
try:
if each.find(SITE.lower()) != -1 and 'MyCustomSearch' in each and query != 'removed':
if (each.find('fmovies') != -1 or each.find('bmovies') != -1 or each.find(common.TITLE.lower()) != -1) and 'MyCustomSearch' in each and query != 'removed':
timestr = '1483228800'
if 'MyCustomSearch' in query:
split_query = query.split('MyCustomSearch')
query = split_query[0]
timestr = split_query[1]
if (each.find('fmovies') != -1 or each.find('bmovies') != -1):
items_to_delete.append(each)
items_to_convert.append({'key': query, 'time': timestr})

urls_list.append({'key': query, 'time': timestr})

elif (each.find('fmovies') != -1 or each.find('bmovies') != -1 or each.find(common.TITLE.lower()) != -1) and 'MyCustomSearch' in each and query == 'removed':
items_to_delete.append(each)
except:
pass

if len(urls_list) == 0:
return MC.message_container(title, 'No Items Available')

if len(items_to_delete) > 0:
for i in items_to_delete:
Dict[i] = None
for i in items_to_convert:
query = i['key']
timestr = i['time']
Dict[common.TITLE.lower() +'MyCustomSearch'+query] = query + 'MyCustomSearch' + timestr

Dict.Save()

newlist = sorted(urls_list, key=lambda k: k['time'], reverse=True)

oc.add(DirectoryObject(
Expand Down Expand Up @@ -6412,10 +6489,18 @@ def ValidatePrefs(changed=True, **kwargs):
if changed == True:
Log("Your Channel Preferences have changed !")

if fmovies.BASE_URL != Prefs["base_url"]:
RED_URL = None
if fmovies.BASE_URL != Prefs["new_base_url"]:
if common.CHECK_BASE_URL_REDIRECTION == True:
RED_URL = common.client.request(fmovies.BASE_URL, output='geturl', timeout=7)
if RED_URL != None and fmovies.BASE_URL not in RED_URL:
Log("***Base URL has been overridden and set based on redirection: %s ***" % RED_URL)
fmovies.BASE_URL = RED_URL
else:
fmovies.BASE_URL = Prefs["new_base_url"]
del common.CACHE_COOKIE[:]
fmovies.BASE_URL = Prefs["base_url"]
HTTP.Headers['Referer'] = fmovies.BASE_URL
common.BASE_URL = fmovies.BASE_URL

try:
common.CACHE_EXPIRY = 60 * int(Prefs["cache_expiry_time"])
Expand Down
18 changes: 10 additions & 8 deletions Contents/Code/common.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################
TITLE = "FMoviesPlus"
VERSION = '0.48' # Release notation (x.y - where x is major and y is minor)
VERSION = '0.49' # Release notation (x.y - where x is major and y is minor)
TAG = ''
GITHUB_REPOSITORY = 'coder-alpha/FMoviesPlus.bundle'
PREFIX = "/video/fmoviesplus"
Expand All @@ -21,6 +21,7 @@
Log('Error disabling IPv6 and setting IPv4 as default')
pass

BASE_URL = "https://bmovies.to"

JSEngines_ALLowed = ['Node']
Engine_OK = False
Expand Down Expand Up @@ -139,6 +140,7 @@
NO_MOVIE_INFO = False
USE_CUSTOM_TIMEOUT = False
SEARCH_EXT_SOURCES_FROM_SEARCH_MENU = True
CHECK_BASE_URL_REDIRECTION = False
DEV_DEBUG = False
WBH = 'aHR0cHM6Ly9ob29rLmlvL2NvZGVyLWFscGhhL3Rlc3Q='

Expand Down Expand Up @@ -705,7 +707,7 @@ def GetPageAsString(url, headers=None, timeout=15, referer=None):
else:
headers['Referer'] = url

if USE_COOKIES and 'fmovies' in url:
if USE_COOKIES and ('fmovies' in url or 'bmovies' in url):
cookies, error = make_cookie_str()
if error == '':
headers['Cookie'] = cookies
Expand Down Expand Up @@ -861,7 +863,7 @@ def cleanJSS2(str):
code = code.replace('){var','){var %s=%s; var' % (new_c,new_c2))
code = code.replace('returnreturn','return')
code = code[1:-1]
code = 'var R1,R2; var jssuckit="";var window = global; var document = this; location = "https://fmovies.to/"; %s; jssuckit = document.cookie; return jssuckit' % (code)
code = 'var R1,R2; var jssuckit="";var window = global; var document = this; location = "%s/"; %s; jssuckit = document.cookie; return jssuckit' % (BASE_URL, code)
elif len(occurances) == 1:
if '_=' in fncode1:
new_c = makeid(2,replaced.keys())
Expand All @@ -874,20 +876,20 @@ def cleanJSS2(str):
code = fn + fncode1 + fncode2 + fnvars
code = code.replace('){var','){var %s=%s; var' % (new_c,new_c2))
code = code[1:-1]
d = 'var R1,R2; var jssuckit="";var window = global; var document = this; location = "https://fmovies.to/"; %s; jssuckit = document.cookie; jssuckit=jssuckit.replace(R1,R2); return jssuckit' % (code)
d = 'var R1,R2; var jssuckit="";var window = global; var document = this; location = "%s/"; %s; jssuckit = document.cookie; jssuckit=jssuckit.replace(R1,R2); return jssuckit' % (BASE_URL, code)
code = d.replace('}; xy(',';R1=%s; R2=%s}; xy(')
code = code % (new_c2,new_c)
else:
new_c = makeid(3,replaced.keys())
replaced[new_c] = '_'
code = code.replace('_', new_c)
code = code[1:-1]
d = 'var jssuckit="";var window = global; var document = this; location = "https://fmovies.to/"; %s; jssuckit = document.cookie; return jssuckit'
code = (d % code)
d = 'var jssuckit="";var window = global; var document = this; location = "%s/"; %s; jssuckit = document.cookie; return jssuckit'
code = (d % (BASE_URL,code))
else:
code = code[1:-1]
d = 'var jssuckit="";var window = global; var document = this; location = "https://fmovies.to/"; %s; jssuckit = document.cookie; return jssuckit'
code = (d % code)
d = 'var jssuckit="";var window = global; var document = this; location = "%s/"; %s; jssuckit = document.cookie; return jssuckit'
code = (d % (BASE_URL,code))
code = code.replace('returnreturn','return')
code = code.encode('utf-8')
return code, replaced
Expand Down
Loading

0 comments on commit cf3132d

Please sign in to comment.