From 68595ee09d8c82703b0bd1a27ba33d9da1617e2e Mon Sep 17 00:00:00 2001
From: Thomas Scholtes <thomas-scholtes@gmx.de>
Date: Tue, 15 Apr 2014 17:42:16 +0200
Subject: [PATCH] Import rar archives

---
 beets/importer.py     |  11 +++++++++++
 setup.py              |   1 +
 test/rsrc/archive.rar | Bin 0 -> 2357 bytes
 test/test_importer.py |  13 +++++++++++++
 tox.ini               |   1 +
 5 files changed, 26 insertions(+)
 create mode 100644 test/rsrc/archive.rar

diff --git a/beets/importer.py b/beets/importer.py
index d31fd1a11..61ff1294a 100644
--- a/beets/importer.py
+++ b/beets/importer.py
@@ -548,6 +548,10 @@ class ImportTask(object):
 
 
 class ArchiveImportTask(ImportTask):
+    """Additional methods for handling archives.
+
+    Use when `toppath` points to a `zip`, `tar`, or `rar` archive.
+    """
 
     def __init__(self, toppath):
         super(ArchiveImportTask, self).__init__(toppath)
@@ -582,6 +586,13 @@ class ArchiveImportTask(ImportTask):
             cls._handlers.append((is_zipfile, ZipFile))
             from tarfile import is_tarfile, TarFile
             cls._handlers.append((is_tarfile, TarFile))
+            try:
+                from rarfile import is_rarfile, RarFile
+            except ImportError:
+                pass
+            else:
+                cls._handlers.append((is_rarfile, RarFile))
+
         return cls._handlers
 
     def cleanup(self):
diff --git a/setup.py b/setup.py
index e2c917121..c602d275f 100755
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,7 @@ setup(
         'echonest_tempo': ['pyechonest'],
         'lastgenre': ['pylast'],
         'web': ['flask'],
+        'import': ['rarfile'],
     },
     # Non-Python/non-PyPI plugin dependencies:
     # replaygain: mp3gain || aacgain
diff --git a/test/rsrc/archive.rar b/test/rsrc/archive.rar
new file mode 100644
index 0000000000000000000000000000000000000000..e51051155c56a793e6659603e3dcb9126f948f62
GIT binary patch
literal 2357
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
b5>G>ukvl5sq5t646b-lVK*T+J06+%-6)>9n

literal 0
HcmV?d00001

diff --git a/test/test_importer.py b/test/test_importer.py
index 854b21d4b..d6b211c2d 100644
--- a/test/test_importer.py
+++ b/test/test_importer.py
@@ -342,6 +342,19 @@ class ImportTarTest(ImportZipTest):
         return path
 
 
+class ImportRarTest(ImportZipTest):
+
+    def create_archive(self):
+        return os.path.join(_common.RSRC, 'archive.rar')
+
+
+@unittest.skip('Implment me!')
+class ImportPasswordRarTest(ImportZipTest):
+
+    def create_archive(self):
+        return os.path.join(_common.RSRC, 'password.rar')
+
+
 class ImportSingletonTest(_common.TestCase, ImportHelper):
     """Test ``APPLY`` and ``ASIS`` choices for an import session with singletons
     config set to True.
diff --git a/tox.ini b/tox.ini
index 5e50071c6..e84f536ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ deps =
     flask
     responses
     pyechonest
+    rarfile
 commands =
     nosetests {posargs}