Merge pull request #121 from JackDandy/feature/AddTimeFormatLowerPM

Add lowercase PM to the General Config/Interface/Time style selection.

CHANGES.md

@@ -1,10 +1,13 @@
 ### 0.x.x (2014-12-xx xx:xx:xx UTC)
 
-* Add network logo's for BBC Canada, Crackle, El Rey Network, SKY Atlantic, and Watch
+* Add network logos BBC Canada, Crackle, El Rey Network, SKY Atlantic, and Watch
 * Change Yahoo! screen network logo
-* Change added and updated Discovery Network's channel logo's
+* Add and update Discovery Network's channel logos
-* Remove unrequired duplicate network logo's
+* Add A&E Network International/Scripps Networks International channel logos
-* Add Discovery Network International/A&E Network International/Scripps Networks International missing channel logos
+* Remove non required duplicate network logos
+* Add lowercase PM to the General Config/Interface/Time style selection
+* Change General Config/Interface/Trim zero padding to Trim date and time, now handles 2:00 pm > 2 pm
+* Fix trim zero of military time hour to not use 12 hr time
 
 [develop changelog]
 

gui/slick/css/dark.css

@@ -1375,11 +1375,6 @@ config*.tmpl
 	padding: 12px 0px;
 }
 
-#config div.field-pair input {
-	float: left;
-	margin-right: 6px;
-}
-
 #config .nocheck, #config div #customQuality, .metadataDiv {
 	padding-left: 20px;
 }

gui/slick/css/light.css

@@ -1358,11 +1358,6 @@ config*.tmpl
 	padding: 12px 0px;
 }
 
-#config div.field-pair input {
-	float: left;
-	margin-right: 6px;
-}
-
 #config .nocheck, #config div #customQuality, .metadataDiv {
 	padding-left: 20px;
 }

gui/slick/css/style.css

@@ -1591,10 +1591,13 @@ config*.tmpl
 	padding: 12px 0
 }
 
-.stepDiv .component-desc select,
-.stepDiv .component-desc input,
 #config div.field-pair select,
 #config div.field-pair input {
+	margin-right: 6px;
+}
+
+.stepDiv .component-desc select,
+.stepDiv .component-desc input {
 	margin-right: 15px;
 }
 
@@ -3153,6 +3156,11 @@ span.token-input-delete-token {
 	z-index: 0;
 	background-image: url(../images/poster-dark.jpg)
 }
+
+.time-am-pm {
+	margin-left: 2px;
+}
+
 /* =======================================================================
 jquery.confirm.css
 ========================================================================== */

gui/slick/interfaces/default/config_general.tmpl

@@ -246,10 +246,10 @@
 						</div>
 						<div class="field-pair show_if_fuzzy_dating#if True == $sickbeard.FUZZY_DATING then '' else ' metadataDiv'#">
 							<label for="trim_zero">
-								<span class="component-title">Trim zero padding</span>
+								<span class="component-title">Trim date and time</span>
 								<span class="component-desc">
 									<input type="checkbox" name="trim_zero" id="trim_zero" #if True == $sickbeard.TRIM_ZERO then 'checked="checked"' else ''#/>
-									<p>remove the leading number "0" shown on hour of day, and date of month</p>
+									<p>display minimalist date and time i.e. <del>02:00</del> = 2:00, <del>02:00pm</del> = 2pm, <del>03 Jan</del> = 3 Jan</p>
 								</span>
 							</label>
 						</div>
@@ -280,10 +280,11 @@
 								<span class="component-desc">
 									<select id="time_presets" name="time_preset" class="form-control input-sm">
 #for $cur_preset in $time_presets:
-											<option value="$cur_preset" #if $cur_preset == $sickbeard.TIME_PRESET_W_SECONDS then 'selected="selected"' else ''#>$sbdatetime.now().sbftime(show_seconds=True,t_preset=$cur_preset)</option>
+    #set $show_seconds = not $sickbeard.FUZZY_DATING
+										<option value="$cur_preset" #if $cur_preset == $sickbeard.TIME_PRESET_W_SECONDS then 'selected="selected"' else ''#>$sbdatetime.now().sbftime(show_seconds=$show_seconds, t_preset=$cur_preset)</option>
 #end for
 									</select>
-									<span><b>note:</b> seconds are only shown on the History page</span>
+									<span id="trim_info_seconds"><b>note:</b> seconds are only shown on the History page</span>
 								</span>
 							</label>
 						</div>

gui/slick/js/config.js

@@ -1,45 +1,87 @@
 $(document).ready(function(){
-    $('.enabler').each(function(){
+	var enabler = $('.enabler'),
+		viewIf = $('.viewIf');
+
+	enabler.each(function(){
 		if (!$(this).prop('checked'))
 			$('#content_' + $(this).attr('id')).hide();
 	});
 
-    $('.enabler').click(function(){
+	enabler.click(function(){
+		var content_id = $('#content_' + $(this).attr('id'));
 		if ($(this).prop('checked'))
-            $('#content_' + $(this).attr('id')).fadeIn('fast', 'linear');
+			content_id.fadeIn('fast', 'linear');
 		else
-            $('#content_' + $(this).attr('id')).fadeOut('fast', 'linear');
+			content_id.fadeOut('fast', 'linear');
 	});
 
-    $('.viewIf').click(function(){
+	viewIf.each(function(){
+		$(($(this).prop('checked') ? '.hide_if_' : '.show_if_') + $(this).attr('id')).hide();
+	});
+
+	viewIf.click(function(){
+		var if_id = '_if_' + $(this).attr('id');
 		if ($(this).prop('checked')) {
-            $('.hide_if_' + $(this).attr('id')).css('display','none');
+			$('.hide' + if_id).fadeOut('fast', 'linear');
-            $('.show_if_' + $(this).attr('id')).fadeIn('fast', 'linear');
+			$('.show' + if_id).fadeIn('fast', 'linear');
 		} else {
-            $('.show_if_' + $(this).attr('id')).css('display','none');
+			$('.show' + if_id).fadeOut('fast', 'linear');
-            $('.hide_if_' + $(this).attr('id')).fadeIn('fast', 'linear');
+			$('.hide' + if_id).fadeIn('fast', 'linear');
 		}
 	});
 
+	var ui_update_trim_zero = (function() {
+		var secs = ('00' + new Date().getSeconds().toString()).slice(-2),
+			elSecs = $('#trim_info_seconds'),
+			elTrimZero = $('#trim_zero');
+		elTrimZero.each(function() {
+			var checked = $(this).prop('checked') && $('#fuzzy_dating').prop('checked');
+
+			$('#time_presets').find('option').each(function() {
+				var text = ($(this).text());
+				$(this).text(checked
+					? text.replace(/(\b\d+:\d\d):\d+/mg, '$1')
+					: text.replace(/(\b\d+:\d\d)(?:.\d+)?/mg, '$1:' + secs));
+			});
+		});
+
+		if ($('#fuzzy_dating').prop('checked'))
+			if (elTrimZero.prop('checked'))
+				elSecs.fadeOut('fast', 'linear');
+			else
+				elSecs.fadeIn('fast', 'linear');
+		else
+			elSecs.fadeIn('fast', 'linear');
+	});
+
+	$('#trim_zero, #fuzzy_dating').click(function() {
+		ui_update_trim_zero();
+	});
+
+	ui_update_trim_zero();
+
 	$('.datePresets').click(function(){
-        var def = $('#date_presets').val()
+		var elDatePresets = $('#date_presets'),
-        if ($(this).prop('checked') && '%x' == def) {
+			defaultPreset = elDatePresets.val();
-            def = '%a, %b %d, %Y'
+		if ($(this).prop('checked') && '%x' == defaultPreset) {
+			defaultPreset = '%a, %b %d, %Y';
 			$('#date_use_system_default').html('1')
 		} else if (!$(this).prop('checked') && '1' == $('#date_use_system_default').html())
-            def = '%x'
+			defaultPreset = '%x';
 
-        $('#date_presets').attr('name', 'date_preset_old')
+		elDatePresets.attr('name', 'date_preset_old');
-        $('#date_presets').attr('id', 'date_presets_old')
+		elDatePresets.attr('id', 'date_presets_old');
 
-        $('#date_presets_na').attr('name', 'date_preset')
+		var elDatePresets_na = $('#date_presets_na');
-        $('#date_presets_na').attr('id', 'date_presets')
+		elDatePresets_na.attr('name', 'date_preset');
+		elDatePresets_na.attr('id', 'date_presets');
 
-        $('#date_presets_old').attr('name', 'date_preset_na')
+		var elDatePresets_old = $('#date_presets_old');
-        $('#date_presets_old').attr('id', 'date_presets_na')
+		elDatePresets_old.attr('name', 'date_preset_na');
+		elDatePresets_old.attr('id', 'date_presets_na');
 
-        if (def)
+		if (defaultPreset)
-            $('#date_presets').val(def)
+			elDatePresets.val(defaultPreset)
 	});
 
 	// bind 'myForm' and provide a simple callback function
@@ -69,8 +111,7 @@ $(document).ready(function(){
 	});
 
 	$('#branchCheckout').click(function(){
-        url = sbRoot + '/home/branchCheckout?branch=' + $('#branchVersion').val();
+		window.location.href = sbRoot + '/home/branchCheckout?branch=' + $('#branchVersion').val();
-		window.location.href = url;
 	});
 	
 });

gui/slick/js/fuzzyMoment.js

@@ -21,11 +21,11 @@
 
 		jd = (function (str) {
 			var token_map = ['a', 'ddd', 'A', 'dddd', 'b', 'MMM', 'B', 'MMMM', 'd', 'DD', 'm', 'MM', 'y', 'YY', 'Y', 'YYYY', 'x', 'L',
-                             'H', 'HH', 'I', 'hh', 'M', 'mm', 'S', 'ss', 'p', 'A'],
+					'H', 'HH', 'I', 'hh', 'M', 'mm', 'S', 'ss', 'p', 'A', 'P', 'a'],
 				result = '';
 
 			for (var i = 0; i < str.length; i++)
-                if (/[aAbBdmyYxHIMSp]/.test(str[i])) {
+				if (/[aAbBdmyYxHIMSpP]/.test(str[i])) {
 					for (var t = 0; t < token_map.length; t = t + 2)
 						if (str[i] == token_map[t]) {
 							result += token_map[t + 1];
@@ -36,8 +36,8 @@
 
 			return result;
 		}),
-        dateToken = jd(dateFormat),
+		dateTemplate = jd(dateFormat),
-        timeToken = jd(timeFormat),
+		timeTemplate = jd(timeFormat),
 
 		addQTip = (function() {
 			$(this).css('cursor', 'help');
@@ -60,32 +60,50 @@
 		});
 
 	if (trimZero) {
-        timeToken = timeToken.replace(/hh/ig, 'h');
+		timeTemplate = timeTemplate.replace(/hh/g, 'h');
-        dateToken = dateToken.replace(/\bDD\b/g, 'D');
+		timeTemplate = timeTemplate.replace(/HH/g, 'H');
+		dateTemplate = dateTemplate.replace(/\bDD\b/g, 'D');
 	}
 
 	$(containerClass).each(function() {
 		var input = $(this).text(),
 			dateA = '[<span class="fd">',
 			dtSeparator = ' ',
-            timeA = '</span>]', timeB = '[' + timeA;
+			timeA = '</span>]', timeB = '[' + timeA,
+			timeToken = timeTemplate;
 
 		if (dateWithTime) {
-            var timeMeta = input.match(/^.{6,}?([,\s]+)(\d{1,2}).(?:\d{2,2})(?:.(\d{2,2}))?(?:\s([ap]m))?$/im);
+			var timeMeta = input.match(/([,\s]+)(\d{1,2})(?:(.)(\d\d)(?:(.)(\d\d))?)?(?:\s?([ap]m))?$/im);
 			if (null != timeMeta) {
 				dtSeparator = (! /undefined/i.test(typeof(timeMeta[1])) ? timeMeta[1] : dtSeparator);
 				// adjust timeToken to num digits of input hours
 				timeToken = (! /undefined/i.test(typeof(timeMeta[2])) && 1 == timeMeta[2].length ? timeToken.replace(/hh/ig, 'h') : timeToken);
+				// adjust timeToken to remove min if input has one and there is a pm
+				timeToken = (trimZero && ! /undefined/i.test(typeof(timeMeta[7]))
+					&& (/undefined/i.test(typeof(timeMeta[4]))
+						|| '00' == timeMeta[4]) ? timeToken.replace(/.mm/ig, '') : timeToken);
 				// adjust timeToken to use seconds if input has them
-                timeToken = (! /undefined/i.test(typeof(timeMeta[3])) && 2 == timeMeta[3].length ? timeToken : timeToken.replace(/.ss/, ''));
+				timeToken = (! /undefined/i.test(typeof(timeMeta[5])) && 2 == timeMeta[5].length ? timeToken : timeToken.replace(/.ss/, ''));
 				// adjust timeToken to am/pm or AM/PM if input has it
-                timeToken = (! /undefined/i.test(typeof(timeMeta[4])) && 2 == timeMeta[4].length ? timeToken.replace(/A$/, (/[ap]m/.test(timeMeta[4]) ? 'a' : 'A')) : timeToken);
+				timeToken = (! /undefined/i.test(typeof(timeMeta[7])) && 2 == timeMeta[7].length ? timeToken.replace(/A$/, (/[ap]m/.test(timeMeta[7]) ? 'a' : 'A')) : timeToken);
 			}
+
+			var token_build = (/h+/i.test(timeToken) ? timeToken.replace(/^(h+).*/i, '[<span class="time-hr">]$1[</span>]') : '');
+			if (/m+/i.test(timeToken)) {
+				token_build += (! /undefined/i.test(typeof(timeMeta[3])) ? '[<span class="time-hr-min">]' + timeMeta[3] + '[</span>]' : '')
+					+ (! /undefined/i.test(typeof(timeMeta[4])) ? timeToken.replace(/.*?(m+).*/i, '[<span class="time-min">]$1[</span>]') : '');
+				if (/s+/i.test(timeToken)) {
+					token_build += (! /undefined/i.test(typeof(timeMeta[5])) ? '[<span class="time-min-sec">]' + timeMeta[5] + '[</span>]' : '')
+						+ (! /undefined/i.test(typeof(timeMeta[6])) ? timeToken.replace(/.*?(s+).*/i, '[<span class="time-sec">]$1[</span>]') : '');
+				}
+			}
+			timeToken = token_build + (! /undefined/i.test(typeof(timeMeta[7])) ? timeToken.replace(/.*?[\s0-9](a).*/i, '[<span class="time-am-pm">]$1[</span>]') : '');
+
 			timeA = '</span>' + dtGlue + '<span class="ft">]' + timeToken + '[' + timeA;
 			timeB = '[</span>' + dtGlue + '<span class="ft">]' + timeToken + timeB;
 		}
 
-        var inputTokens = dateToken + dtSeparator + (dateWithTime ?  timeToken : 'HH:mm:ss');
+		var inputTokens = dateTemplate + dtSeparator + (dateWithTime ?  timeToken : 'HH:mm:ss');
 
 		if (! moment(input + (dateWithTime ? '' : dtSeparator + '00:00:00'), inputTokens).isValid())
 			return;
@@ -152,11 +170,11 @@
 			if (dateWithTime && qTipTime)
 				$(this).attr('title',(n?'4) ':'') + airdatetime.format(inputTokens)).each(addQTip);
 			else
-                $(this).attr('title',(n?'5) ':'') + airdate.format(dateToken)).each(addQTip);
+				$(this).attr('title',(n?'5) ':'') + airdate.format(dateTemplate)).each(addQTip);
 		else
 			if (dateWithTime && qTipTime)
 				$(this).find('.ft').attr('title',(n?'6) ':'') + airdatetime.format(inputTokens)).each(addQTip);
 			else
-                $(this).find('.ft').attr('title',(n?'7) ':'') + airdate.format(dateToken)).each(addQTip);
+				$(this).find('.ft').attr('title',(n?'7) ':'') + airdate.format(dateTemplate)).each(addQTip);
 	});
 }

sickbeard/sbdatetime.py

@@ -19,6 +19,7 @@
 import datetime
 import locale
 import functools
+import re
 
 import sickbeard
 from sickbeard.network_timezones import sb_timezone
@@ -82,12 +83,12 @@ date_presets = ('%Y-%m-%d',
                 '%A, %b %d, %Y',
                 '%B %d, %Y',
                 '%a, %B %d, %Y',
-                '%A, %B %d, %Y'
+                '%A, %B %d, %Y')
-)
 
 time_presets = ('%I:%M:%S %p',
-                '%H:%M:%S'
+                '%I:%M:%S %P',
-)
+                '%H:%M:%S')
+
 
 # helper class
 class static_or_instance(object):
@@ -104,142 +105,98 @@ class sbdatetime(datetime.datetime):
 
     @static_or_instance
     def convert_to_setting(self, dt=None):
+        obj = (dt, self)[self is not None]
         try:
-            if sickbeard.TIMEZONE_DISPLAY == 'local':
+            if 'local' == sickbeard.TIMEZONE_DISPLAY:
-                if self is None:
+                return obj.astimezone(sb_timezone)
-                    return dt.astimezone(sb_timezone)
-                else:
-                    return self.astimezone(sb_timezone)
-            else:
-                if self is None:
-                    return dt
-                else:
-                    return self
         except:
-            if self is None:
+            pass
-                return dt
+
-            else:
+        return obj
-                return self
+
+    @static_or_instance
+    def setlocale(self, setlocale=True, use_has_locale=None, locale_str=''):
+        if setlocale:
+            try:
+                if None is use_has_locale or use_has_locale:
+                    locale.setlocale(locale.LC_TIME, locale_str)
+            except:
+                if None is not use_has_locale:
+                    sbdatetime.has_locale = False
+                pass
 
     # display Time in SickGear Format
     @static_or_instance
-    def sbftime(self, dt=None, show_seconds=False, t_preset=None):
+    def sbftime(self, dt=None, show_seconds=False, t_preset=None, setlocale=True, markup=False):
 
-        try:locale.setlocale(locale.LC_TIME, '')
+        sbdatetime.setlocale(setlocale=setlocale, use_has_locale=sbdatetime.has_locale, locale_str='us_US')
-        except:pass
-
-        try:
-            if sbdatetime.has_locale:
-                locale.setlocale(locale.LC_TIME, 'us_US')
-        except:
-            sbdatetime.has_locale = False
 
         strt = ''
         try:
-            if self is None:
+            obj = (dt, self)[self is not None]
-                if dt is not None:
+            if None is not obj:
-                    if t_preset is not None:
+                tmpl = (((sickbeard.TIME_PRESET, sickbeard.TIME_PRESET_W_SECONDS)[show_seconds]),
-                        strt = dt.strftime(t_preset)
+                        t_preset)[None is not t_preset]
-                    elif show_seconds:
+                tmpl = (tmpl.replace(':%S', ''), tmpl)[show_seconds]
-                        strt = dt.strftime(sickbeard.TIME_PRESET_W_SECONDS)
-                    else:
-                        strt = dt.strftime(sickbeard.TIME_PRESET)
-            else:
-                if t_preset is not None:
-                    strt = self.strftime(t_preset)
-                elif show_seconds:
-                    strt = self.strftime(sickbeard.TIME_PRESET_W_SECONDS)
-                else:
-                    strt = self.strftime(sickbeard.TIME_PRESET)
-        finally:
-            try:
-                if sbdatetime.has_locale:
-                    locale.setlocale(locale.LC_TIME, '')
-            except:
-                sbdatetime.has_locale = False
 
+                strt = obj.strftime(tmpl.replace('%P', '%p'))
+
+                if sickbeard.TRIM_ZERO:
+                    strt = re.sub(r'^0(\d:\d\d)', r'\1', strt)
+
+                if re.search(r'(?im)%p$', tmpl):
+                    if '%p' in tmpl:
+                        strt = strt.upper()
+                    elif '%P' in tmpl:
+                        strt = strt.lower()
+
+                    if sickbeard.TRIM_ZERO:
+                        strt = re.sub(r'(?im)^(\d+)(?::00)?(\s?[ap]m)', r'\1\2', strt)
+
+                if markup:
+                    match = re.search(r'(?im)(\d{1,2})(?:(.)(\d\d)(?:(.)(\d\d))?)?(?:\s?([ap]m))?$', strt)
+                    if match:
+                        strt = ('%s%s%s%s%s%s' % (
+                            ('<span class="time-hr">%s</span>' % match.group(1), '')[None is match.group(1)],
+                            ('<span class="time-hr-min">%s</span>' % match.group(2), '')[None is match.group(2)],
+                            ('<span class="time-min">%s</span>' % match.group(3), '')[None is match.group(3)],
+                            ('<span class="time-min-sec">%s</span>' % match.group(4), '')[None is match.group(4)],
+                            ('<span class="time-sec">%s</span>' % match.group(5), '')[None is match.group(5)],
+                            ('<span class="time-am-pm">%s</span>' % match.group(6), '')[None is match.group(6)]))
+
+        finally:
+            sbdatetime.setlocale(setlocale=setlocale, use_has_locale=sbdatetime.has_locale)
             return strt
 
     # display Date in SickGear Format
     @static_or_instance
-    def sbfdate(self, dt=None, d_preset=None):
+    def sbfdate(self, dt=None, d_preset=None, setlocale=True):
 
-        try:
+        sbdatetime.setlocale(setlocale=setlocale)
-            locale.setlocale(locale.LC_TIME, '')
-        except:
-            pass
 
         strd = ''
         try:
-            if self is None:
+            obj = (dt, self)[self is not None]
-                if dt is not None:
+            if None is not obj:
-                    if d_preset is not None:
+                strd = obj.strftime((sickbeard.DATE_PRESET, d_preset)[None is not d_preset])
-                        strd = dt.strftime(d_preset)
+
-                    else:
-                        strd = dt.strftime(sickbeard.DATE_PRESET)
-            else:
-                if d_preset is not None:
-                    strd = self.strftime(d_preset)
-                else:
-                    strd = self.strftime(sickbeard.DATE_PRESET)
         finally:
-
+            sbdatetime.setlocale(setlocale=setlocale)
-            try:
-                locale.setlocale(locale.LC_TIME, '')
-            except:
-                pass
-
             return strd
 
     # display Datetime in SickGear Format
     @static_or_instance
-    def sbfdatetime(self, dt=None, show_seconds=False, d_preset=None, t_preset=None):
+    def sbfdatetime(self, dt=None, show_seconds=False, d_preset=None, t_preset=None, markup=False):
 
-        try:
+        sbdatetime.setlocale()
-            locale.setlocale(locale.LC_TIME, '')
-        except:
-            pass
 
         strd = ''
+        obj = (dt, self)[self is not None]
         try:
-            if self is None:
+            if None is not obj:
-                if dt is not None:
+                strd = u'%s, %s' % (obj.strftime((sickbeard.DATE_PRESET, d_preset)[None is not d_preset]),
-                    if d_preset is not None:
+                                    sbdatetime.sbftime(dt, show_seconds, t_preset, False, markup))
-                        strd = dt.strftime(d_preset)
-                    else:
-                        strd = dt.strftime(sickbeard.DATE_PRESET)
-                    try:
-                        if sbdatetime.has_locale:
-                            locale.setlocale(locale.LC_TIME, 'us_US')
-                    except:
-                        sbdatetime.has_locale = False
-                    if t_preset is not None:
-                        strd += u', ' + dt.strftime(t_preset)
-                    elif show_seconds:
-                        strd += u', ' + dt.strftime(sickbeard.TIME_PRESET_W_SECONDS)
-                    else:
-                        strd += u', ' + dt.strftime(sickbeard.TIME_PRESET)
-            else:
-                if d_preset is not None:
-                    strd = self.strftime(d_preset)
-                else:
-                    strd = self.strftime(sickbeard.DATE_PRESET)
-                try:
-                    if sbdatetime.has_locale:
-                        locale.setlocale(locale.LC_TIME, 'us_US')
-                except:
-                    sbdatetime.has_locale = False
-                if t_preset is not None:
-                    strd += u', ' + self.strftime(t_preset)
-                elif show_seconds:
-                    strd += u', ' + self.strftime(sickbeard.TIME_PRESET_W_SECONDS)
-                else:
-                    strd += u', ' + self.strftime(sickbeard.TIME_PRESET)
-        finally:
-            try:
-                if sbdatetime.has_locale:
-                    locale.setlocale(locale.LC_TIME, '')
-            except:
-                sbdatetime.has_locale = False
 
+        finally:
+            sbdatetime.setlocale(use_has_locale=sbdatetime.has_locale)
             return strd