Merge lp:~torkvemada/quickly/templatetools into lp:quickly

[Vsevolod Velichko]

Fix for the update_file_contents method, since it is buggy and sometimes creates corrupted files (I faced it when quickly was generating my debian/control depends line).

[lp:~torkvemada/quickly/templatetools]

677. By Vsevolod Velichko on 2012-07-13

templatetools.update_file_content fix for it to set the file coding comment if needed

Unmerged revisions

677. By Vsevolod Velichko on 2012-07-13

templatetools.update_file_content fix for it to set the file coding comment if needed

676. By Vsevolod Velichko on 2012-07-10

Fixed update_file_contents.

=== modified file 'quickly/templatetools.py'
--- quickly/templatetools.py	2011-06-06 10:14:40 +0000
+++ quickly/templatetools.py	2012-07-13 19:00:30 +0000
@@ -108,23 +108,53 @@
 
     skip_until_end_found = False
     marker_found = False
+    prepend_coding_comment = False
+    if filename.endswith('.py'):
+        try:
+            replacing_content.decode('ascii')
+        except UnicodeDecodeError:
+            prepend_coding_comment = True
+
     try:
         filename = os.path.abspath(filename)
         ftarget_file_name = file(filename, 'r')
         ftarget_file_name_out = file(ftarget_file_name.name + '.new', 'w')
+        linenum = 0
         for line in ftarget_file_name:
+            # If we already have some coding sign, don't add
+            if prepend_coding_comment:
+                linenum += 1
+                if line.startswith('# -*- ') and 'coding: ' in line:
+                    prepend_coding_comment = False
+                # If we have initial hashbang instruction, add on second line
+                elif linenum == 1 and line.startswith('#!'):
+                    pass
+                else:
+                    ftarget_file_name_out.write('# -*- coding: utf-8 -*-\n')
+                    prepend_coding_comment = False
+
             # seek if we have to add something
-            if start_marker in line:
-                skip_until_end_found = True
-                marker_found = True
-                ftarget_file_name_out.write(replacing_content)
-
-            if end_marker in line:
-                skip_until_end_found = False
-
-            if not skip_until_end_found:
+            if skip_until_end_found or not marker_found:
+                try:
+                    i = line.index(start_marker)
+                    skip_until_end_found = True
+                    marker_found = True
+                    ftarget_file_name_out.write(line[:i])
+                    ftarget_file_name_out.write(replacing_content)
+                except ValueError:
+                    pass
+                try:
+                    i = line.index(end_marker)
+                    if skip_until_end_found:
+                        ftarget_file_name_out.write(line[i:])
+                    skip_until_end_found = False
+                except ValueError:
+                    if not skip_until_end_found:
+                        ftarget_file_name_out.write(line)
+            else:
                 ftarget_file_name_out.write(line)
 
+
         ftarget_file_name.close()
         ftarget_file_name_out.close()