update import 4

diff --git a/env/exp.env b/env/exp.env
new file mode 100644 (file)
index 0000000..c35c8f5
--- /dev/null
+++ b/env/exp.env
@@ -0,0 +1,14 @@
+DEBUG=False
+
+DB_PORT=5432
+DB_HOST=db
+POSTGRES_HOST=db
+POSTGRES_PASSWORD=mysecretpassword
+POSTGRES_DATABASE=teleforma
+POSTGRES_DB=teleforma
+POSTGRES_USER=teleforma
+POSTGRES_HOST_AUTH_METHOD=trust
+
+DB_HOST_RECOVERY=db-recovery
+POSTGRES_HOST_RECOVERY=db-recovery
+POSTGRES_PASSWORD_RECOVERY=EtOdlerlOt8ob

diff --git a/env/exp.yml b/env/exp.yml
new file mode 100644 (file)
index 0000000..52b9196
--- /dev/null
+++ b/env/exp.yml
@@ -0,0 +1,70 @@
+services:
+  app:
+    build:
+      context: .
+      args:
+        dev: 0
+    command: /bin/sh /srv/app/wsgi.sh
+    restart: unless-stopped
+    env_file:
+      - env/exp.env
+    volumes:
+      - /mnt/crfpa-videos:/mnt/crfpa-videos
+      - ./pyproject.toml:/srv/pyproject.toml
+      - ./poetry.lock:/srv/poetry.lock
+      - /mnt/crfpa-items:/mnt/crfpa-items
+    ports:
+      - "9021:8000"
+    networks:
+      - teleforma-exp
+  
+  channels:
+    build:
+      context: .
+      args:
+        dev: 0
+    command: /bin/sh /srv/app/asgi.sh
+    restart: unless-stopped
+    volumes:
+      - ./app/:/srv/app
+      - ./bin:/srv/bin
+      - ./lib:/srv/lib
+      - ./teleforma/:/srv/src/teleforma/teleforma
+      - ./var/log/app:/var/log/app
+      - ./var/run/app:/var/run/app
+    ports:
+      - "9022:8000"
+    links:
+      - db
+      - redis
+    env_file:
+      - env/exp.env
+    networks:
+      - teleforma-exp
+
+  db:
+    restart: unless-stopped
+    env_file:
+      - env/exp.env
+    networks:
+      - teleforma-exp
+
+  redis:
+    restart: unless-stopped
+    networks:
+      - teleforma-exp
+
+  memcached:
+    restart: unless-stopped
+    networks:
+      - teleforma-exp
+
+volumes:
+    app:
+    channels:
+    db:
+    redis:
+
+networks:
+  teleforma-exp:
+    driver: bridge

diff --git a/lib/pdfannotator b/lib/pdfannotator
index 1f161760779798d79a9c0c073f15044c2bcc6e46..70e1f1833f63cb9105659b431357be580cdfc659 160000 (submodule)
--- a/lib/pdfannotator
+++ b/lib/pdfannotator
@@ -1 +1 @@
-Subproject commit 1f161760779798d79a9c0c073f15044c2bcc6e46
+Subproject commit 70e1f1833f63cb9105659b431357be580cdfc659

diff --git a/teleforma/management/commands/teleforma-import-conferences-4.py b/teleforma/management/commands/teleforma-import-conferences-4.py
index 06c576dccff9981229df92daeebcd99945f3eb77..89e599ed1c521ed4b1a1bee9f42e6f6bd34c4a98 100644 (file)
--- a/teleforma/management/commands/teleforma-import-conferences-4.py
+++ b/teleforma/management/commands/teleforma-import-conferences-4.py
@@ -39,7 +39,6 @@ class Command(BaseCommand):
         log_file = args[2]
         logger = Logger(log_file)
         file_list = []
-        i = 1
 
         organization = Organization.objects.get(name=organization_name)
         department = Department.objects.get(name=department_name,
@@ -56,16 +55,13 @@ class Command(BaseCommand):
                 str(conference.date_begin.year),
                 self.spacer.join([
                     conference.course.code,
-                    conference.course_type]),
+                    str(conference.course_type)]),
                 conference.public_id])
 
             # check
             exist = False
-            medias = conference.media.all()
-            for media in medias:
-                if media.file == path:
-                    exist = True
-                    break
+            if conference.media.all():
+                exist = True
 
             streaming = False
             try:
@@ -75,11 +71,11 @@ class Command(BaseCommand):
             except:
                 pass
 
-            # omport
+            # import
             if os.path.exists(conf_dir) and not exist and not streaming:
                 files = os.listdir(conf_dir)
 
-                for media_format in media_formats:
+                for media_format in self.media_formats:
                     media = Media(conference=conference)
                     media.course = conference.course
                     media.period = conference.period
@@ -95,7 +91,7 @@ class Command(BaseCommand):
                         # POSTER
                         if ext[1:] in self.image_formats:
                             media.poster_file = rel_path
-                            break
+                            logger.logger.info(rel_path)
 
                         # MEDIA FILE
                         if ext[1:] in self.media_formats:
@@ -106,10 +102,8 @@ class Command(BaseCommand):
                                 media.file_s3.save(filename, File(f))
                             media.set_mime_type()
                             media.save()
+                            logger.logger.info(rel_path)
 
                 conference.imported = True
                 conference.save()
 
-                logger.logger.info(path)
-                i += 1
-