Skip to content

Commit

Permalink
Merge pull request #164 from dagalufh/tommy-work
Browse files Browse the repository at this point in the history
V2.2
  • Loading branch information
ukdtom committed Apr 25, 2016
2 parents cab8008 + 6b5f9d0 commit b227604
Show file tree
Hide file tree
Showing 40 changed files with 3,473 additions and 601 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,8 @@ Icon
# gedit tmp files
#*****************
*~

*.pyc
debug


Binary file removed Contents/Code/Docs/FindUnmatched-README_DEVS.odt
Binary file not shown.
Binary file added Contents/Code/Docs/WorkInProgress.odt
Binary file not shown.
Binary file modified Contents/Code/Docs/webtools-README_DEVS.odt
Binary file not shown.
25 changes: 19 additions & 6 deletions Contents/Code/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@

NAME = 'WebTools'
ICON = 'WebTools.png'
VERSION = '2.1'
VERSION = '2.2'
AUTHTOKEN = ''
SECRETKEY = ''
DEBUGMODE = False


#********** Imports needed *********
Expand All @@ -33,19 +34,25 @@
#********** Initialize *********
def Start():
global SECRETKEY
PLUGIN_VERSION = VERSION
print("******** Started %s on %s **********" %(NAME + ' V' + PLUGIN_VERSION, Platform.OS))
Log.Debug("******* Started %s on %s ***********" %(NAME + ' V' + PLUGIN_VERSION, Platform.OS))
global VERSION
global DEBUGMODE
# Switch to debug mode if needed
debugFile = Core.storage.join_path(Core.app_support_path, Core.config.bundles_dir_name, NAME + '.bundle', 'debug')
DEBUGMODE = os.path.isfile(debugFile)
if DEBUGMODE:
VERSION = VERSION + ' ****** WARNING Debug mode on *********'
print("******** Started %s on %s **********" %(NAME + ' V' + VERSION, Platform.OS))
Log.Debug("******* Started %s on %s ***********" %(NAME + ' V' + VERSION, Platform.OS))
HTTP.CacheTime = 0
DirectoryObject.thumb = R(ICON)
ObjectContainer.title1 = NAME + ' V' + PLUGIN_VERSION
ObjectContainer.title1 = NAME + ' V' + VERSION
Plugin.AddViewGroup('List', viewMode='List', mediaType='items')
ObjectContainer.view_group = 'List'
makeSettings()

# Get the secret key used to access the PMS framework ********** FUTURE USE ***************
SECRETKEY = genSecretKeyAsStr()
startWeb(SECRETKEY)
startWeb(SECRETKEY, VERSION, DEBUGMODE)

####################################################################################################
# Generate secret key
Expand Down Expand Up @@ -89,6 +96,12 @@ def makeSettings():
# Create the pwdset entry
if Dict['pwdset'] == None:
Dict['pwdset'] = False
# Init the installed dict
if Dict['installed'] == None:
Dict['installed'] = {}
# Init the allBundle Dict
if Dict['PMS-AllBundleInfo'] == None:
Dict['PMS-AllBundleInfo'] = {}
return

####################################################################################################
Expand Down
Loading

0 comments on commit b227604

Please sign in to comment.