download2

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/compress/AbstractSourceCompressor.java

@@ -31,11 +31,11 @@ public abstract class AbstractSourceCompressor<OS extends OutputStream> implemen
      */
     @Override
     public Compression compress(Source source, DownloadWriter writer, DownloadContext context) throws IOException {
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         String cachePath = options.getCompressCachePath();
         String cacheName = getCacheName(source, context);
         boolean cacheEnable = options.isCompressCacheEnabled();
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         //是否启用缓存
         if (cacheEnable) {
             File dir = new File(cachePath);
@@ -77,7 +77,7 @@ public Compression compress(Source source, DownloadWriter writer, DownloadContex
      */
     @SneakyThrows
     public void doCompress(Source source, OutputStream os, DownloadWriter writer, DownloadContext context) {
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new SourceCompressionFormatEvent(context, source, getFormat()));
         try (OS nos = newOutputStream(os, source, context)) {
             Progress progress = new Progress(source.getLength());
@@ -129,7 +129,7 @@ public void doCompress(Source source, OutputStream os, DownloadWriter writer, Do
      * @return 压缩文件缓存名称
      */
     public String getCacheName(Source source, DownloadContext context) {
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         String compressCacheName = options.getCompressCacheName();
         String suffix = getSuffix();
         String nameToUse;

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/concept/AbstractDownloadConcept.java

@@ -37,6 +37,11 @@ public Object download(DownloadOptions options) {
         DownloadContext context = contextFactory.create();
         context.set(DownloadOptions.class, options);
         context.set(DownloadLogger.class, logger);
+        if (options.getAsyncConsumer() == null) {
+            context.set(DownloadMode.class, DownloadMode.SYNC);
+        } else {
+            context.set(DownloadMode.class, DownloadMode.ASYNC);
+        }
         DownloadEventPublisher publisher = delegateDownloadEventPublisher(options);
         context.set(DownloadEventPublisher.class, publisher);
         publisher.publish(new DownloadStartEvent(context));

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/concept/DownloadMode.java

@@ -0,0 +1,12 @@
+package com.github.linyuzai.download.core.concept;
+
+import com.github.linyuzai.download.core.context.DownloadContext;
+
+public enum DownloadMode {
+
+    SYNC, ASYNC;
+
+    public static DownloadMode getMode(DownloadContext context) {
+        return context.get(DownloadMode.class);
+    }
+}

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/event/DownloadEventPublisher.java

@@ -1,10 +1,11 @@
 package com.github.linyuzai.download.core.event;
 
+import com.github.linyuzai.download.core.context.DownloadContext;
+
 /**
  * {@link DownloadEvent} 发布器。
  *
  * @see SimpleDownloadEventPublisher
- * @see ApplicationDownloadEventPublisher
  */
 public interface DownloadEventPublisher {
 
@@ -14,4 +15,8 @@ public interface DownloadEventPublisher {
      * @param event 事件
      */
     void publish(Object event);
+
+    static DownloadEventPublisher get(DownloadContext context) {
+        return context.get(DownloadEventPublisher.class);
+    }
 }

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/handler/impl/AsyncConsumeHandler.java

@@ -1,5 +1,6 @@
 package com.github.linyuzai.download.core.handler.impl;
 
+import com.github.linyuzai.download.core.concept.DownloadMode;
 import com.github.linyuzai.download.core.context.DownloadContext;
 import com.github.linyuzai.download.core.event.DownloadLifecycleListener;
 import com.github.linyuzai.download.core.handler.DownloadHandler;
@@ -11,13 +12,12 @@ public class AsyncConsumeHandler implements DownloadHandler, DownloadLifecycleLi
 
     @Override
     public boolean support(DownloadContext context) {
-        DownloadOptions options = context.get(DownloadOptions.class);
-        return options.getAsyncConsumer() != null;
+        return DownloadMode.getMode(context) == DownloadMode.ASYNC;
     }
 
     @Override
     public Object handle(DownloadContext context, DownloadHandlerChain chain) {
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         options.getAsyncConsumer().accept(context);
         return null;
     }

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/handler/impl/CompressSourceHandler.java

@@ -41,9 +41,9 @@ public class CompressSourceHandler implements DownloadHandler, DownloadLifecycle
     @SneakyThrows
     @Override
     public Object handle(DownloadContext context, DownloadHandlerChain chain) {
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Source source = context.get(Source.class);
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         Compression compression;
         boolean single = source.isSingle();
         boolean forceCompress = options.isForceCompress();
@@ -85,8 +85,8 @@ public void onStart(DownloadContext context) {
     public void onComplete(DownloadContext context) {
         Compression compression = context.get(Compression.class);
         if (compression != null) {
-            DownloadOptions options = context.get(DownloadOptions.class);
-            DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+            DownloadOptions options = DownloadOptions.get(context);
+            DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
             boolean delete = options.isCompressCacheDelete();
             //是否删除缓存
             if (delete) {

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/handler/impl/CreateSourceHandler.java

@@ -33,12 +33,12 @@ public class CreateSourceHandler implements DownloadHandler, DownloadLifecycleLi
      */
     @Override
     public Object handle(DownloadContext context, DownloadHandlerChain chain) {
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Object original = options.getSource();
         SourceFactory factory = sourceFactoryAdapter.getFactory(original, context);
         Source source = factory.create(original, context);
         context.set(Source.class, source);
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new AfterSourceCreatedEvent(context, source));
         return chain.next(context);
     }
@@ -63,8 +63,8 @@ public void onStart(DownloadContext context) {
     public void onComplete(DownloadContext context) {
         Source source = context.get(Source.class);
         if (source != null) {
-            DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
-            DownloadOptions options = context.get(DownloadOptions.class);
+            DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
+            DownloadOptions options = DownloadOptions.get(context);
             boolean delete = options.isSourceCacheDelete();
             //是否删除缓存
             if (delete) {

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/handler/impl/LoadSourceHandler.java

@@ -33,10 +33,9 @@ public class LoadSourceHandler implements DownloadHandler {
     @Override
     public Object handle(DownloadContext context, DownloadHandlerChain chain) {
         Source source = context.get(Source.class);
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         sourceLoader.load(source, context);
         publisher.publish(new AfterSourceLoadedEvent(context, source));
-        //context.set(Source.class, load);
         return chain.next(context);
     }
 }

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/handler/impl/WriteResponseHandler.java

@@ -1,6 +1,7 @@
 package com.github.linyuzai.download.core.handler.impl;
 
 import com.github.linyuzai.download.core.compress.Compression;
+import com.github.linyuzai.download.core.concept.DownloadMode;
 import com.github.linyuzai.download.core.concept.Part;
 import com.github.linyuzai.download.core.concept.Resource;
 import com.github.linyuzai.download.core.context.DownloadContext;
@@ -37,8 +38,7 @@ public class WriteResponseHandler implements DownloadHandler, DownloadLifecycleL
 
     @Override
     public boolean support(DownloadContext context) {
-        DownloadOptions options = context.get(DownloadOptions.class);
-        return options.getAsyncConsumer() == null;
+        return DownloadMode.getMode(context) == DownloadMode.SYNC;
     }
 
     /**
@@ -55,8 +55,8 @@ public boolean support(DownloadContext context) {
     @Override
     public Object handle(DownloadContext context, DownloadHandlerChain chain) {
         Compression compression = context.get(Compression.class);
-        DownloadOptions options = context.get(DownloadOptions.class);
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadOptions options = DownloadOptions.get(context);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         //获得Request
         DownloadRequest request = options.getRequest();
         //获得Response
@@ -98,10 +98,10 @@ public void accept(OutputStream os) {
      * 设置 Content-Type，
      * 设置自定义的响应头。
      *
-     * @param response    {@link DownloadResponse}
+     * @param response {@link DownloadResponse}
      * @param resource {@link Compression}
-     * @param range       {@link Range}
-     * @param context     {@link DownloadContext}
+     * @param range    {@link Range}
+     * @param context  {@link DownloadContext}
      * @return 是否继续处理
      */
     public boolean applyHeaders(DownloadResponse response, Resource resource, Range range, DownloadContext context) {
@@ -140,7 +140,7 @@ public boolean applyHeaders(DownloadResponse response, Resource resource, Range
             }
         }
 
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
 
         //inline 或 attachment
         boolean inline = options.isInline();

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/load/AbstractLoadableSource.java

@@ -57,7 +57,7 @@ public boolean isCacheExisted() {
     @SneakyThrows
     @Override
     public void load(DownloadContext context) {
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         if (inputStream != null) {
             //直接使用
             publisher.publish(new SourceAlreadyLoadedEvent(context, this));

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/load/RemoteLoadableSource.java

@@ -28,7 +28,7 @@ public abstract class RemoteLoadableSource extends AbstractLoadableSource {
     public void doLoad(OutputStream os, DownloadContext context) throws IOException {
         DownloadWriterAdapter writerAdapter = context.get(DownloadWriterAdapter.class);
         DownloadWriter writer = writerAdapter.getWriter(this, context);
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         InputStream is = loadRemote(context);
         Progress progress = new Progress(length);
         writer.write(is, os, null, null, length, (current, increase) -> {

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/logger/LoggingDownloadEventListener.java

@@ -55,7 +55,7 @@ public void log(DownloadContext context, String message) {
      */
     public void log(DownloadContext context, String tag, String message) {
         String info;
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Method method = options.getMethod();
         if (method == null) {
             info = tag + message;

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/options/DownloadOptions.java

@@ -144,7 +144,7 @@ interface Configurer {
         void configure(ConfigurableDownloadOptions options);
     }
 
-    static DownloadOptions getOptions(DownloadContext context) {
+    static DownloadOptions get(DownloadContext context) {
         return context.get(DownloadOptions.class);
     }
 }

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/source/file/FileSourceFactory.java

@@ -21,13 +21,13 @@ public boolean support(Object source, DownloadContext context) {
 
     @Override
     public Source create(Object source, DownloadContext context) {
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Charset charset = options.getCharset();
         FileSource build = new FileSource.Builder<>()
                 .file((File) source)
                 .charset(charset)
                 .build();
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new FileSourceCreatedEvent(context, build));
         return build;
     }

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/source/http/HttpSource.java

@@ -77,7 +77,7 @@ public boolean isSingle() {
     //@SneakyThrows
     @Override
     public InputStream loadRemote(DownloadContext context) throws IOException {
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new LoadHttpSourceEvent(context, this));
         HttpURLConnection connection = getConnection();
         int code = connection.getResponseCode();

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/source/http/HttpSourceFactory.java

@@ -20,7 +20,7 @@ public class HttpSourceFactory extends PrefixSourceFactory {
     @Override
     public Source create(Object source, DownloadContext context) {
         String url = (String) source;
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Charset charset = options.getCharset();
         boolean cacheEnabled = options.isSourceCacheEnabled();
         String cachePath = options.getSourceCachePath();
@@ -31,7 +31,7 @@ public Source create(Object source, DownloadContext context) {
                 .cacheEnabled(cacheEnabled)
                 .cachePath(cachePath)
                 .build();
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new HttpSourceCreatedEvent(context, build));
         return build;
     }

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/source/okhttp/OkHttpSource.java

@@ -24,7 +24,7 @@ public class OkHttpSource extends HttpSource {
 
     @Override
     public InputStream loadRemote(DownloadContext context) throws IOException {
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new LoadOkHttpSourceEvent(context, this));
         Request.Builder rb = new Request.Builder();
         rb.url(url);

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/source/okhttp/OkHttpSourceFactory.java

@@ -31,7 +31,7 @@ public OkHttpSourceFactory() {
     @Override
     public Source create(Object source, DownloadContext context) {
         String url = (String) source;
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Charset charset = options.getCharset();
         boolean cacheEnabled = options.isSourceCacheEnabled();
         String cachePath = options.getSourceCachePath();
@@ -43,7 +43,7 @@ public Source create(Object source, DownloadContext context) {
                 .cacheEnabled(cacheEnabled)
                 .cachePath(cachePath)
                 .build();
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new OkHttpSourceCreatedEvent(context, build));
         return build;
     }

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/source/original/OriginalSourceFactory.java

@@ -17,7 +17,7 @@ public boolean support(Object source, DownloadContext context) {
 
     @Override
     public Source create(Object source, DownloadContext context) {
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new OriginalSourceCreatedEvent(context, (Source) source));
         return (Source) source;
     }

concept-download/concept-download-core/src/main/java/com/github/linyuzai/download/core/source/text/TextSourceFactory.java

@@ -20,14 +20,14 @@ public boolean support(Object source, DownloadContext context) {
 
     @Override
     public Source create(Object source, DownloadContext context) {
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Charset charset = options.getCharset();
         TextSource build = new TextSource.Builder<>()
                 .text((String) source)
                 .name("text.txt")
                 .charset(charset)
                 .build();
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new TextSourceCreatedEvent(context, build));
         return build;
     }

concept-download/concept-download-spring-boot-starter/src/main/java/com/github/linyuzai/download/autoconfigure/source/classpath/ClassPathSourceFactory.java

@@ -21,13 +21,13 @@ public boolean support(Object source, DownloadContext context) {
 
     @Override
     public Source create(Object source, DownloadContext context) {
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Charset charset = options.getCharset();
         ClassPathSource build = new ClassPathSource.Builder<>()
                 .resource((ClassPathResource) source)
                 .charset(charset)
                 .build();
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new ClassPathSourceCreatedEvent(context, build));
         return build;
     }

concept-download/concept-download-spring-boot-starter/src/main/java/com/github/linyuzai/download/autoconfigure/source/reactive/WebClientSource.java

@@ -54,7 +54,7 @@ public Mono<Void> preload(DownloadContext context) {
     }
 
     protected Mono<InputStream> loadInputStream(DownloadContext context) {
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new LoadWebClientSourceEvent(context, this));
         return WebClient.create()
                 .get()

concept-download/concept-download-spring-boot-starter/src/main/java/com/github/linyuzai/download/autoconfigure/source/reactive/WebClientSourceFactory.java

@@ -19,7 +19,7 @@ public class WebClientSourceFactory extends PrefixSourceFactory {
     @Override
     public Source create(Object source, DownloadContext context) {
         String url = (String) source;
-        DownloadOptions options = context.get(DownloadOptions.class);
+        DownloadOptions options = DownloadOptions.get(context);
         Charset charset = options.getCharset();
         boolean cacheEnabled = options.isSourceCacheEnabled();
         String cachePath = options.getSourceCachePath();
@@ -30,7 +30,7 @@ public Source create(Object source, DownloadContext context) {
                 .cacheEnabled(cacheEnabled)
                 .cachePath(cachePath)
                 .build();
-        DownloadEventPublisher publisher = context.get(DownloadEventPublisher.class);
+        DownloadEventPublisher publisher = DownloadEventPublisher.get(context);
         publisher.publish(new WebClientSourceCreatedEvent(context, build));
         return build;
     }