# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1722034677 -7200
# Node ID 5eeebcbdee22dbc288be95124c312c6e3169d258
# Parent  f6b392c37e10659415ea246fb3b4f5d6943ba6b0
use right version for lucene and make players work again

diff -r f6b392c37e10 -r 5eeebcbdee22 docker/server/config.py
--- a/docker/server/config.py	Tue Jul 23 23:18:21 2024 +0200
+++ b/docker/server/config.py	Sat Jul 27 00:57:57 2024 +0200
@@ -22,7 +22,7 @@
 BASE_STATIC_ROOT = "/static/"
 
 #STREAM_URL = "rtmp://media.iri.centrepompidou.fr/ddc_player/"
-STREAM_URL = 'rtmp://media.iri.centrepompidou.fr/ddc_player/'
+STREAM_URL = 'https://media.iri.centrepompidou.fr/'
 
 
 # Absolute path to the directory that holds media.
diff -r f6b392c37e10 -r 5eeebcbdee22 docker/server/ivysettings.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docker/server/ivysettings.xml	Sat Jul 27 00:57:57 2024 +0200
@@ -0,0 +1,30 @@
+<ivysettings>
+    <settings defaultResolver="default"/>
+    <resolvers>
+        <ibiblio name="local-m2" m2compatible="true"
+                 root="file://${user.home}/.m2/repository"
+                 changingPattern=".*SNAPSHOT"/>
+        <ibiblio name="my-maven" m2compatible="true" root="https://repo1.maven.org/maven2/"/>
+        <!--<ibiblio name="staging" m2compatible="true" root="https://oss.sonatype.org/content/repositorie
+s/orgagileclick-1008"/>-->
+        <ibiblio name="central" m2compatible="true"/>
+
+        <filesystem name="local-m2-publish" m2compatible="true">
+            <artifact
+                    pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[re
+vision](-[classifier]).[ext]"/>
+        </filesystem>
+
+        <filesystem name="local-m2-publish-snapshot" m2compatible="true">
+            <artifact
+                    pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]-SNAPSHOT/[arti
+fact]-[revision]-SNAPSHOT.[ext]"/>
+        </filesystem>
+
+        <chain name="default">
+            <resolver ref="central"/>
+            <resolver ref="my-maven"/>
+            <!--<resolver ref="local-m2"/>-->
+        </chain>
+    </resolvers>
+</ivysettings>
\ No newline at end of file
diff -r f6b392c37e10 -r 5eeebcbdee22 docker/server/requirements.txt
--- a/docker/server/requirements.txt	Tue Jul 23 23:18:21 2024 +0200
+++ b/docker/server/requirements.txt	Sat Jul 27 00:57:57 2024 +0200
@@ -1,11 +1,11 @@
-Django==1.4
-django-extensions==0.8
+#Django==1.4
+#django-extensions==0.8
 django-guardian==1.0.3
 django-oauth==1.1
 django-openid-consumer @ git+https://github.com/jjanssen/django-openid-consumer.git@master
-django-piston==0.2.3
+#django-piston==0.2.3
 django-registration==0.8
-django-social-auth==0.3.10
+#django-social-auth==0.3.10
 django-tagging==0.3.1
 httplib2
 #JCC==2.13
diff -r f6b392c37e10 -r 5eeebcbdee22 docker/server/server.dockerfile
--- a/docker/server/server.dockerfile	Tue Jul 23 23:18:21 2024 +0200
+++ b/docker/server/server.dockerfile	Sat Jul 27 00:57:57 2024 +0200
@@ -14,6 +14,11 @@
 
 # copy the dependencies file to the working directory
 COPY docker/server/requirements.txt .
+COPY docker/server/ivysettings.xml .
+COPY virtualenv/res/src/django-extensions-0.8.tar.gz .
+COPY virtualenv/res/src/django-piston-7c90898072ce-modifed.tar.gz .
+COPY virtualenv/res/src/omab-django-social-auth-v0.3.10-modified.tar.gz .
+COPY virtualenv/res/src/Django-1.4.tar.gz .
 
 ENV JCC_JDK=/usr/lib/jvm/java-11-openjdk
 ENV JCC_LFLAGS="-L/usr/lib/jvm/java-11-openjdk/jre/lib -ljava -L/usr/lib/jvm/java-11-openjdk/jre/lib/server -ljvm"
@@ -24,37 +29,50 @@
 
 RUN \
  apk add --no-cache postgresql-client postgresql-libs libxml2 libxslt libmemcached openjdk11 apache-ant bash jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev && \
- apk add --no-cache --virtual .build-deps build-base postgresql-dev libxml2-dev libxslt-dev linux-headers sed wget patchelf git jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev && \
- wget https://dlcdn.apache.org/lucene/pylucene/pylucene-7.7.1-src.tar.gz && \
- tar zxvf pylucene-7.7.1-src.tar.gz && \
- cd pylucene-7.7.1 && \
- cd jcc && \
- python setup.py install && \
- cd .. && \
- sed -i '1s/^/PREFIX_PYTHON=\/opt\/venv\nANT=JAVA_HOME=\/usr\/lib\/jvm\/java-11-openjdk \/usr\/bin\/ant\nPYTHON=$(PREFIX_PYTHON)\/bin\/python\nJCC=$(PYTHON) -m jcc --shared\nNUM_FILES=8\n/' Makefile && \
- sed -i 's/http:\/\/repo1\.maven\.org\/maven2/https:\/\/repo1.maven.org\/maven2/' lucene-java-7.7.1/lucene/common-build.xml && \
- patchelf --add-needed libjvm.so /opt/venv/lib/python2.7/site-packages/JCC-3.5-py2.7-linux-x86_64.egg/jcc/_jcc2.so && \
- patchelf --add-needed libjvm.so /opt/venv/lib/python2.7/site-packages/JCC-3.5-py2.7-linux-x86_64.egg/libjcc2.so && \
+ apk add --no-cache --virtual .build-deps build-base postgresql-dev libxml2-dev libxslt-dev linux-headers sed wget patchelf git jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev tar && \
+ wget https://archive.apache.org/dist/lucene/pylucene/pylucene-3.6.2-1-src.tar.gz && \
+ tar zxvf pylucene-3.6.2-1-src.tar.gz && \
+ cd pylucene-3.6.2-1 && \
+ pip install jcc && \
+ #cd jcc && \
+ #python setup.py install && \
+ #cd .. && \
+ sed -i '1s/^/PREFIX_PYTHON=\/opt\/venv\nANT=JAVA_HOME=\/usr\/lib\/jvm\/java-11-openjdk \/usr\/bin\/ant\nPYTHON=$(PREFIX_PYTHON)\/bin\/python\nJCC=$(PYTHON) -m jcc --shared --package java.util.function\nNUM_FILES=8\n/' Makefile && \
+ sed -i 's/http:\/\/repo1\.maven\.org\/maven2/https:\/\/repo1.maven.org\/maven2/' lucene-java-3.6.2/lucene/common-build.xml && \
+ sed -i 's/<property name="javac\.source" value="1\.5"\/>/<property name="javac\.source" value="1.6"\/>/' lucene-java-3.6.2/lucene/common-build.xml && \
+ sed -i 's/<property name="javac\.target" value="1\.5"\/>/<property name="javac\.target" value="1.6"\/>/' lucene-java-3.6.2/lucene/common-build.xml && \
+ sed -i 's/<property name="javac\.source\.backwards" value="1\.5"\/>/<property name="javac.source.backwards" value="1.6"\/>/' lucene-java-3.6.2/lucene/common-build.xml && \
+ sed -i 's/<property name="javac\.target\.backwards" value="1\.5"\/>/<property name="javac.target.backwards" value="1.6"\/>/' lucene-java-3.6.2/lucene/common-build.xml && \
+ make ivy && \
+ sed -i 's/^<\/project>/  <ivy:settings file="\/code\/ivysettings.xml"\/>\n<\/project>/' lucene-java-3.6.2/lucene/common-build.xml && \
+ patchelf --add-needed libjvm.so /opt/venv/lib/python2.7/site-packages/jcc/_jcc2.so && \
+ patchelf --add-needed libjvm.so /opt/venv/lib/python2.7/site-packages/libjcc2.so && \
  make && \
  make install && \
  cd /code && \
  wget https://hg.dev.iri-research.org/platform/archive/V01.11.tar.gz && \
  tar zxvf V01.11.tar.gz && \
- cd platform-V01.11/src/ldt && \
- python setup.py sdist && \
- pip install dist/ldt-1.11.tar.gz && \
- cd /code && \
- pip install -r requirements.txt
+ #cd platform-V01.11/src/ldt && \
+ #python setup.py sdist && \
+ #pip install dist/ldt-1.11.tar.gz && \
+ #cd /code && \
+ tar zxvf Django-1.4.tar.gz --strip-components=1 Django-1.4/django && \
+ tar zxvf django-extensions-0.8.tar.gz --strip-components=1 django-extensions-django-extensions-0f498ff/django_extensions && \
+ tar zxvf django-piston-7c90898072ce-modifed.tar.gz --strip-components=1 jespern-django-piston-7c90898072ce/piston && \
+ tar zxvf omab-django-social-auth-v0.3.10-modified.tar.gz --strip-components=1 omab-django-social-auth-db55201/social_auth && \
+ pip install -r requirements.txt && \
+ echo "DONE"
 
-
-FROM docker.io/python:2.7-alpine 
+FROM docker.io/python:2.7-alpine as run_base
 
 COPY --from=builder /opt/venv /opt/venv
-COPY web/tralalere /code/tralalere
+COPY --from=builder /code/django /code/django
+COPY --from=builder /code/social_auth /code/social_auth
+COPY --from=builder /code/platform-V01.11/src/ldt/ldt /code/ldt
+COPY --from=builder /code/piston /code/piston
+COPY --from=builder /code/django_extensions /code/django_extensions
 COPY web/manage.py /code/
 
-
-
 ENV BASEDIR="/code"
 ENV PATH="/opt/venv/bin:$BASEDIR:$PATH"
 
@@ -79,6 +97,10 @@
 ENV PATH="/usr/lib/jvm/java-11-openjdk/jre/bin:$PATH"
 ENV LD_LIBRARY_PATH="/usr/lib/jvm/java-11-openjdk/jre/lib:/usr/lib/jvm/java-11-openjdk/jre/lib/server"
 
+FROM run_base as prod
+
+COPY web/tralalere /code/tralalere
+
 EXPOSE 8000
 
 ENTRYPOINT ["/entrypoint.sh"]
diff -r f6b392c37e10 -r 5eeebcbdee22 docker/web/Caddyfile
--- a/docker/web/Caddyfile	Tue Jul 23 23:18:21 2024 +0200
+++ b/docker/web/Caddyfile	Sat Jul 27 00:57:57 2024 +0200
@@ -9,7 +9,6 @@
     handle /* {
         reverse_proxy server:8000 {
             transport uwsgi {
-                uwsgi_param SCRIPT_NAME /tralalere
                 uwsgi_param UWSGI_SCHEME https
             }
         }
diff -r f6b392c37e10 -r 5eeebcbdee22 web/tralalere/settings.py
--- a/web/tralalere/settings.py	Tue Jul 23 23:18:21 2024 +0200
+++ b/web/tralalere/settings.py	Sat Jul 27 00:57:57 2024 +0200
@@ -301,7 +301,7 @@
 if not "GLOBAL_LOG_LEVEL" in locals():
     GLOBAL_LOG_LEVEL = LOG_LEVEL
 if not "GLOBAL_LOG_HANDLERS" in locals():
-    GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}]
+    GLOBAL_LOG_HANDLERS = [{'handler':logging.StreamHandler, 'format':"%(asctime)s - %(levelname)s : %(message)s"}]
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
diff -r f6b392c37e10 -r 5eeebcbdee22 web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js
--- a/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js	Tue Jul 23 23:18:21 2024 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js	Sat Jul 27 00:57:57 2024 +0200
@@ -53,10 +53,11 @@
     var _this = this;
     this.jwplayer = jwplayer("Musitag-Annotations-Audioplayer");
     this.jwplayer.setup({
-        flashplayer: IriSP.getLib("jwPlayerSWF"),
+        //flashplayer: IriSP.getLib("jwPlayerSWF"),
+        flashplayer: false,
         width: 1,
         height: 1,
-        provider: "rtmp",
+        provider: "html5",
         events: {
             onPause: function() {
                 _this.setPlayState(false);
@@ -136,7 +137,8 @@
     });
     this.$main.find('.Musitag-Annotations-Balloon').click(function() {
         var _el = IriSP.jQuery(this),
-            _audiofile = _el.attr("audio-url").replace(_this.rtmp_streamer,"");
+            _audiofile = _el.attr("audio-url").replace(_this.rtmp_streamer,"https://media.iri.centrepompidou.fr/audio/micro/") + ".mp3";
+            console.log(_audiofile);
         if (_this.annotation_playing) {
             _this.jwplayer.pause();
             _this.loadAudio(_audiofile);
diff -r f6b392c37e10 -r 5eeebcbdee22 web/tralalere/static/tralalere/metadataplayer/MusitagAnnotator.css
--- a/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotator.css	Tue Jul 23 23:18:21 2024 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotator.css	Sat Jul 27 00:57:57 2024 +0200
@@ -58,3 +58,7 @@
 .Musitag-Annotator-TextMessage {
     text-align: center; margin: 20px 200px; font-size: 40px;
 }
+
+#Musitag-Annotations-Audioplayer_jwplayer_controlbar {
+    display: none;
+}
\ No newline at end of file
diff -r f6b392c37e10 -r 5eeebcbdee22 web/tralalere/templates/player.html
--- a/web/tralalere/templates/player.html	Tue Jul 23 23:18:21 2024 +0200
+++ b/web/tralalere/templates/player.html	Sat Jul 27 00:57:57 2024 +0200
@@ -37,7 +37,7 @@
     <script type="text/javascript">
     IriSP.language = "{{ LANGUAGE_CODE }}";
     IriSP.libFiles.defaultDir = "{{STATIC_URL}}tralalere/js";
-    IriSP.libFiles.locations.jwPlayerSWF = "{{STATIC_URL}}tralalere/swf/player.swf";
+    IriSP.libFiles.locations.jwplayer = "{{STATIC_URL}}tralalere/js/jwplayer.js";
     IriSP.widgetsDir = "{{STATIC_URL}}tralalere/metadataplayer";
     var _metadata = {
         url: '{% url ldt.ldt_utils.views.json.project_json_id content.front_project.ldt_id %}',
@@ -86,10 +86,11 @@
         },
         player:{
             type: 'jwplayer',
+            flashplayer: false,
             height: 1, 
             width: 1,
             metadata: _metadata,
-            provider: "rtmp",
+            //provider: "html5",
             live: true,
             autostart: true
         }