Merge pull request #156 from patacrep/data

Fix data location

patacrep/files.py

@@ -12,20 +12,24 @@ from patacrep import utils
 
 LOGGER = logging.getLogger(__name__)
 
-def recursive_find(root_directory, extensions):
+def recursive_find(root_directory, extensions=None):
     """Recursively find files with the given extensions, from a root_directory.
 
     Return a list of files matching those conditions.
 
     Arguments:
-    - `extensions`: list of accepted extensions.
+    - `extensions`: list of accepted extensions (None means every file).
     - `root_directory`: root directory of the search.
     """
     if not os.path.isdir(root_directory):
         return []
 
     matches = []
-    pattern = re.compile(r'.*\.({})$'.format('|'.join(extensions)))
+    if extensions is None:
+        pattern = re.compile('.*')
+    else:
+        pattern = re.compile(r'.*\.({})$'.format('|'.join(extensions)))
+
     with chdir(root_directory):
         for root, __ignored, filenames in os.walk(os.curdir):
             for filename in filenames:

patacrep/songs/__init__.py

@@ -192,11 +192,11 @@ class Song:
         """
         raise NotImplementedError()
 
-    def get_datadirs(self, subdir=None):
+    def iter_datadirs(self, *subpath):
-        """Return an iterator of existing datadirs (with eventually a subdir)
+        """Return an iterator of existing datadirs (with an optionnal subpath)
         """
         for directory in self.config['datadir']:
-            fullpath = os.path.join(directory, subdir)
+            fullpath = os.path.join(directory, *subpath)
             if os.path.isdir(fullpath):
                 yield fullpath
 
@@ -255,7 +255,7 @@ class Song:
         return self.search_file(
             filename,
             ['', '.jpg', '.png'],
-            datadirs=self.get_datadirs('img'),
+            datadirs=self.iter_datadirs('img'),
             )
 
     def search_partition(self, filename):
@@ -263,7 +263,7 @@ class Song:
         return self.search_file(
             filename,
             ['', '.ly'],
-            datadirs=self.get_datadirs('scores'),
+            datadirs=self.iter_datadirs('scores'),
             )
 
 def unprefixed_title(title, prefixes):

patacrep/songs/chordpro/__init__.py

@@ -48,14 +48,9 @@ class ChordproSong(Song):
             "content": self.cached['song'].content,
             }
 
-        jinjaenv = Environment(loader=ChoiceLoader([
+        jinjaenv = Environment(loader=FileSystemLoader(
-            FileSystemLoader(
+            self.iter_datadirs("templates", "songs", "chordpro", self.output_language)
-                self.get_datadirs(os.path.join("templates", self.output_language))
+            ))
-            ),
-            FileSystemLoader(
-                pkg_datapath('ast_templates', 'chordpro', self.output_language)
-            ),
-            ]))
         jinjaenv.filters['search_image'] = self.search_image
         jinjaenv.filters['search_partition'] = self.search_partition
         jinjaenv.filters['lang2babel'] = lang2babel

setup.py

@@ -4,10 +4,14 @@
 
 $ python setup.py install
 """
-from patacrep import __version__
+from patacrep import __version__, __DATADIR__, files
 
 from setuptools import setup, find_packages
 
+# List the data files
+data_files = files.recursive_find(__DATADIR__)
+data_files = ["data/" + d for d in data_files]
+
 setup(
     name='patacrep',
     version=__version__,
@@ -21,12 +25,7 @@ setup(
         "unidecode", "jinja2", "chardet", "ply",
         ],
     setup_requires=["hgtools"],
-    package_data={'patacrep': [
+    package_data={'patacrep': data_files},
-        'data/ast_templates/*/*/*',
-        'data/img/*',
-        'data/latex/*',
-        'data/templates/*',
-        ]},
     entry_points={
         'console_scripts': [
             "songbook = patacrep.songbook.__main__:main",

test/test_chordpro/test_parser.py

@@ -7,7 +7,7 @@ import os
 import unittest
 from pkg_resources import resource_filename
 
-from patacrep import files
+from patacrep import files, __DATADIR__
 from patacrep.build import DEFAULT_CONFIG
 from patacrep.encoding import open_read
 
@@ -41,6 +41,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
         if 'datadir' not in cls.config:
             cls.config['datadir'] = []
         cls.config['datadir'].append(resource_filename(__name__, 'datadir'))
+        cls.config['datadir'].append(__DATADIR__)
 
         cls.song_plugins = files.load_plugins(
             datadirs=cls.config['datadir'],