From 50f9a84eff588a4d9a9e7ce5298417868c076bf8 Mon Sep 17 00:00:00 2001
From: Romain <asyncadventures@gmail.com>
Date: Wed, 8 Mar 2017 21:59:19 +1100
Subject: [PATCH] Remove deprecated --sort-folders option

---
 README.md       |  1 -
 bin/thumbsup.js | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 15b6bf6..bfa6531 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,6 @@ Options:
   --albums-output-folder   Output subfolder for HTML albums (default: root of gallery)  [default: "."]
   --albums-from            How to group media into albums  [choices: "folders", "date"] [default: "folders"]
   --albums-date-format     How albums are named in <date> mode [moment.js pattern]  [default: "YYYY-MM"]
-  --sort-folders           How to sort albums [deprecated]  [choices: "name", "date"]
   --sort-albums-by         How to sort albums  [choices: "title", "start-date", "end-date"] [default: "start-date"]
   --sort-albums-direction  Album sorting direction  [choices: "asc", "desc"] [default: "asc"]
   --sort-media-by          How to sort photos and videos  [choices: "filename", "date"] [default: "date"]
diff --git a/bin/thumbsup.js b/bin/thumbsup.js
index b8c0c2f..cdb4c82 100755
--- a/bin/thumbsup.js
+++ b/bin/thumbsup.js
@@ -79,11 +79,6 @@ var opts = yargs
       description: 'How albums are named in <date> mode [moment.js pattern]',
       'default': 'YYYY-MM'
     },
-    // Deprecated for <sort-albums>
-    'sort-folders': {
-      description: 'How to sort albums [deprecated]',
-      choices: ['name', 'date']
-    },
     'sort-albums-by': {
       description: 'How to sort albums',
       choices: ['title', 'start-date', 'end-date'],
@@ -121,6 +116,7 @@ var opts = yargs
       description: 'JSON config file (one key per argument)',
       normalize: true
     }
+
   })
   .config('config')
   .epilogue('The optional JSON config should contain a single object with one key ' +
@@ -128,10 +124,6 @@ var opts = yargs
             '{ "sort-albums-by": "start-date" }')
   .argv
 
-// Compatibility
-if (opts['sort-folders'] === 'name') opts['sort-albums-by'] = 'title'
-if (opts['sort-folders'] === 'date') opts['sort-albums-by'] = 'start-date'
-
 index.build({
   input: path.resolve(opts['input']),
   output: path.resolve(opts['output']),