Accepting incoming merge; receiving new svn:ignore property to ignore test import...

[osqa.git] / forum_modules / exporter / views.py

diff --git a/forum_modules/exporter/views.py b/forum_modules/exporter/views.py
index fe8086ff9c38e5dc121bc4a2622e6f3ce2f4eb1b..37090372dbba0b86450e9d5117aacb108610f0a3 100644 (file)
--- a/forum_modules/exporter/views.py
+++ b/forum_modules/exporter/views.py
@@ -14,6 +14,7 @@ import settings as selsettings
 from forum import settings
 
 from exporter import export, CACHE_KEY, EXPORT_STEPS, LAST_BACKUP, DATE_AND_AUTHOR_INF_SECTION, DATETIME_FORMAT
+from importer import start_import
 
 
 @admin_tools_page(_('exporter'), _('XML data export'))
@@ -21,7 +22,7 @@ def exporter(request):
     state = cache.get(CACHE_KEY)
 
     if state and state['running']:
-        return HttpResponseRedirect(reverse('exporter_running'))
+        return HttpResponseRedirect(reverse('exporter_running', kwargs=dict(mode='exporter')))
 
     if request.method == 'POST':
         form = ExporterForm(request.POST)
@@ -31,28 +32,29 @@ def exporter(request):
             thread.setDaemon(True)
             thread.start()
 
-            return HttpResponseRedirect(reverse('exporter_running'))
+            return HttpResponseRedirect(reverse('exporter_running', kwargs=dict(mode='exporter')))
     else:
         form = ExporterForm()
 
     available = []
 
-    #folder = unicode(selsettings.EXPORTER_BACKUP_STORAGE)
-
-    #for f in os.listdir(folder):
-    #    if (not os.path.isdir(os.path.join(folder, f))) and f.endswith('.tar.gz'):
-    #        try:
-    #            tar = tarfile.open(os.path.join(folder, f), "r")
-    #            inf = ConfigParser.SafeConfigParser()
-    #            inf.readfp(tar.extractfile('backup.inf'))
-    #
-    #            if inf.get(DATE_AND_AUTHOR_INF_SECTION, 'site') == settings.APP_URL:
-    #                available.append({
-    #                    'author': User.objects.get(id=inf.get(DATE_AND_AUTHOR_INF_SECTION, 'author')),
-    #                    'date': datetime.strptime(inf.get(DATE_AND_AUTHOR_INF_SECTION, 'finished'), )
-    #                })
-    #        except Exception, e:
-    #            pass
+    folder = unicode(selsettings.EXPORTER_BACKUP_STORAGE)
+
+    for f in os.listdir(folder):
+        if (not os.path.isdir(os.path.join(folder, f))) and f.endswith('.backup.inf'):
+            try:
+                with open(os.path.join(folder, f), 'r') as inffile:
+                    inf = ConfigParser.SafeConfigParser()
+                    inf.readfp(inffile)
+
+                    if inf.get(DATE_AND_AUTHOR_INF_SECTION, 'site') == settings.APP_URL and os.path.exists(
+                                    os.path.join(folder, inf.get(DATE_AND_AUTHOR_INF_SECTION, 'file-name'))):
+                        available.append({
+                            'author': User.objects.get(id=inf.get(DATE_AND_AUTHOR_INF_SECTION, 'author')),
+                            'date': datetime.datetime.strptime(inf.get(DATE_AND_AUTHOR_INF_SECTION, 'finished'), DATETIME_FORMAT)
+                        })
+            except Exception, e:
+                pass
 
     return ('modules/exporter/exporter.html', {
         'form': form,
@@ -60,12 +62,13 @@ def exporter(request):
     })
 
 @admin_page
-def running(request):
+def running(request, mode):
     state = cache.get(CACHE_KEY)
     if state is None:
         return HttpResponseRedirect(reverse('admin_tools', args=[_('exporter')]))
 
     return ('modules/exporter/running.html', {
+        'mode': mode,
         'steps': EXPORT_STEPS
     })
 
@@ -85,4 +88,4 @@ def download(request):
     return response
 
 
-    
+