Skip to content
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

Jump to bottom

migrate to python3 #607

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

migrate to python3 #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7eb4ea0
first pass at python3
dlgoodr Sep 29, 2021
9e95978
fix another write
dlgoodr Sep 29, 2021
a6b42b5
fix accept_encoding processing
dlgoodr Sep 29, 2021
bb0b9bb
autopep8
dlgoodr Sep 29, 2021
2ffda9b
use dnslib
dlgoodr Sep 29, 2021
2d6493a
differentiate between bind IP and response IP
dlgoodr Sep 29, 2021
5c0fe32
more python3 fixes
dlgoodr Sep 30, 2021
d9dcd85
dnslib will clean up automatically
dlgoodr Sep 30, 2021
0545e09
getiterator removed in py3.9
dlgoodr Sep 30, 2021
9055763
fix std* redirects
dlgoodr Oct 6, 2021
788c113
require pillow for fanart
dlgoodr Oct 7, 2021
428f915
fix daemon for py3
dlgoodr Oct 7, 2021
f989a61
more py3
dlgoodr Oct 7, 2021
173423c
pep8 + additional debugprint
dlgoodr Oct 7, 2021
6ab8c0d
fix some of the GDM code
dlgoodr Oct 7, 2021
55a2246
fix querying for servers when logged in
dlgoodr Oct 16, 2021
e325925
fix a logic defect, tighten up some helpers
dlgoodr Oct 17, 2021
289994c
didn't mean to move to multiprocessing.dummy, remove debug print
dlgoodr Oct 17, 2021
a90c4a8
keep the XML debug output
dlgoodr Oct 17, 2021
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
14 changes: 2 additions & 12 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@

*.pyc

/ATVSettings.cfg

/Settings.cfg

PlexConnect.log

*.cer

*.key

*.pem

*.der

*.pyproj

*.sln

*.suo

/assets/fanartcache/*.jpg
.venv
.vscode
231 changes: 113 additions & 118 deletions ATVSettings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,84 +3,82 @@
import sys
from os import sep, makedirs
from os.path import isdir
import ConfigParser
import configparser
import fnmatch

from Debug import * # dprint()



options = { \
'playlistsview' :('List', 'Tabbed List', 'Hide'), \
'libraryview' :('List', 'Grid', 'Bookcase', 'Hide'), \
'sharedlibrariesview' :('List', 'Grid', 'Bookcase', 'Hide'), \
'channelview' :('Hide', 'List', 'Tabbed List', 'Grid', 'Bookcase'), \
'sharedchannelsview' :('Hide', 'List', 'Tabbed List', 'Grid', 'Bookcase'), \
'globalsearch' :('Show', 'Hide'), \
'movieview' :('Grid', 'List', 'Detailed List'), \
'homevideoview' :('Grid', 'List', 'Detailed List'), \
'actorview' :('Movies', 'Portrait'), \
'showview' :('List', 'Detailed List', 'Grid', 'Bookcase'), \
'flattenseason' :('False', 'True'), \
'seasonview' :('List', 'Coverflow'), \
'durationformat' :('Hours/Minutes', 'Minutes'), \
'postertitles' :('Highlighted Only', 'Show All'), \
'fanart' :('Hide', 'Show'), \
'fanart_blur' :('0', '5', '10', '15', '20'), \
'allowdeletion' :('No', 'Yes'), \
'moviepreplay_bottomshelf' :('Extras', 'Related Movies'), \
'movies_navbar_ondeck' :('checked', 'unchecked'), \
'movies_navbar_unwatched' :('checked', 'unchecked'), \
'movies_navbar_byfolder' :('checked', 'unchecked'), \
'movies_navbar_collections' :('checked', 'unchecked'), \
'movies_navbar_genres' :('checked', 'unchecked'), \
'movies_navbar_decades' :('checked', 'unchecked'), \
'movies_navbar_directors' :('checked', 'unchecked'), \
'movies_navbar_actors' :('checked', 'unchecked'), \
'movies_navbar_more' :('checked', 'unchecked'), \
'homevideos_navbar_ondeck' :('checked', 'unchecked'), \
'homevideos_navbar_unwatched' :('checked', 'unchecked'), \
'homevideos_navbar_byfolder' :('checked', 'unchecked'), \
'homevideos_navbar_collections' :('checked', 'unchecked'), \
'homevideos_navbar_genres' :('checked', 'unchecked'), \
'music_navbar_recentlyadded' :('checked', 'unchecked'), \
'music_navbar_genre' :('checked', 'unchecked'), \
'music_navbar_decade' :('checked', 'unchecked'), \
'music_navbar_year' :('checked', 'unchecked'), \
'music_navbar_more' :('checked', 'unchecked'), \
'tv_navbar_ondeck' :('checked', 'unchecked'), \
'tv_navbar_unwatched' :('checked', 'unchecked'), \
'tv_navbar_genres' :('checked', 'unchecked'), \
'tv_navbar_more' :('checked', 'unchecked'), \
'transcodequality' :('1080p 12.0Mbps', \
'1080p 20.0Mbps', \
'1080p 40.0Mbps', \
'480p 2.0Mbps', \
'720p 3.0Mbps', '720p 4.0Mbps', \
'1080p 8.0Mbps', '1080p 10.0Mbps'), \
'transcoderaction' :('Auto', 'DirectPlay', 'Transcode'), \
'remotebitrate' :('720p 3.0Mbps', '720p 4.0Mbps', \
'1080p 8.0Mbps', '1080p 10.0Mbps', '1080p 12.0Mbps', '1080p 20.0Mbps', '1080p 40.0Mbps', \
'480p 2.0Mbps'), \
'dolbydigital' :('Off', 'On'), \
'phototranscoderaction' :('Auto', 'Transcode'), \
'subtitlerenderer' :('Auto', 'iOS, PMS', 'PMS'), \
'subtitlesize' :('100', '125', '150', '50', '75'), \
'audioboost' :('100', '175', '225', '300'), \
'showunwatched' :('True', 'False'), \
'showsynopsis' :('Hide', 'Show'), \
'showplayerclock' :('True', 'False'), \
'overscanadjust' :('0', '1', '2', '3', '-3', '-2', '-1'), \
'clockposition' :('Center', 'Right', 'Left'), \
'showendtime' :('True', 'False'), \
'timeformat' :('24 Hour', '12 Hour'), \
'myplex_user' :('', ), \
'myplex_auth' :('', ), \
'plexhome_enable' :('False', 'True'), \
'plexhome_user' :('', ), \
'plexhome_auth' :('', ), \
}

options = {
'playlistsview': ('List', 'Tabbed List', 'Hide'),
'libraryview': ('List', 'Grid', 'Bookcase', 'Hide'),
'sharedlibrariesview': ('List', 'Grid', 'Bookcase', 'Hide'),
'channelview': ('Hide', 'List', 'Tabbed List', 'Grid', 'Bookcase'),
'sharedchannelsview': ('Hide', 'List', 'Tabbed List', 'Grid', 'Bookcase'),
'globalsearch': ('Show', 'Hide'),
'movieview': ('Grid', 'List', 'Detailed List'),
'homevideoview': ('Grid', 'List', 'Detailed List'),
'actorview': ('Movies', 'Portrait'),
'showview': ('List', 'Detailed List', 'Grid', 'Bookcase'),
'flattenseason': ('False', 'True'),
'seasonview': ('List', 'Coverflow'),
'durationformat': ('Hours/Minutes', 'Minutes'),
'postertitles': ('Highlighted Only', 'Show All'),
'fanart': ('Hide', 'Show'),
'fanart_blur': ('0', '5', '10', '15', '20'),
'allowdeletion': ('No', 'Yes'),
'moviepreplay_bottomshelf': ('Extras', 'Related Movies'),
'movies_navbar_ondeck': ('checked', 'unchecked'),
'movies_navbar_unwatched': ('checked', 'unchecked'),
'movies_navbar_byfolder': ('checked', 'unchecked'),
'movies_navbar_collections': ('checked', 'unchecked'),
'movies_navbar_genres': ('checked', 'unchecked'),
'movies_navbar_decades': ('checked', 'unchecked'),
'movies_navbar_directors': ('checked', 'unchecked'),
'movies_navbar_actors': ('checked', 'unchecked'),
'movies_navbar_more': ('checked', 'unchecked'),
'homevideos_navbar_ondeck': ('checked', 'unchecked'),
'homevideos_navbar_unwatched': ('checked', 'unchecked'),
'homevideos_navbar_byfolder': ('checked', 'unchecked'),
'homevideos_navbar_collections': ('checked', 'unchecked'),
'homevideos_navbar_genres': ('checked', 'unchecked'),
'music_navbar_recentlyadded': ('checked', 'unchecked'),
'music_navbar_genre': ('checked', 'unchecked'),
'music_navbar_decade': ('checked', 'unchecked'),
'music_navbar_year': ('checked', 'unchecked'),
'music_navbar_more': ('checked', 'unchecked'),
'tv_navbar_ondeck': ('checked', 'unchecked'),
'tv_navbar_unwatched': ('checked', 'unchecked'),
'tv_navbar_genres': ('checked', 'unchecked'),
'tv_navbar_more': ('checked', 'unchecked'),
'transcodequality': ('1080p 12.0Mbps',
'1080p 20.0Mbps',
'1080p 40.0Mbps',
'480p 2.0Mbps',
'720p 3.0Mbps', '720p 4.0Mbps',
'1080p 8.0Mbps', '1080p 10.0Mbps'),
'transcoderaction': ('Auto', 'DirectPlay', 'Transcode'),
'remotebitrate': ('720p 3.0Mbps', '720p 4.0Mbps',
'1080p 8.0Mbps', '1080p 10.0Mbps', '1080p 12.0Mbps', '1080p 20.0Mbps', '1080p 40.0Mbps',
'480p 2.0Mbps'),
'dolbydigital': ('Off', 'On'),
'phototranscoderaction': ('Auto', 'Transcode'),
'subtitlerenderer': ('Auto', 'iOS, PMS', 'PMS'),
'subtitlesize': ('100', '125', '150', '50', '75'),
'audioboost': ('100', '175', '225', '300'),
'showunwatched': ('True', 'False'),
'showsynopsis': ('Hide', 'Show'),
'showplayerclock': ('True', 'False'),
'overscanadjust': ('0', '1', '2', '3', '-3', '-2', '-1'),
'clockposition': ('Center', 'Right', 'Left'),
'showendtime': ('True', 'False'),
'timeformat': ('24 Hour', '12 Hour'),
'myplex_user': ('', ),
'myplex_auth': ('', ),
'plexhome_enable': ('False', 'True'),
'plexhome_user': ('', ),
'plexhome_auth': ('', ),
}


class CATVSettings():
Expand All @@ -89,27 +87,25 @@ def __init__(self, path):
self.cfg = None
self.path = path
self.loadSettings()




# load/save config

def loadSettings(self):
dprint(__name__, 1, "load settings")
# options -> default
dflt = {}
for opt in options:
dflt[opt] = options[opt][0]

# load settings
self.cfg = ConfigParser.SafeConfigParser(dflt)
self.cfg = configparser.ConfigParser(dflt)
self.cfg.read(self.getSettingsFile())

def saveSettings(self):
dprint(__name__, 1, "save settings")
f = open(self.getSettingsFile(), 'wb')
self.cfg.write(f)
f.close()

with open(self.getSettingsFile(), 'w') as f:
self.cfg.write(f)

def getSettingsFile(self):
if self.path.startswith('.'):
# relative to current path
Expand All @@ -120,90 +116,89 @@ def getSettingsFile(self):
if not isdir(directory):
makedirs(directory)
return directory + sep + "ATVSettings.cfg"

def checkSection(self, UDID):
# check for existing UDID section
sections = self.cfg.sections()
if not UDID in sections:
self.cfg.add_section(UDID)
dprint(__name__, 0, "add section {0}", UDID)




# access/modify AppleTV options

def getSetting(self, UDID, option):
self.checkSection(UDID)
dprint(__name__, 1, "getsetting {0}", self.cfg.get(UDID, option))
return self.cfg.get(UDID, option)

def setSetting(self, UDID, option, val):
self.checkSection(UDID)
self.cfg.set(UDID, option, val)

def checkSetting(self, UDID, option):
self.checkSection(UDID)
val = self.cfg.get(UDID, option)
opts = options[option]

# check val in list
found = False
for opt in opts:
if fnmatch.fnmatch(val, opt):
found = True

# if not found, correct to default
if not found:
self.cfg.set(UDID, option, opts[0])
dprint(__name__, 1, "checksetting: default {0} to {1}", option, opts[0])

dprint(__name__, 1,
"checksetting: default {0} to {1}", option, opts[0])

def toggleSetting(self, UDID, option):
self.checkSection(UDID)
cur = self.cfg.get(UDID, option)
opts = options[option]

# find current in list
i=0
for i,opt in enumerate(opts):
if opt==cur:
i = 0
for i, opt in enumerate(opts):
if opt == cur:
break

# get next option (circle to first)
i=i+1
if i>=len(opts):
i=0
i = i+1
if i >= len(opts):
i = 0

# set
self.cfg.set(UDID, option, opts[i])

def setOptions(self, option, opts):
global options
if option in options:
options[option] = opts
dprint(__name__, 1, 'setOption: update {0} to {1}', option, opts)



if __name__=="__main__":
if __name__ == "__main__":
ATVSettings = CATVSettings()

UDID = '007'
ATVSettings.checkSection(UDID)

option = 'transcodequality'
print ATVSettings.getSetting(UDID, option)
print "setSetting"
print(ATVSettings.getSetting(UDID, option))

print("setSetting")
ATVSettings.setSetting(UDID, option, 'True') # error - pick default
print ATVSettings.getSetting(UDID, option)
print(ATVSettings.getSetting(UDID, option))
ATVSettings.setSetting(UDID, option, '9')
print ATVSettings.getSetting(UDID, option)
print "toggleSetting"
print(ATVSettings.getSetting(UDID, option))

print("toggleSetting")
ATVSettings.toggleSetting(UDID, option)
print ATVSettings.getSetting(UDID, option)
print(ATVSettings.getSetting(UDID, option))
ATVSettings.toggleSetting(UDID, option)
print ATVSettings.getSetting(UDID, option)
print(ATVSettings.getSetting(UDID, option))
ATVSettings.toggleSetting(UDID, option)
print ATVSettings.getSetting(UDID, option)
print(ATVSettings.getSetting(UDID, option))

del ATVSettings
Loading