packages command: allow sorting according to the order of a file

1 files changed, 16 insertions, 1 deletions

diff --git a/mgagnome b/mgagnome
index f8499fe..9da7824 100755
--- a/mgagnome
+++ b/mgagnome
@@ -46,6 +46,9 @@ import time
 # version freeze
 import datetime
 
+# packages --sort
+import itertools
+
 MEDIA="Core Release Source"
 URL="http://download.gnome.org/sources/"
 PKGROOT='~/pkgs'
@@ -618,7 +621,15 @@ def join_streams(show_version=False, only_diff_version=False):
             yield (package, module, package_version, spec_version, downstream.files[package])
 
 def cmd_ls(options, parser):
-    for package, module, package_version, spec_version, downstream_files in sorted(join_streams(show_version=options.show_version, only_diff_version=options.diff)):
+    streams = join_streams(show_version=options.show_version, only_diff_version=options.diff)
+    if options.sort:
+        SORT=dict(zip(options.sort.read().splitlines(), itertools.count()))
+
+        streams = sorted(streams, key=lambda a: (SORT.get(a[1], 9999), a[0]))
+    else:
+        streams = sorted(streams)
+
+    for package, module, package_version, spec_version, downstream_files in streams:
         sys.stdout.write(package)
         if options.upstream: sys.stdout.write("\t%s" % module)
         if options.show_version: sys.stdout.write("\t%s\t%s" % (spec_version, package_version))
@@ -808,6 +819,10 @@ def main():
                                        help="Show version numbers")
     subparser.add_argument(      "--diff", action="store_true", dest="diff",
                                        help="Only show packages with different version")
+    subparser.add_argument(      "--sort", type=argparse.FileType('r', 0),
+                        dest="sort", metavar="FILE",
+                        help="Sort packages according to order in given FILE")
+
     subparser.set_defaults(
         func=cmd_ls, upstream=False, show_version=False, diff=False
     )