Merge lp:~paparomeo/byobu/byobu into lp:byobu

[Pedro Romano]

This branch adds named sessions starting with an underscore also as hidden sessions in alternative to named sessions starting with a dot, since tmux doesn't support session names starting with a dot. In the process it also adds support for hidden session in tmux if the session names start with an underscore, adding this feature to tmux based byobu.

[Dustin Kirkland  (kirkland)]

Brilliant, thanks for this. Merge committed. Will release soon.

Cheers!

:-Dustin

On Sat, May 31, 2014 at 4:20 PM, Pedro Romano
<email address hidden> wrote:
> Pedro Romano has proposed merging lp:~pmcnr/byobu/byobu into lp:byobu.
>
> Requested reviews:
> Dustin Kirkland  (kirkland)
>
> For more details, see:
> https://code.launchpad.net/~pmcnr/byobu/byobu/+merge/221614
>
> This branch adds named sessions starting with an underscore also as hidden sessions in alternative to named sessions starting with a dot, since tmux doesn't support session names starting with a dot. In the process it also adds support for hidden session in tmux if the session names start with an underscore, adding this feature to tmux based byobu.
> --
> https://code.launchpad.net/~pmcnr/byobu/byobu/+merge/221614
> You are requested to review the proposed merge of lp:~pmcnr/byobu/byobu into lp:byobu.
>
> === modified file 'usr/lib/byobu/include/select-session.py'
> --- usr/lib/byobu/include/select-session.py 2014-03-17 01:32:43 +0000
> +++ usr/lib/byobu/include/select-session.py 2014-05-31 14:19:17 +0000
> @@ -57,8 +57,8 @@
> if output:
> for s in output.splitlines():
> s = re.sub(r'\s+', ' ', s)
> - # Ignore hidden sessions (named sessions that start with a ".")
> - if s and s != " " and (s.find(" ") == 0 and len(s) > 1 and s.count("..") == 0):
> + # Ignore hidden sessions (named sessions that start with a "." or a "_")
> + if s and s != " " and (s.find(" ") == 0 and len(s) > 1 and s.count("..") == 0 and s.count("._") == 0):
> text.append("screen: %s" % s.strip())
> items = s.split(" ")
> sessions.append("screen____%s" % items[1])
> @@ -71,7 +71,8 @@
> output = output.decode(sys.stdout.encoding)
> if output:
> for s in output.splitlines():
> - if s:
> + # Ignore hidden sessions (named sessions that start with a "_")
> + if s and not s.startswith("_"):
> text.append("tmux: %s" % s.strip())
> sessions.append("tmux____%s" % s.split(":")[0])
> i += 1
>
>

=== modified file 'usr/lib/byobu/include/select-session.py'
--- usr/lib/byobu/include/select-session.py	2014-03-17 01:32:43 +0000
+++ usr/lib/byobu/include/select-session.py	2014-05-31 14:19:17 +0000
@@ -57,8 +57,8 @@
 		if output:
 			for s in output.splitlines():
 				s = re.sub(r'\s+', ' ', s)
-				# Ignore hidden sessions (named sessions that start with a ".")
-				if s and s != " " and (s.find(" ") == 0 and len(s) > 1 and s.count("..") == 0):
+				# Ignore hidden sessions (named sessions that start with a "." or a "_")
+				if s and s != " " and (s.find(" ") == 0 and len(s) > 1 and s.count("..") == 0 and s.count("._") == 0):
 					text.append("screen: %s" % s.strip())
 					items = s.split(" ")
 					sessions.append("screen____%s" % items[1])
@@ -71,7 +71,8 @@
 			output = output.decode(sys.stdout.encoding)
 		if output:
 			for s in output.splitlines():
-				if s:
+				# Ignore hidden sessions (named sessions that start with a "_")
+				if s and not s.startswith("_"):
 					text.append("tmux: %s" % s.strip())
 					sessions.append("tmux____%s" % s.split(":")[0])
 					i += 1