Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jakewaldron
jakewaldron committed Feb 26, 2016
2 parents d8dc65f + 73b59e1 commit 1c45e7d
Show file tree
Hide file tree
Showing 3 changed files with 612 additions and 11 deletions.
29 changes: 29 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<span class="badge-paypal"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=FNHMYELJM8Q4U&lc=US&item_name=Plex%20Email&currency_code=USD&bn=PP-DonationsBF%3Abtn_donate_LG.gif%3ANonHosted" title="Donate to this project using Paypal"><img src="https://img.shields.io/badge/Donate-Paypal-F9AA03.svg" alt="PayPal donate button" /></a></span>

Plex Email
==========

Expand All @@ -7,6 +9,7 @@ This script aggregates all new TV and movie releases for the past x days and wri
## Supported Environments
* Windows - Tested
* Linux - Tested
* FreeBSD/FreeNAS - Tested
* Mac - Tested

## Supported Email Protocols
Expand Down Expand Up @@ -141,10 +144,18 @@ The config file is in the scripts folder. Before first run of the script, pleas
* filter_show_episodes - True to show recently added TV episodes
* filter_episodes_include - List of episodes to include (Anything that does not match perfectly will not be included)
* filter_episodes_excluse - List of episodes to exclude (Only titles that match perfectly will be excluded)
* filter_show_artists - True to show recently added TV artists
* filter_artists_include - List of artists to include (Anything that does not match perfectly will not be included)
* filter_artists_excluse - List of artists to exclude (Only titles that match perfectly will be excluded)
* filter_show_albums - True to show recently added albums
* filter_albums_include - List of albums to include (Anything that does not match perfectly will not be included)
* filter_albums_excluse - List of albums to exclude (Only titles that match perfectly will be excluded)
* filter_show_email_images - True to show images in the email
* filter_episode_thumbnail_type - Type of image to show for new TV Episodes - "episode", "season" or "show" (Defaults to episode)
* filter_libraries - A list of library names to filter out - ['Home Videos', 'Private']
* filter_sections_movies - Movie specific filters
* filter_sections_TV - TV specific filters
* filter_sections_Music - Music specific filters
* Possible fields: tagline, summary, content_rating, duration, year, rating, studio, tags_genre, tags_director, tags_star
* order - The order this field should appear for each title
* show - Whether or not this field should be shown for each title
Expand All @@ -167,10 +178,14 @@ The config file is in the scripts folder. Before first run of the script, pleas
* msg_shows_link - Header link text to go to new shows
* msg_seasons_link - Header link text to go to new seasons
* msg_episodes_link - Header link text to go to new episodes
* msg_artists_link - Header link text to go to new artists
* msg_albums_link - Header link text to go to new albums
* msg_new_movies_header - Section header text for new movies
* msg_new_shows_header - Section header text for new shows
* msg_new_seasons_header - Section header text for new seasons
* msg_new_episodes_header - Section header text for new episodes
* msg_new_artists_header - Section header text for new artists
* msg_new_albums_header - Section header text for new albums
* msg_footer - Footer text at the bottom of the page
* msg_no_new_content - Message to be displayed if no new content has been added

Expand All @@ -196,6 +211,20 @@ The config file is in the scripts folder. Before first run of the script, pleas
* season_sort_3 - Third Priority sort
* season_sort_3_reverse - Reverse the default sort

* artist_sort_1 - Highest priority sort
* artist_sort_1_reverse - Reverse the default sort
* artist_sort_2 - Second priority sort
* artist_sort_2_reverse - Reverse the default sort
* artist_sort_3 - Third Priority sort
* artist_sort_3_reverse - Reverse the default sort

* album_sort_1 - Highest priority sort
* album_sort_1_reverse - Reverse the default sort
* album_sort_2 - Second priority sort
* album_sort_2_reverse - Reverse the default sort
* album_sort_3 - Third Priority sort
* album_sort_3_reverse - Reverse the default sort

* episode_sort_1 - Highest priority sort
* episode_sort_1_reverse - Reverse the default sort
* episode_sort_2 - Second priority sort
Expand Down
150 changes: 149 additions & 1 deletion scripts/config.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,20 @@ filter_seasons_exclude = []
filter_show_episodes = True
filter_episodes_include = []
filter_episodes_exclude = []
filter_show_artists = True
filter_artists_include = []
filter_artists_exclude = []
filter_show_albums = True
filter_albums_include = []
filter_albums_exclude = []
filter_show_songs = False
filter_songs_include = []
filter_songs_exclude = []
filter_show_email_images = True
#Type of image to show for new TV Episodes - "episode", "season" or "show" (Defaults to episode)
filter_episode_thumbnail_type = 'episode'
filter_episode_thumbnail_type = 'show'
#Type of image to show for new songs - "album" or "artist" (Defaults to album)
filter_song_thumbnail_type = 'album'
#Name of libraries to filter out - ['Home Videos', 'Private']
filter_libraries = []
#The sections to include and ordering - tagline, summary, content_rating, duration, year, rating, studio, tags_genre, tags_director, tags_star
Expand Down Expand Up @@ -257,6 +268,107 @@ filter_sections_TV = {
}
}

filter_sections_Music = {
'tagline':{
'order':1,
'show': False,
'preText':'<i>',
'postText':'</i>',
'include':[],
'exclude':[]
},
'summary':{
'order':2,
'show': True,
'preText':'',
'postText':'',
'include':[],
'exclude':[]
},
'tags_genre':{
'order':3,
'show': True,
'preText':'Genre(s): ',
'postText':'',
'include':[],
'exclude':[]
},
'tags_director':{
'order':4,
'show': False,
'preText':'Director: ',
'postText':'',
'include':[],
'exclude':[]
},
'tags_star':{
'order':5,
'show': False,
'preText':'Star(s): ',
'postText':'',
'include':[],
'exclude':[]
},
'content_rating':{
'order':6,
'show': False,
'preText':'Content Rating: ',
'postText':'',
'include':[],
'exclude':[]
},
'duration':{
'order':7,
'show': False,
'preText':'Runtime: ',
'postText':' minutes',
'include':[],
'exclude':[]
},
'year':{
'order':8,
'show': False,
'preText':'Year: ',
'postText':'',
'include':[],
'exclude':[]
},
'studio':{
'order':9,
'show': False,
'preText':'Network: ',
'postText':'',
'include':[],
'exclude':[]
},
'rating':{
'order':10,
'show': False,
'preText':'Rating: ',
'postText':'%',
'include':[],
'exclude':[]
},
'air_date':{
'order':11,
'show': True,
'preText':'Release Date: ',
'postText':'',
'include':[],
'exclude':[],
'format': '%B %d, %Y'
},
'track_list':{
'order':12,
'show': True,
'headerText':{
'trackNumber':'Track#',
'songName':'Song Name',
'artistName':'Artist(s)',
'duration':'Duration'
}
}

##Messages
msg_notice = ''
msg_email_teaser = 'Check out this week\'s releases from Plex: {website} - {past_day} - {current_day}'
Expand All @@ -270,10 +382,16 @@ msg_movies_link = 'Movies'
msg_shows_link = 'TV Shows'
msg_seasons_link = 'TV Seasons'
msg_episodes_link = 'TV Episodes'
msg_artists_link = 'Artists'
msg_albums_link = 'Albums'
msg_songs_link = 'Songs'
msg_new_movies_header = 'New Movies'
msg_new_shows_header = 'New TV Shows'
msg_new_seasons_header = 'New TV Seasons'
msg_new_episodes_header = 'New TV Episodes'
msg_new_artists_header = 'New Artists'
msg_new_albums_header = 'New Albums'
msg_new_songs_header = 'New Songs'
msg_footer = ''
msg_no_new_content = 'There have been no new additions to Plex from {past_day} through {current_day}.'

Expand Down Expand Up @@ -317,3 +435,33 @@ episode_sort_2 = 'season_index'
episode_sort_2_reverse = False
episode_sort_3 = 'index'
episode_sort_3_reverse = False

# Possible values = id, title, title_sort, original_title, rating, tagline,
# summary, content_rating, duration, tags_genre, tags_director, tags_star, year,
# hash, index, studio
artist_sort_1 = 'title_sort'
artist_sort_1_reverse = False
artist_sort_2 = ''
artist_sort_2_reverse = False
artist_sort_3 = ''
artist_sort_3_reverse = False

# Possible values = id, title, title_sort, original_title, rating, tagline,
# summary, content_rating, duration, tags_genre, tags_director, tags_star, year,
# hash, index, studio
album_sort_1 = 'title_sort'
album_sort_1_reverse = False
album_sort_2 = ''
album_sort_2_reverse = False
album_sort_3 = ''
album_sort_3_reverse = False

# Possible values = id, title, title_sort, original_title, rating, tagline,
# summary, content_rating, duration, tags_genre, tags_director, tags_star, year,
# hash, index, studio, season_index, show_title, show_title_sort, show_original_title
song_sort_1 = 'show_title_sort'
song_sort_1_reverse = False
song_sort_2 = ''
song_sort_2_reverse = False
song_sort_3 = ''
song_sort_3_reverse = False
Loading

0 comments on commit 1c45e7d

Please sign in to comment.