Works

hazard157 · Jul 5, 2023 · 381a945 · 381a945
1 parent 3773b5a
commit 381a945
Show file tree

Hide file tree

Showing 147 changed files with 4,040 additions and 1,381 deletions.
diff --git a/com.hazard157.prisex24/META-INF/MANIFEST.MF b/com.hazard157.prisex24/META-INF/MANIFEST.MF
@@ -25,6 +25,9 @@ Export-Package: com.hazard157.prisex24,
  com.hazard157.prisex24.e4.uiparts.pleps,
  com.hazard157.prisex24.e4.uiparts.refbooks,
  com.hazard157.prisex24.e4.uiparts.welcome,
+ com.hazard157.prisex24.explorer.filters,
+ com.hazard157.prisex24.explorer.pdu,
+ com.hazard157.prisex24.explorer.pdu.impl,
  com.hazard157.prisex24.glib,
  com.hazard157.prisex24.glib.dialogs,
  com.hazard157.prisex24.glib.fravisum,

diff --git a/com.hazard157.prisex24/dev-docs/devel-episodes.txt b/com.hazard157.prisex24/dev-docs/devel-episodes.txt
@@ -0,0 +1,4 @@
+
+=== Part EpisodeMaster, mastering
+
+
diff --git a/com.hazard157.prisex24/dev-docs/devel-perspectives.txt b/com.hazard157.prisex24/dev-docs/devel-perspectives.txt
@@ -1,14 +1,13 @@
 
-=== Perspective INTRO/WELCOME
+=== project tree, statistics, audit and validation
 
-=== Perspective PLANING
+=== query explorer
 
-=== Perspective OUTPUT media
+=== episode output media browser & creation
+    trailers
+    audio
+    fragments
 
-=== Perspective Media browser
 
-=== Perspective Mastering
-
-Timeline ???
 
 
diff --git a/com.hazard157.prisex24/dev-docs/devel-pleps.txt b/com.hazard157.prisex24/dev-docs/devel-pleps.txt
@@ -0,0 +1,3 @@
+
+--- Stir: add special STIR kind "pose change", short and displays other way ini timeline, also may be hidden from PLEP
+--- 
diff --git a/com.hazard157.prisex24/dev-docs/devel-snippets.txt b/com.hazard157.prisex24/dev-docs/devel-snippets.txt
diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/ICofsFilms.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/ICofsFilms.java
@@ -6,7 +6,7 @@
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 
 /**
  * COFS - access to the output film files.
@@ -22,18 +22,18 @@ public interface ICofsFilms {
    * @return {@link IList}&lt;{@link File}&gt; - film media files with their stored params
    * @throws TsNullArgumentRtException any argument = <code>null</code>
    */
-  IList<OptedFile> listFilms( IOptionSet aParams );
+  IList<IOptedFile> listFilms( IOptionSet aParams );
 
   /**
    * Returns the GIF-animated summary of the film.
    * <p>
    * Creates new GIF-animation if there is no one or film was changed after last GIF creation.
    *
-   * @param aFilmFile {@link OptedFile} - film file
+   * @param aFilmFile {@link IOptedFile} - film file
    * @return {@link File} - summary GIF file or <code>null</code> if can not be created
    * @throws TsNullArgumentRtException any argument = <code>null</code>
    */
-  File getSummaryGif( OptedFile aFilmFile );
+  File getSummaryGif( IOptedFile aFilmFile );
 
   /**
    * Returns the Kdenlive project file without existence check.

diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/ICofsGazes.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/ICofsGazes.java
@@ -5,7 +5,7 @@
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 
 /**
  * COFS - access to the gaze source and output media files.
@@ -21,9 +21,9 @@ public interface ICofsGazes {
    *
    * @param aDate {@link LocalDate} - the gaze date
    * @param aMediaKind {@link EIncidentMediaKind} - the requested media kind
-   * @return {@link IList}&lt;{@link OptedFile}&gt; - all files in date directory
+   * @return {@link IList}&lt;{@link IOptedFile}&gt; - all files in date directory
    * @throws TsNullArgumentRtException any argument = <code>null</code>
    */
-  IList<OptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMediaKind );
+  IList<IOptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMediaKind );
 
 }
diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/ICofsMingles.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/ICofsMingles.java
@@ -5,7 +5,7 @@
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 
 /**
  * COFS - access to the mingle source and output media files.
@@ -21,9 +21,9 @@ public interface ICofsMingles {
    *
    * @param aDate {@link LocalDate} - the mingle date
    * @param aMediaKind {@link EIncidentMediaKind} - the requested media kind
-   * @return {@link IList}&lt;{@link OptedFile}&gt; - all files in date directory
+   * @return {@link IList}&lt;{@link IOptedFile}&gt; - all files in date directory
    * @throws TsNullArgumentRtException any argument = <code>null</code>
    */
-  IList<OptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMediaKind );
+  IList<IOptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMediaKind );
 
 }
diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/ICofsTrailers.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/ICofsTrailers.java
@@ -5,7 +5,7 @@
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 
 /**
  * COFS - access to the episode trailer files.
@@ -23,28 +23,28 @@ public interface ICofsTrailers {
    * @return {@link IList}&lt;{@link File}&gt; - trailer media files with their stored params
    * @throws TsNullArgumentRtException any argument = <code>null</code>
    */
-  IList<OptedFile> listEpisodeTrailerFiles( String aEpisodeId );
+  IList<IOptedFile> listEpisodeTrailerFiles( String aEpisodeId );
 
   /**
    * Finds in {@link #listEpisodeTrailerFiles(String)} specified trailer file.
    *
    * @param aEpisodeId String - the episode ID
    * @param aTrailerName String trailer file name without extension
-   * @return {@link OptedFile} - found file or <code>null</code>
+   * @return {@link IOptedFile} - found file or <code>null</code>
    * @throws TsNullArgumentRtException any argument = <code>null</code>
    */
-  OptedFile findTrailerFile( String aEpisodeId, String aTrailerName );
+  IOptedFile findTrailerFile( String aEpisodeId, String aTrailerName );
 
   /**
    * Returns the GIF-animated summary of the trailer.
    * <p>
    * Creates new GIF-animation if there is no one or trailer was changed after last GIF creation.
    *
-   * @param aTrailerFile {@link OptedFile} - trailer file
+   * @param aTrailerFile {@link IOptedFile} - trailer file
    * @return {@link File} - summary GIF file or <code>null</code> if can not be created
    * @throws TsNullArgumentRtException any argument = <code>null</code>
    */
-  File getSummaryGif( OptedFile aTrailerFile );
+  File getSummaryGif( IOptedFile aTrailerFile );
 
   /**
    * Returns the Kdenlive project file without existence check.

diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/IPsxCofs.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/IPsxCofs.java
@@ -6,7 +6,7 @@
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 
 /**
  * Access to the PRISEX file resources in COFS (Cloud Optimized File System).
@@ -94,15 +94,15 @@ public interface IPsxCofs {
    * videos - animated GIF, for other types - just file type icon. For video files creates new GIF-animation if there is
    * no one or video file was changed after last GIF creation.
    * <p>
-   * The parameters {@link OptedFile#params()} may contain additional information about summary file, like which part of
-   * video to use for GIF-animation.
+   * The parameters {@link IOptedFile#params()} may contain additional information about summary file, like which part
+   * of video to use for GIF-animation.
    * <p>
    * Summary files (if specially created) are places in the COFS cache directory.
    *
-   * @param aMediaFile {@link OptedFile} - the GAZE media file
+   * @param aMediaFile {@link IOptedFile} - the GAZE media file
    * @return {@link File} - an existing image file or <code>null</code> if can not be created
    */
-  File ensureSummaryImage( OptedFile aMediaFile );
+  File ensureSummaryImage( IOptedFile aMediaFile );
 
   // ------------------------------------------------------------------------------------
   // yet unsorted may be put in some helper interfaces

diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/CofsFilms.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/CofsFilms.java
@@ -12,7 +12,7 @@
 import org.toxsoft.core.tslib.utils.errors.*;
 import org.toxsoft.core.tslib.utils.files.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 import com.hazard157.prisex24.cofs.*;
 
 /**
@@ -51,19 +51,19 @@ private static File filmGifFile( File aFilmFile ) {
   //
 
   @Override
-  public IList<OptedFile> listFilms( IOptionSet aParams ) {
+  public IList<IOptedFile> listFilms( IOptionSet aParams ) {
     TsNullArgumentRtException.checkNull( aParams );
-    IListBasicEdit<OptedFile> result = new SortedElemLinkedBundleList<>();
+    IListBasicEdit<IOptedFile> result = new SortedElemLinkedBundleList<>();
     if( OPDEF_FILMS_QP_INCLUDE_LEGACY.getValue( aParams ).asBool() ) {
       File legacyDir = new File( FILMS_ROOT, SUBDIR_LEGACY );
-      result.addAll( OptedFile.list( legacyDir, IMediaFileConstants.FF_VIDEOS ) );
+      result.addAll( OptedFileUtils.list( legacyDir, IMediaFileConstants.FF_VIDEOS ) );
     }
-    result.addAll( OptedFile.list( FILMS_ROOT, IMediaFileConstants.FF_VIDEOS ) );
+    result.addAll( OptedFileUtils.list( FILMS_ROOT, IMediaFileConstants.FF_VIDEOS ) );
     return result;
   }
 
   @Override
-  public File getSummaryGif( OptedFile aFilmFile ) {
+  public File getSummaryGif( IOptedFile aFilmFile ) {
     TsNullArgumentRtException.checkNull( aFilmFile );
     File gifFile = filmGifFile( aFilmFile.file() );
     return PsxCofsUtils.ensureSummaryGif( aFilmFile, gifFile );

diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/CofsGazes.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/CofsGazes.java
@@ -10,7 +10,7 @@
 import org.toxsoft.core.tslib.utils.errors.*;
 import org.toxsoft.core.tslib.utils.files.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 import com.hazard157.prisex24.cofs.*;
 
 /**
@@ -37,7 +37,7 @@ public CofsGazes() {
   //
 
   @Override
-  public IList<OptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMediaKind ) {
+  public IList<IOptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMediaKind ) {
     TsNullArgumentRtException.checkNulls( aDate, aMediaKind );
     File mediaDir;
     switch( aMediaKind ) {
@@ -58,7 +58,7 @@ public IList<OptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMed
       default:
         throw new TsNotAllEnumsUsedRtException( aMediaKind.id() );
     }
-    IListBasicEdit<OptedFile> ll = new SortedElemLinkedBundleList<>();
+    IListBasicEdit<IOptedFile> ll = new SortedElemLinkedBundleList<>();
     if( TsFileUtils.isDirReadable( mediaDir ) ) {
       IList<File> ff = TsFileUtils1.collectFilesInSubtree( mediaDir, TsFileFilter.FF_FILES );
       for( File f : ff ) {

diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/CofsMingles.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/CofsMingles.java
@@ -10,7 +10,7 @@
 import org.toxsoft.core.tslib.utils.errors.*;
 import org.toxsoft.core.tslib.utils.files.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 import com.hazard157.prisex24.cofs.*;
 
 /**
@@ -37,7 +37,7 @@ public CofsMingles() {
   //
 
   @Override
-  public IList<OptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMediaKind ) {
+  public IList<IOptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMediaKind ) {
     TsNullArgumentRtException.checkNulls( aDate, aMediaKind );
     File mediaDir;
     switch( aMediaKind ) {
@@ -58,7 +58,7 @@ public IList<OptedFile> listMediaFiles( LocalDate aDate, EIncidentMediaKind aMed
       default:
         throw new TsNotAllEnumsUsedRtException( aMediaKind.id() );
     }
-    IListBasicEdit<OptedFile> ll = new SortedElemLinkedBundleList<>();
+    IListBasicEdit<IOptedFile> ll = new SortedElemLinkedBundleList<>();
     if( TsFileUtils.isDirReadable( mediaDir ) ) {
       IList<File> ff = TsFileUtils1.collectFilesInSubtree( mediaDir, TsFileFilter.FF_FILES );
       for( File f : ff ) {

diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/CofsTrailers.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/CofsTrailers.java
@@ -12,7 +12,7 @@
 import org.toxsoft.core.tslib.utils.errors.*;
 import org.toxsoft.core.tslib.utils.files.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 import com.hazard157.prisex24.cofs.*;
 import com.hazard157.psx.proj3.incident.*;
 
@@ -69,7 +69,7 @@ private static File episodeDir( String aEpisodeId ) {
   //
 
   @Override
-  public IList<OptedFile> listEpisodeTrailerFiles( String aEpisodeId ) {
+  public IList<IOptedFile> listEpisodeTrailerFiles( String aEpisodeId ) {
     File epDir = episodeDir( aEpisodeId );
     if( epDir == null ) {
       return IList.EMPTY;
@@ -79,15 +79,15 @@ public IList<OptedFile> listEpisodeTrailerFiles( String aEpisodeId ) {
       return IList.EMPTY;
     }
     // collect video files
-    IListBasicEdit<OptedFile> result = new SortedElemLinkedBundleList<>();
-    result.addAll( OptedFile.list( trDir, IMediaFileConstants.FF_VIDEOS ) );
+    IListBasicEdit<IOptedFile> result = new SortedElemLinkedBundleList<>();
+    result.addAll( OptedFileUtils.list( trDir, IMediaFileConstants.FF_VIDEOS ) );
     return result;
   }
 
   @Override
-  public OptedFile findTrailerFile( String aEpisodeId, String aTrailerName ) {
+  public IOptedFile findTrailerFile( String aEpisodeId, String aTrailerName ) {
     TsNullArgumentRtException.checkNulls( aEpisodeId, aTrailerName );
-    for( OptedFile f : listEpisodeTrailerFiles( aEpisodeId ) ) {
+    for( IOptedFile f : listEpisodeTrailerFiles( aEpisodeId ) ) {
       String bareName = TsFileUtils.extractBareFileName( f.file().getName() );
       if( bareName.equals( aTrailerName ) ) {
         return f;
@@ -97,7 +97,7 @@ public OptedFile findTrailerFile( String aEpisodeId, String aTrailerName ) {
   }
 
   @Override
-  public File getSummaryGif( OptedFile aTrailerFile ) {
+  public File getSummaryGif( IOptedFile aTrailerFile ) {
     TsNullArgumentRtException.checkNull( aTrailerFile );
     // extract episode date from trailer file path
     String episodeId = episodeIdFormTrailerFile( aTrailerFile.file() );

diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/IPsxCofsInternalConstants.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/IPsxCofsInternalConstants.java
@@ -16,7 +16,7 @@
 import org.toxsoft.core.tslib.coll.primtypes.impl.*;
 import org.toxsoft.core.tslib.utils.files.*;
 
-import com.hazard157.common.incub.fs.*;
+import com.hazard157.common.incub.opfil.*;
 
 /**
  * Constants with persistent values.

diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/PsxCofs.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/cofs/impl/PsxCofs.java
@@ -10,12 +10,11 @@
 
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.coll.impl.*;
-import org.toxsoft.core.tslib.coll.primtypes.impl.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 import org.toxsoft.core.tslib.utils.files.*;
 
-import com.hazard157.common.incub.fs.*;
-import com.hazard157.common.utils.mop.*;
+import com.hazard157.common.incub.opfil.*;
+import com.hazard157.common.quants.mop.*;
 import com.hazard157.prisex24.cofs.*;
 import com.hazard157.psx.common.utils.*;
 import com.hazard157.psx.proj3.incident.*;
@@ -80,7 +79,7 @@ public ICofsMingles cofsMingles() {
   }
 
   @Override
-  public File ensureSummaryImage( OptedFile aMediaFile ) {
+  public File ensureSummaryImage( IOptedFile aMediaFile ) {
     TsNullArgumentRtException.checkNull( aMediaFile );
     EMediaFileKind fileKind = EMediaFileKind.determineFileKind( aMediaFile.file() );
     switch( fileKind ) {
@@ -117,7 +116,7 @@ public IList<File> listEpisodeKdenliveProjects( String aEpisodeId ) {
     if( !TsFileUtils.isDirReadable( epDir ) ) {
       return IList.EMPTY;
     }
-    IList<File> allProjFiles = TsFileUtils1.collectFilesInSubtree( epDir, new SingleStringList( KDENLIVE_EXT ) );
+    IList<File> allProjFiles = TsFileUtils1.collectFilesInSubtree( epDir, TsFileFilter.ofFileExt( KDENLIVE_EXT ) );
     if( allProjFiles.isEmpty() ) {
       return IList.EMPTY;
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@

		--- Stir: add special STIR kind "pose change", short and displays other way ini timeline, also may be hidden from PLEP
		---