remove non-functional sonar support

2022-04-15 16:39:23 +02:00 · 2022-04-15 16:39:23 +02:00 · 278be017f6
parent 190e6af80f
commit 278be017f6
7 changed files with 35 additions and 4910 deletions
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@ -38,16 +38,3 @@ jobs:
        cd builddir
        meson .. --prefix=/opt/efl
        ninja
-
-  sonarcloud:
-    name: SonarCloud
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@ -1,50 +0,0 @@
-name: Sonar
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [opened, synchronize, reopened]
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    env:
-      SONAR_SCANNER_VERSION: 4.7.0.2747
-      SONAR_SERVER_URL: "https://sonarcloud.io"
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-    - name: Install dependencies
-      run: |
-        sudo apt-get -qq update
-        sudo apt install build-essential meson ninja-build python3-pip python3-setuptools
-        pip3 install --upgrade pip
-        pip3 install meson --user
-        sudo apt install libssl-dev libsystemd-dev libjpeg-dev libglib2.0-dev libgstreamer1.0-dev libluajit-5.1-dev libfreetype6-dev libfontconfig1-dev libfribidi-dev libavahi-client-dev libharfbuzz-dev libibus-1.0-dev libx11-dev libxext-dev libxrender-dev libgl1-mesa-dev libopenjp2-7-dev libwebp-dev libgif-dev libtiff5-dev libpoppler-dev libpoppler-cpp-dev libspectre-dev libraw-dev librsvg2-dev libudev-dev libmount-dev libdbus-1-dev libpulse-dev libsndfile1-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxrandr-dev libxtst-dev libxss-dev libgstreamer-plugins-base1.0-dev libscim-dev libxdamage-dev libwebp-dev libunwind-dev libinput-dev
-      - name: Download and set up sonar-scanner
-        env:
-          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
-        run: |
-          mkdir -p $HOME/.sonar
-          curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
-          echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
-      - name: Download and set up build-wrapper
-        env:
-          BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
-        run: |
-          curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/
-          echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
-      - name: Run build-wrapper
-        run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }}<insert_your_clean_build_command>
-      - name: Run sonar-scanner
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
--- a/build_wrapper_output_directory/build-wrapper-dump.json
+++ b/build_wrapper_output_directory/build-wrapper-dump.json
--- a/build_wrapper_output_directory/build-wrapper.log
+++ b/build_wrapper_output_directory/build-wrapper.log
--- a/sonar-project.properties
+++ b/sonar-project.properties
@ -1,6 +0,0 @@
-sonar.projectKey=vtorri_entice
-sonar.organization=vtorri
-sonar.projectName=entice
-sonar.projectVersion=0.0.1
-sonar.sources=src/bin
-sonar.cfamily.build-wrapper-output=build_wrapper_output_directory
--- a/src/bin/entice_image.c
+++ b/src/bin/entice_image.c
@ -100,37 +100,37 @@ _entice_image_anim_cb(void *data)

    sd->frame++;
    fr = (sd->frame % (sd->frame_count)) + 1;
-    if ((sd->frame >= sd->frame_count) && (fr == 1))
-    {
-        int loops;
+    /* if ((sd->frame >= sd->frame_count) && (fr == 1)) */
+    /* { */
+    /*     int loops; */

-        if (evas_object_image_animated_loop_type_get(sd->img) ==
-            EVAS_IMAGE_ANIMATED_HINT_NONE)
-        {
-            sd->timer_anim = NULL;
-            return EINA_FALSE;
-        }
-        sd->loops++;
-        loops = evas_object_image_animated_loop_count_get(sd->img);
-        if (loops != 0) // loop == 0 -> loop forever
-        {
-            if (loops < sd->loops)
-            {
-                sd->timer_anim = NULL;
-                return EINA_FALSE;
-            }
-        }
-    }
+    /*     if (evas_object_image_animated_loop_type_get(sd->img) == */
+    /*         EVAS_IMAGE_ANIMATED_HINT_NONE) */
+    /*     { */
+    /*         sd->timer_anim = NULL; */
+    /*         return EINA_FALSE; */
+    /*     } */
+    /*     sd->loops++; */
+    /*     loops = evas_object_image_animated_loop_count_get(sd->img); */
+    /*     if (loops != 0) // loop == 0 -> loop forever */
+    /*     { */
+    /*         if (loops < sd->loops) */
+    /*         { */
+    /*             sd->timer_anim = NULL; */
+    /*             return EINA_FALSE; */
+    /*         } */
+    /*     } */
+    /* } */

    evas_object_image_animated_frame_set(sd->img, fr);
    t = evas_object_image_animated_frame_duration_get(sd->img, fr, 0);
    sd->timer_anim = ecore_timer_loop_add(t, _entice_image_anim_cb, sd);
-    //ecore_timer_interval_set(sd->anim, t);
+    //ecore_timer_interval_set(sd->timer_anim, t);

    return EINA_FALSE;
 }

-static int
+static void
 _entice_image_anim_handle(Img *sd)
 {
    double t;
@ -143,21 +143,21 @@ _entice_image_anim_handle(Img *sd)
    sd->frame_count = 0;

    if (!evas_object_image_animated_get(sd->img))
-        return 0;
+        return;

    sd->frame_count = evas_object_image_animated_frame_count_get(sd->img);
    if (sd->frame_count < 2)
-        return 0;
+        return;

    t = evas_object_image_animated_frame_duration_get(sd->img, sd->frame, 0);
    sd->timer_anim = ecore_timer_add(t, _entice_image_anim_cb, sd);
-
-    return 1;
+    ERR("timer duration : %f", t);
 }

 static void
 _entice_image_preloaded(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
+    Entice *entice;
    Img *sd;
    int img_w;
    int img_h;
@ -174,6 +174,11 @@ _entice_image_preloaded(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U

    sd->loading = 0;
    entice_image_update(data);
+
+    entice = evas_object_data_get(data, "entice");
+
+    if (entice->config->play_animated)
+        _entice_image_anim_handle(sd);
 }

 static void
@ -462,8 +467,8 @@ entice_image_file_set(Evas_Object *obj, Eina_List *image)
    if (entice->config->best_fit_startup)
        sd->zoom_mode = ENTICE_ZOOM_MODE_FIT;

-    if (entice->config->play_animated)
-        _entice_image_anim_handle(sd);
+    /* if (entice->config->play_animated) */
+    /*     _entice_image_anim_handle(sd); */
 }

 const char *
--- a/src/bin/entice_main.c
+++ b/src/bin/entice_main.c
@ -82,6 +82,8 @@ static const char *_image_ext[] =
    ".heif",
    ".heic",

+    ".jxl",
+
    ".xcf",
    ".xcf.gz",