X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/70dd8cb8ca032fbf50592ff391afb3dffd1d2970..dec2b6f06be97c498010e0b3af0d27f27631142d:/apps/wolnelektury_core/management/commands/localepack.py

diff --git a/apps/wolnelektury_core/management/commands/localepack.py b/apps/wolnelektury_core/management/commands/localepack.py
index 79bcdf4b7..f7b6bb3b9 100644
--- a/apps/wolnelektury_core/management/commands/localepack.py
+++ b/apps/wolnelektury_core/management/commands/localepack.py
@@ -9,6 +9,7 @@ import os
 import shutil
 import tempfile
 import sys
+import zipfile
 
 import allauth
 
@@ -46,13 +47,16 @@ class AppLocale(Locale):
             lc = lc[0]
             if os.path.exists(os.path.join(self.path, 'locale', lc)):
                 shutil.copy2(os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po'),
-                         os.path.join(output_directory, lc, self.name + '.po'))
+                          os.path.join(output_directory, lc, self.name + '.po'))
 
     def load(self, input_directory, languages):
         for lc in zip(*languages)[0]:
             if os.path.exists(os.path.join(input_directory, lc, self.name + '.po')):
+                out = os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po')
+                if not os.path.exists(os.path.dirname(out)):
+                    os.makedirs(os.path.dirname(out))
                 shutil.copy2(os.path.join(input_directory, lc, self.name + '.po'),
-                             os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po'))
+                             out)
 
     def generate(self, languages):
         wd = os.getcwd()
@@ -130,14 +134,29 @@ class Command(BaseCommand):
         make_option('-L', '--lang', help='load just one language', dest='lang', default=None),
         make_option('-d', '--directory', help='load from this directory', dest='directory', default=None),
         make_option('-o', '--outfile', help='Resulting zip file', dest='outfile', default='./wl-locale.zip'),
-        make_option('-m', '--merge', help='Use git to merge. Please use with clean working directory.', dest='merge', default=False),
+        make_option('-m', '--merge', help='Use git to merge. Please use with clean working directory.', action='store_true', dest='merge', default=False),
+        make_option('-M', '--message', help='commit message', dest='message', default='New locale'),
+
         )
     help = 'Make a locale pack'
     args = ''
 
+    def current_rev(self):
+        return os.popen('git rev-parse HEAD').read()
+
+    def current_branch(self):
+        return os.popen("git branch |grep '^[*]' | cut -c 3-").read()
+
     def save(self, options):
+        packname = options.get('outfile')
+        packname_b = os.path.basename(packname).split('.')[0]
+        fmt = '.'.join(os.path.basename(packname).split('.')[1:])
+
+        if fmt != 'zip':
+            raise NotImplementedError('Sorry. Only zip format supported at the moment.')
+
         tmp_dir = tempfile.mkdtemp('-wl-locale')
-        out_dir = os.path.join(tmp_dir, 'wl-locale')
+        out_dir = os.path.join(tmp_dir, packname)
         os.mkdir(out_dir)
 
         try:
@@ -150,23 +169,23 @@ class Command(BaseCommand):
                 #                src.save(settings.LANGUAGES)
 
             # write out revision
-            rev = os.popen('git rev-parse HEAD').read()
+            rev = self.current_rev()
             rf = open(os.path.join(out_dir, '.revision'), 'w')
             rf.write(rev)
             rf.close()
 
-            packname = options.get('outfile')
-            packname_b = os.path.basename(packname).split('.')[0]
-            fmt = '.'.join(os.path.basename(packname).split('.')[1:])
-            shutil.make_archive(packname_b, fmt, root_dir=os.path.dirname(out_dir), base_dir=os.path.basename(out_dir))
+
+            cwd = os.getcwd()
+            try:
+                os.chdir(os.path.dirname(out_dir))
+                self.system('zip -r %s %s' % (os.path.join(cwd, packname_b+'.zip'), os.path.basename(out_dir)))
+            finally:
+                os.chdir(cwd)
+                #            shutil.make_archive(packname_b, fmt, root_dir=os.path.dirname(out_dir), base_dir=os.path.basename(out_dir))
         finally:
             shutil.rmtree(tmp_dir, ignore_errors=True)
 
     def load(self, options):
-        if not options['directory'] or not os.path.exists(options['directory']):
-            print "Directory not provided or does not exist, please use -d"
-            sys.exit(1)
-
         langs = get_languages(options['lang'])
 
         for src in SOURCES:
@@ -174,6 +193,33 @@ class Command(BaseCommand):
 
     def handle(self, *a, **options):
         if options['load']:
+            if not options['directory'] or not os.path.exists(options['directory']):
+                print "Directory not provided or does not exist, please use -d"
+                sys.exit(1)
+                
+            if options['merge']: self.merge_setup(options['directory'])
             self.load(options)
+            if options['merge']: self.merge_finish(options['message'])
         else:
             self.save(options)
+
+    merge_branch = 'wl-locale-merge'
+    last_branch = None
+    
+    def merge_setup(self, directory):
+        self.last_branch = self.current_branch()
+        rev = open(os.path.join(directory, '.revision')).read()
+
+        self.system('git checkout -b %s %s' % (self.merge_branch, rev))
+
+    def merge_finish(self, message):
+        self.system('git commit -a -m "%s"' % message.replace('"', '\\"'))
+        self.system('git checkout %s' % self.last_branch)
+        self.system('git merge -s recursive -X theirs %s' % self.merge_branch)
+        self.system('git branch -d %s' % self.merge_branch)
+
+    def system(self, fmt, *args):
+        code = os.system(fmt % args)
+        if code != 0:
+            raise OSError('Command %s returned with exit code %d' % (fmt % args, code))
+        return code