From fc8411f3b82901a92a6af70ea0ad7c9f90276bc3 Mon Sep 17 00:00:00 2001
From: diomekes <diomekes@denebius>
Date: Thu, 15 Dec 2016 16:04:56 -0500
Subject: [PATCH 1/2] random: add --time option, update docs

---
 beetsplug/random.py     | 75 +++++++++++++++++++++++++++++++----------
 docs/plugins/random.rst |  4 +++
 2 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/beetsplug/random.py b/beetsplug/random.py
index a0719dcada..0dc4389277 100644
--- a/beetsplug/random.py
+++ b/beetsplug/random.py
@@ -32,6 +32,23 @@ def random_item(lib, opts, args):
     else:
         objs = list(lib.items(query))
 
+    if opts.time:
+        total_time = 0.0
+        time_sec = (opts.time * 60)
+        objs_shuffled = objs
+        random.shuffle(objs_shuffled)
+
+        if not opts.equal_chance:
+            objs = []
+
+            for item in objs_shuffled:
+                if (total_time + item.length) <= time_sec:
+                    objs.append(item)
+                    total_time += item.length
+
+                else:
+                    pass
+
     if opts.equal_chance:
         # Group the objects by artist so we can sample from them.
         key = attrgetter('albumartist')
@@ -39,25 +56,44 @@ def random_item(lib, opts, args):
         objs_by_artists = {}
         for artist, v in groupby(objs, key):
             objs_by_artists[artist] = list(v)
-
         objs = []
-        for _ in range(opts.number):
-            # Terminate early if we're out of objects to select.
-            if not objs_by_artists:
-                break
-
-            # Choose an artist and an object for that artist, removing
-            # this choice from the pool.
-            artist = random.choice(list(objs_by_artists.keys()))
-            objs_from_artist = objs_by_artists[artist]
-            i = random.randint(0, len(objs_from_artist) - 1)
-            objs.append(objs_from_artist.pop(i))
-
-            # Remove the artist if we've used up all of its objects.
-            if not objs_from_artist:
-                del objs_by_artists[artist]
 
-    else:
+        if opts.time:
+            for item in objs_shuffled:
+                if not objs_by_artists:
+                    break
+
+                if (total_time + item.length) <= time_sec:
+                    artist = random.choice(list(objs_by_artists.keys()))
+                    objs_from_artist = objs_by_artists[artist]
+                    i = random.randint(0, len(objs_from_artist) - 1)
+                    objs.append(objs_from_artist.pop(i))
+                    total_time += item.length
+
+                    if not objs_from_artist:
+                        del objs_by_artists[artist]
+
+                else:
+                    pass
+
+        else:
+            for _ in range(opts.number):
+                # Terminate early if we're out of objects to select.
+                if not objs_by_artists:
+                    break
+
+                # Choose an artist and an object for that artist, removing
+                # this choice from the pool.
+                artist = random.choice(list(objs_by_artists.keys()))
+                objs_from_artist = objs_by_artists[artist]
+                i = random.randint(0, len(objs_from_artist) - 1)
+                objs.append(objs_from_artist.pop(i))
+
+                # Remove the artist if we've used up all of its objects.
+                if not objs_from_artist:
+                    del objs_by_artists[artist]
+
+    elif not opts.time:
         number = min(len(objs), opts.number)
         objs = random.sample(objs, number)
 
@@ -65,13 +101,16 @@ def random_item(lib, opts, args):
         print_(format(item))
 
 random_cmd = Subcommand('random',
-                        help=u'chose a random track or album')
+                        help=u'choose a random track or album')
 random_cmd.parser.add_option(
     u'-n', u'--number', action='store', type="int",
     help=u'number of objects to choose', default=1)
 random_cmd.parser.add_option(
     u'-e', u'--equal-chance', action='store_true',
     help=u'each artist has the same chance')
+random_cmd.parser.add_option(
+    u'-t', u'--time', action='store', type="float",
+    help=u'total length in minutes of objects to choose')
 random_cmd.parser.add_all_common_options()
 random_cmd.func = random_item
 
diff --git a/docs/plugins/random.rst b/docs/plugins/random.rst
index 5b04d5ab7f..8025eef4b5 100644
--- a/docs/plugins/random.rst
+++ b/docs/plugins/random.rst
@@ -23,3 +23,7 @@ of Bob Dylan won't make you listen to Bob Dylan 50% of the time.
 The ``-n NUMBER`` option controls the number of objects that are selected and
 printed (default 1). To select 5 tracks from your library, type ``beet random
 -n5``.
+
+The ``-t MINUTES`` option controls the combined length of the objects that are
+selected and printed.  To select tracks that total one hour, tyoe ``beet random
+-t60``

From 1bc54569860264e4d6184f59f5373f5869fc983b Mon Sep 17 00:00:00 2001
From: diomekes <diomekes@denebius>
Date: Sat, 17 Dec 2016 17:24:58 -0500
Subject: [PATCH 2/2] random: make --album work with --time

---
 beetsplug/random.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/beetsplug/random.py b/beetsplug/random.py
index 0dc4389277..d719b59106 100644
--- a/beetsplug/random.py
+++ b/beetsplug/random.py
@@ -42,6 +42,8 @@ def random_item(lib, opts, args):
             objs = []
 
             for item in objs_shuffled:
+                if opts.album:
+                    item.length = sum(a.length for a in item.items())
                 if (total_time + item.length) <= time_sec:
                     objs.append(item)
                     total_time += item.length
@@ -63,6 +65,8 @@ def random_item(lib, opts, args):
                 if not objs_by_artists:
                     break
 
+                if opts.album:
+                    item.length = sum(a.length for a in item.items())
                 if (total_time + item.length) <= time_sec:
                     artist = random.choice(list(objs_by_artists.keys()))
                     objs_from_artist = objs_by_artists[artist]