angelblue05
81dcd36dc3
Revert throttle
...
Will have to test further with timeout scenario, before reimplementing
2016-01-19 04:28:52 -06:00
Shaun
bfb893ad8e
use standard progress dialog for progress
...
and add cancel
2016-01-19 18:59:05 +11:00
angelblue05
d14ecfdc5e
Adjust playlist props
...
Instead of using clearProperties, clear individually.
2016-01-18 21:54:02 -06:00
angelblue05
f3f8c76197
Fix progress dialog
2016-01-18 19:54:20 -06:00
angelblue05
60f68610f4
Close the kodi cursor earlier
...
In case music doesn't complete correctly.
2016-01-18 17:47:16 -06:00
marcelveldt
6f72dfffe9
one more fix for the musictags
2016-01-18 21:16:11 +01:00
marcelveldt
11cf78de36
fix unicode error in urlencode
2016-01-18 20:56:10 +01:00
marcelveldt
2661c54938
fix entrypoints
2016-01-18 20:48:44 +01:00
marcelveldt
58533e1c44
fix videonodes and playlists
2016-01-18 20:17:14 +01:00
marcelveldt
3421bf88e1
add support for embedded covertart in music files
...
fix typo in music tags code
2016-01-18 19:38:53 +01:00
marcelveldt
eab0b7d3d9
remove widgetreload. Is entirely handled by skinhelper now.
...
leaving it in means doubled widget refreshes = slower
2016-01-18 17:12:57 +01:00
marcelveldt
5640408523
fix crash on sync when song rating is null in db (if user didn't reset the db)
...
resync is advised however to make sure the rating gets scraped initially
2016-01-18 16:31:07 +01:00
marcelveldt
72d279a3a9
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2016-01-18 12:05:16 +01:00
marcelveldt
eae4fea76a
more unicode fixes: os.path functions use unicode depending on the OS
2016-01-18 12:05:05 +01:00
angelblue05
08581dbc18
Add progress dialog for gathering
...
It's not very precise since we gather in batch, but better than nothing.
2016-01-18 03:24:00 -06:00
marcelveldt
2bd1d139c1
unicode fixes
...
fix for users who have redirected kodi data folders (replace open with xbmcvfs.file)
2016-01-18 10:00:32 +01:00
marcelveldt
ca0906aaaf
remove redundant logging
2016-01-18 09:47:22 +01:00
marcelveldt
b0120aefd5
fix: return emby nodes in skinshortcuts dialog
2016-01-18 09:45:39 +01:00
angelblue05
ee414472e0
Correct encoding
...
Everything xbmc returns is already in utf-8
2016-01-16 18:28:30 -06:00
angelblue05
2e5c0aa8f2
Fix music crash
2016-01-16 16:31:42 -06:00
Shaun
30a9074f71
fix percentages on thread clean up updates
2016-01-16 17:55:04 +11:00
Shaun
9e2f789e53
add a thread pool option to the image cache
2016-01-16 14:08:01 +11:00
marcelveldt
82f117222a
fix exception in getSongTags when rating is none
2016-01-15 15:31:55 +01:00
angelblue05
d7d5e8b6e1
Force transcode 720/h265
2016-01-15 03:56:53 -06:00
angelblue05
fa826c2791
Fix websocket not restarting
...
Didn't realise the method and class variable had the same name.
2016-01-15 01:26:54 -06:00
angelblue05
5112500f4d
Fix missing mediasources
...
Also add a throttle to avoid crash if server connection times out.
2016-01-14 03:49:03 -06:00
angelblue05
5c9e571936
Remove boxset forced sync. Manual sync is available for that purpose.
2016-01-13 15:47:31 -06:00
marcelveldt
0bc17ec277
small fix for photo support
2016-01-13 13:24:26 +01:00
angelblue05
10606f733d
Fix crash during initial sync for songs
2016-01-12 23:09:55 -06:00
angelblue05
993ef282e7
Fix reset
...
Fixes if there's a crash, unable to reset
2016-01-12 22:52:49 -06:00
angelblue05
b9ba092e12
H265 rectification
2016-01-12 19:38:18 -06:00
marcelveldt
8e2cae3b13
fix small typos
...
add delete option to context menu
2016-01-13 01:26:07 +01:00
marcelveldt
b24e881f18
finished homevideos and photos
2016-01-13 01:03:35 +01:00
marcelveldt
ee9f08080e
work in progress - move home videos to plugin listing
2016-01-11 22:20:34 +01:00
marcelveldt
b7f0f869eb
fix null pointer
2016-01-11 19:26:38 +01:00
marcelveldt
0817085ada
Add contextmenu for emby settings (used to update ratings)
...
Add ratings sync for music files (get rating details from music files and sync back to emby)
2016-01-11 16:53:41 +01:00
angelblue05
2e4e983acd
hevc transcode - direct stream skip
2016-01-09 21:30:24 -06:00
angelblue05
86caf21af4
HEVC transcode
...
Still waiting on user feedback on this one.
2016-01-09 21:25:17 -06:00
angelblue05
b465fe5c08
Revert "Add HEVC transcode setting"
...
This reverts commit 86f4039b89
2016-01-09 21:11:11 -06:00
angelblue05
86f4039b89
Add HEVC transcode setting
2016-01-09 19:41:00 -06:00
angelblue05
950ae74939
Undo useless changes to music
...
The problem was in Items class, not the Music class.
2016-01-09 05:13:17 -06:00
angelblue05
f99efb2a83
Add settings monitor
...
Prompt for reset if playback mode change is detected
2016-01-09 04:53:04 -06:00
angelblue05
b61b8ae894
Failsafe incase view is named after existing tag
...
After the initial sync already completed.
2016-01-09 03:03:39 -06:00
angelblue05
77dd006f21
1.1.72 - Fix typo
2016-01-08 20:13:52 -06:00
angelblue05
222f6e06cb
Open music cursor for albumartist
2016-01-08 12:56:21 -06:00
angelblue05
b11e9c2902
Fix grouped view
2016-01-08 12:25:22 -06:00
marcelveldt
fc810f7b32
fix extrafanart issues
2016-01-06 23:22:10 +01:00
shaun
5ce7e3407d
fix video node window path
2016-01-06 20:08:16 +11:00
marcelveldt
6adc422936
fix next episodes emby node
2016-01-06 08:59:41 +01:00
marcelveldt
9468adfbe3
fix smart shortcuts compatability
2016-01-06 08:51:46 +01:00
angelblue05
ade63ae22f
Fix typo and remove default value for network creds
2016-01-04 23:06:47 -06:00
angelblue05
2c7a0c0b65
Define the music cursor
...
Make sure we use the proper cursor for music when using the incremental
sync. Fix for artist table not found database error.
2016-01-04 21:58:45 -06:00
angelblue05
22f71efaf5
Fix view order bug
...
Make sure we get the default grouped view and not a view, when we are
looking at grouped folders.
2016-01-04 21:48:30 -06:00
angelblue05
84532ce3f8
Remove "!" from prompts
2016-01-01 23:38:26 -06:00
angelblue05
77de12bec8
Fix albums with same name
2016-01-01 23:24:28 -06:00
angelblue05
227bb3eb42
Add fix for missing key
2015-12-31 22:19:36 -06:00
angelblue05
7a19f010dc
Correct reversed settings
2015-12-31 17:16:16 -06:00
angelblue05
8b2bd3e30b
Forgot to add filters
...
For collections and trailers
2015-12-30 21:39:10 -06:00
angelblue05
39ac41647e
Fix AirsAfterSeason
2015-12-30 03:21:49 -06:00
angelblue05
08354b693e
Fix specials ordering
2015-12-29 19:32:41 -06:00
angelblue05
50c71c70d4
Fix update music
2015-12-29 17:46:42 -06:00
angelblue05
18c493909d
Fix encoding for nodes
2015-12-28 17:58:01 -06:00
angelblue05
445469302f
Fix delete
...
Remove verification - option is only for deletion after playback.
2015-12-28 03:54:46 -06:00
angelblue05
e4fb2de7c2
Prevent deleting artwork during initial sync
2015-12-27 22:51:47 -06:00
angelblue05
a7131c2867
Correct typo
2015-12-27 22:47:49 -06:00
angelblue05
601f578892
Fix dialog
2015-12-27 17:06:50 -06:00
angelblue05
e475d3366d
Fix transcode h265
2015-12-27 17:04:40 -06:00
angelblue05
a116db491c
Add limit to request from server
2015-12-27 01:05:51 -06:00
angelblue05
493459de33
Fix artwork cache
...
Still looking into the delay with extra fanart scenario
2015-12-26 20:07:13 -06:00
angelblue05
f472f44a40
Fix missing import
2015-12-26 17:50:38 -06:00
angelblue05
0b6b5861c7
Fix missing pdialog
2015-12-26 16:23:29 -06:00
angelblue05
c125414991
Correct path for deviceid
2015-12-26 12:39:54 -06:00
angelblue05
8d219b64b3
Revert "Correct path for deviceid"
...
This reverts commit 67c4c33a5b
2015-12-26 12:29:38 -06:00
angelblue05
67c4c33a5b
Correct path for deviceid
2015-12-26 12:19:42 -06:00
angelblue05
a5e9fb1698
Add force refresh playlist
...
To correct missing tag bug.
2015-12-26 03:42:13 -06:00
angelblue05
7b3aae2d83
Fix fanart
2015-12-26 03:09:47 -06:00
angelblue05
7b2d67a8bf
Fix typo
2015-12-26 01:50:32 -06:00
angelblue05
47976c81be
Fix typo
2015-12-26 01:22:25 -06:00
angelblue05
8f8cdbaa88
Fix typo
2015-12-25 21:56:15 -06:00
angelblue05
0e78089aad
Fix people
...
Scenario where actor doesn't have a role defined in the metadata.
2015-12-25 21:41:28 -06:00
angelblue05
9959806f5b
Fix boxset
2015-12-25 21:36:46 -06:00
angelblue05
a7a82f4ebb
Fix AR
2015-12-24 18:02:31 -06:00
angelblue05
17913241a1
Fix trailer
2015-12-24 16:45:18 -06:00
angelblue05
0e15daa37a
Fix user image
2015-12-24 16:16:58 -06:00
angelblue05
163881e79f
Fix typo
2015-12-24 15:16:47 -06:00
angelblue05
3007f8fdac
Fix typo
2015-12-24 15:07:06 -06:00
angelblue05
69884a1b54
Readd with lowercase name
2015-12-24 14:07:00 -06:00
angelblue05
9855ac4c94
Remove to readd
2015-12-24 14:06:31 -06:00
angelblue05
08f9add813
Revert "Replace"
...
This reverts commit f28c9fe069
2015-12-24 13:56:11 -06:00
angelblue05
f28c9fe069
Replace
...
Seems I have to rename the filename to lowercase manually.
2015-12-24 13:54:34 -06:00
angelblue05
3f6fe0a9e7
Version 1.1.63
...
alpha ready for beta testing
2015-12-24 13:51:47 -06:00
angelblue05
0200df3225
Fix key error
2015-12-05 19:43:41 -06:00
marcelveldt
7b9a601735
fix issue with nextepisodes node tag filter
2015-12-04 11:10:11 +01:00
angelblue05
9f7f81fd55
Correct typo
2015-12-02 16:55:20 -06:00
angelblue05
3384124f9c
Adjust delete cached artwork
...
If fails, move on instead.
2015-12-02 16:51:30 -06:00
angelblue05
73d3974e39
Convert Force transcode to an option
...
Only for 1080p/H265
2015-12-02 16:47:07 -06:00
angelblue05
d07816d7fb
Correct typo
2015-12-02 05:00:00 -06:00
angelblue05
d57f8ddde3
Force transcode 1080p/h265
2015-12-02 04:58:20 -06:00
angelblue05
988d62c9ac
Fix cursor staying open after marking as watched
2015-12-01 00:53:59 -06:00
angelblue05
4e2cd67946
Fix for connection
...
In case status is good, but server is unreachable.
2015-11-25 17:20:06 -06:00
Shaun
fc8c41ccf3
remove some save last sync calls
2015-11-24 15:20:12 +11:00
marcelveldt
3e1efdf824
add recommended and random nodes
2015-11-23 18:45:42 +01:00
Shaun
3c9aa10587
add messaging to sync thread exit
2015-11-20 13:52:06 +11:00
angelblue05
faa376a520
Version bump 1.1.60
...
Stable release
2015-11-12 16:32:02 -06:00
angelblue05
66a9a85fc4
Direct path setup
...
Add a caution note.
2015-11-09 21:01:31 -06:00
angelblue05
7dbc1339bb
Fix directors
2015-11-09 19:59:45 -06:00
angelblue05
4da967a65c
fix sources.xml
...
argument not available on older python versions
2015-11-08 08:31:49 -06:00
angelblue05
3431b5d28d
Use fallback artists
...
If album artists is missing
2015-11-08 05:42:53 -06:00
angelblue05
6156557b7d
Follow kodi track# convention
...
disc#*2**16 + track#
2015-11-08 00:20:40 -06:00
angelblue05
9f4584d83f
Fix albumartist
2015-11-06 22:40:08 -06:00
angelblue05
d03d24d078
Making sync process more robust
...
Central commit, central force update kodi library. This is to make sure
we don't have a kodi videoscan running at the same time as our syncing
process, in order to prevent the dreaded "database is locked" error.
2015-11-05 21:11:42 -06:00
angelblue05
5a39208aa3
Correcting sources
...
With elementetree instead
2015-11-03 07:22:03 -06:00
im85288
c10cee3cb3
jarvis music db bump
2015-11-03 11:07:31 +00:00
angelblue05
158008415f
Prevent invalid paths
...
Strm file scenario
2015-11-03 02:27:59 -06:00
angelblue05
6ba664037e
Adjust new ask to play trailer setting
...
Ask only if there should be trailers to be played.
2015-10-26 08:49:13 -05:00
marcelveldt
a5562e896b
fix crash on playback when music sync is not enabled
2015-10-25 02:13:13 +02:00
marcelveldt
4c43139765
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2015-10-24 10:53:59 +02:00
angelblue05
d5c1bec4c6
Add music video artist link
2015-10-23 20:00:34 -05:00
marcelveldt
6950505341
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2015-10-23 21:06:55 +02:00
marcelveldt
138a495906
close handle to file
2015-10-23 21:06:35 +02:00
angelblue05
dbf6a350c7
Fix direct path
...
By the time the initial setup went thru, the class was already loaded.
Instead, load the settings in the instance.
2015-10-23 02:21:12 -05:00
angelblue05
bcee7dde76
First try at fixing singles issue for music
2015-10-23 01:45:52 -05:00
angelblue05
1893e79014
Add option to ask to play trailers
2015-10-22 23:09:01 -05:00
angelblue05
22b62133eb
Kodi database scan
...
Prevent writing to database when the kodi database scan is running.
2015-10-22 21:55:32 -05:00
angelblue05
540745e24a
Fix kodi exception
...
For music report playback, verify that the type we are about to process
is actually a song, otherwise we get a lot of exceptions that file is
not playing.
2015-10-22 19:46:29 -05:00
angelblue05
56ef721836
Fix artwork for albums
...
Boxrear is poster, primary is thumb instead of primary being thumb and
poster and boxrear is poster.
2015-10-22 17:49:38 -05:00
angelblue05
d0bf205331
Database warning
...
Warn the user visually of the database not found error.
2015-10-21 22:44:40 -05:00
angelblue05
6a9eddd413
Fix unicode error
...
Since we are not using self.logMsg, this is needed incase the path
contains unicode characters (window username)
2015-10-21 16:30:52 -05:00
angelblue05
ca2b2745db
Take into account coverart settings
...
To disable coverart
2015-10-21 02:40:02 -05:00
angelblue05
54f39fa58e
Support report playback for music
2015-10-20 04:18:13 -05:00
angelblue05
a0347ce03d
Fix error for playback report
...
Take into account TypeError (nonetype), depending on the player used, it
might not return a result.
2015-10-19 00:40:19 -05:00
angelblue05
6849c22414
Support emby tags for music videos
2015-10-18 21:15:49 -05:00
angelblue05
069379ae59
Studios modification
...
Kodi only takes in one studio to display the studio logo. All of the
studios are still process, but only the first one will be added in the
movie table.
2015-10-18 20:54:57 -05:00
im85288
5a481e7779
jarvis music db bump
2015-10-18 14:17:13 +01:00
angelblue05
a841b68ee0
Ignore channels
...
Now that they are being integrated in views
2015-10-17 18:22:41 -05:00
angelblue05
eabf94623a
Allow dateAdded to be updated
...
For movies, music videos, episodes.
2015-10-16 17:38:25 -05:00
angelblue05
a3d7369576
Disable warning in downloadutils
...
For insecure ssl connections
2015-10-15 17:11:44 -05:00
angelblue05
0295291450
Fix missing argument
2015-10-15 16:47:45 -05:00
im85288
79e79eddd1
Set and Clear additional user images for use in skins
2015-10-14 19:58:32 +01:00
angelblue05
e781e9e02d
Add parent album to artwork
...
For parent images
2015-10-14 08:46:46 -05:00
angelblue05
d8ae0b695c
Fix typo
2015-10-13 12:22:22 -05:00
angelblue05
46d8c1d4c2
Extend the artwork method
...
To grab parent artwork
2015-10-13 10:40:21 -05:00
angelblue05
13501b42d1
Adding support for Boxrear artwork
...
For albums.
2015-10-13 06:42:15 -05:00
angelblue05
b7cf3bc15a
Fix for missing fanart for albums
...
Re-added old method for fanart specifically.
2015-10-13 06:24:23 -05:00
angelblue05
5a2b8b7cfd
Fix delete settings
2015-10-13 05:41:28 -05:00
angelblue05
582949e79c
Fix error caused by idSeason
...
Will properly skip the episode in the event the actual season is missing
it's number.
2015-10-13 05:05:03 -05:00
angelblue05
48654801e5
Fix double report progress
...
Removed stack implementation. Working with playlist and setresolvedurl.
2015-10-13 03:00:32 -05:00
xnappo
9970a770c4
Add check for season 0 as server now returns this
2015-10-12 13:45:23 -05:00
angelblue05
32ad6cf684
Fix for collections
...
Filter out trailers channel
2015-10-12 12:44:20 -05:00
angelblue05
0fd88210b4
Fix syntax causing error on Android
2015-10-12 12:22:51 -05:00
angelblue05
4061d0b7e9
Fix lag at start up
...
Prevent lag before displaying welcome message.
2015-10-12 11:31:02 -05:00
angelblue05
ddd334f285
Fix playback
...
Intros, additional parts, playlists should now be fully functional... I
hope...
2015-10-12 11:20:50 -05:00
im85288
dfedf545ba
allow option to select direct paths at startup
2015-10-12 16:29:05 +01:00
angelblue05
2d636d5b2d
Fix artwork
...
Prevent artwork type not supported from syncing
2015-10-11 23:41:55 -05:00
im85288
75a877ee9e
jarvis support
2015-10-11 23:50:46 +01:00
im85288
45a840e12e
jarvis support
2015-10-11 22:03:59 +01:00
angelblue05
d5f3db078f
Readjust playback using playlists
...
Instead of fighting against Kodi, work with already set playlist and
adding items to it. Added extra comments to help understand.
2015-10-11 09:25:10 -05:00
angelblue05
5f3f45e404
Fix playcount
2015-10-08 20:11:06 -05:00
angelblue05
06ad9ab18c
New artwork method implement
...
Old method still available for backward compatibility
2015-10-08 04:18:56 -05:00
angelblue05
6c4242abeb
Revert "Update artwork method"
...
This reverts commit 3928b3edb7
2015-10-07 19:49:18 -05:00
angelblue05
3928b3edb7
Update artwork method
...
In preparation for extra fanart
2015-10-07 19:39:30 -05:00
angelblue05
91396d84e8
Preparation for new artwork method
...
Moved to cache texture to limit duplicated methods (video and music).
Update backdrop instantly, should not cause any issues this time since
it only triggers if the url is different than the new one.
2015-10-05 06:02:43 -05:00
angelblue05
3605a48933
Fix for tv show is not found on server
...
When processing episodes, if the show failed to be added.
2015-10-04 06:40:39 -05:00
angelblue05
7d9fe89806
Prevent double marking as watched
...
Also removed the mark watched at: % setting. It is controlled by the
server itself.
2015-10-04 06:05:31 -05:00
angelblue05
43494ec053
getAllArtwork
...
Get all the artwork for an item at once.
2015-10-03 03:41:39 -05:00
angelblue05
8f75f96909
Fix typo
2015-10-02 19:28:32 -05:00
angelblue05
5d74dcedc4
Fix to follow emby views
...
To follow "my views" presentation
2015-10-02 02:08:21 -05:00
angelblue05
fe5ae9386a
Support Emby tags
2015-10-01 22:30:11 -05:00
angelblue05
4ab6991968
Transcode revision, stack files, playback cleanup
2015-10-01 08:08:34 -05:00
angelblue05
0294957d14
Studios convert to Kodi compatible studios
2015-10-01 03:13:39 -05:00
angelblue05
86c4db78f9
Change dialog to notification for direct play
...
Still allow for playback, while letting the user know.
2015-09-30 18:19:34 -05:00
im85288
9cb84906b1
Merge remote-tracking branch 'origin/master'
2015-09-27 22:06:30 +01:00
im85288
0c0832421b
rotten tomatoes removed
2015-09-27 22:06:22 +01:00
angelblue05
3954cdddd0
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2015-09-26 17:09:57 -05:00
angelblue05
142c5cad01
DTS-HD MA fix
2015-09-26 17:09:53 -05:00
im85288
dac614b284
video db bumped to version 97 for jarvis
2015-09-26 11:25:11 +01:00
angelblue05
a39784cb81
Fix profile switch v2
...
Make sure the threads are terminated correctly. This time, verify the
profile before anything else.
2015-09-24 06:59:26 -05:00
angelblue05
e0343891af
Revert "Fix profile switching"
...
This reverts commit 0e61825579
2015-09-24 06:48:43 -05:00
angelblue05
0e61825579
Fix profile switching
...
Make sure the threads are properly terminated.
2015-09-24 06:16:19 -05:00
angelblue05
9d86604800
Support strm file playback regardless of method
2015-09-17 16:00:58 -05:00
angelblue05
cb9aeebd3d
Fix music in initial set up wizard
...
Reverse the logic since music is enabled by default.
2015-09-16 16:12:42 -05:00
angelblue05
1c4bf024fb
Fix for intro
...
Not very pretty but this should prevent loop when enabling intros
2015-09-16 11:57:08 -05:00
angelblue05
05e421415f
Revert "Fix for intro"
...
This reverts commit 773fa19762
2015-09-16 11:29:51 -05:00
angelblue05
df685030d3
Revert "Final fix for intros"
...
This reverts commit 97d4a99897
2015-09-16 11:29:39 -05:00
angelblue05
97d4a99897
Final fix for intros
2015-09-16 10:28:22 -05:00
angelblue05
3a7afedb6c
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2015-09-16 10:07:34 -05:00
angelblue05
773fa19762
Fix for intro
2015-09-16 10:07:30 -05:00
im85288
c5d5e87574
drop emby only if it exists...which should be most of the time :)
2015-09-16 16:00:54 +01:00
im85288
84096ad022
fix playback intros
2015-09-16 15:52:54 +01:00
im85288
3a392ce27f
assure to drop emby table on reset
2015-09-16 09:52:48 +01:00
im85288
0a6dd94eff
add library monitor to assist with embyskinhelper for data such as critcrating etc
2015-09-15 18:03:52 +01:00
angelblue05
0546dcc2f6
Move database log line
...
So it only prints one time.
2015-09-15 11:26:32 -05:00
angelblue05
ea941ed6b4
Fix for add people
2015-09-15 07:48:42 -05:00
xnappo
5496cb0667
Switch to local code for version check
2015-09-10 21:27:36 -05:00
im85288
b0592d3b02
support new jarvis version of music db 54
2015-09-10 17:16:18 +01:00
angelblue05
c92454bb92
Support mixed content and undefined collection
...
Undefined collection - when rich presentation is disabled.
2015-09-08 13:36:49 -05:00
angelblue05
09966b25bb
Option to sync specials ordering
...
False by default, since not everyone likes displaying them within
seasons.
2015-09-07 10:30:25 -05:00
angelblue05
c698e39bb2
Prevent loop if user decides not to reset db yet
2015-09-07 04:12:28 -05:00
xnappo
5592429863
Missed a line at merge
2015-09-06 12:32:07 -05:00
xnappo
76bec3e846
Add library version tracking
2015-09-06 12:28:00 -05:00
