批量添加bom头、批量替换tab字符

477475a6 · xiongziliang · 7bc7d952 · 477475a6 · 477475a6 · 477475a6
Commit 477475a6 authored May 18, 2020 by xiongziliang
--- a/api/include/mk_common.h
+++ b/api/include/mk_common.h
--- a/src/Common/Device.h
+++ b/src/Common/Device.h
--- a/src/Extension/Factory.cpp
+++ b/src/Extension/Factory.cpp
--- a/src/Extension/Opus.cpp
+++ b/src/Extension/Opus.cpp
 /*
 * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Extension/Opus.h
+++ b/src/Extension/Opus.h
 /*
 * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Http/HlsParser.cpp
+++ b/src/Http/HlsParser.cpp
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Http/HlsParser.h
+++ b/src/Http/HlsParser.h
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Http/HlsPlayer.cpp
+++ b/src/Http/HlsPlayer.cpp
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Http/HlsPlayer.h
+++ b/src/Http/HlsPlayer.h
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Http/HttpTSPlayer.cpp
+++ b/src/Http/HttpTSPlayer.cpp
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Http/HttpTSPlayer.h
+++ b/src/Http/HttpTSPlayer.h
 /*
 * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Record/MP4.cpp
+++ b/src/Record/MP4.cpp
 /*
 * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Record/MP4.h
+++ b/src/Record/MP4.h
 /*
 * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Record/MP4Demuxer.cpp
+++ b/src/Record/MP4Demuxer.cpp
 /*
 * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Record/MP4Demuxer.h
+++ b/src/Record/MP4Demuxer.h
 /*
 * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/src/Rtsp/RtspSession.cpp
+++ b/src/Rtsp/RtspSession.cpp
--- a/tests/bom.cpp
+++ b/tests/bom.cpp
@@ -61,40 +61,6 @@ public:
    }
 };
-void get_file_path(const char *path, const char *file_name, char *file_path) {
-    strcpy(file_path, path);
-    if (file_path[strlen(file_path) - 1] != '/') {
-        strcat(file_path, "/");
-    }
-    strcat(file_path, file_name);
-}
-template <typename FUNC>
-void for_each_file(const char *path, FUNC &&func){
-    DIR *dir;
-    dirent *dir_info;
-    char file_path[PATH_MAX];
-    if (File::is_file(path)) {
-        func(path);
-        return;
-    }
-    if (File::is_dir(path)) {
-        if ((dir = opendir(path)) == NULL) {
-            closedir(dir);
-            return;
-        }
-        while ((dir_info = readdir(dir)) != NULL) {
-            if (File::is_special_dir(dir_info->d_name)) {
-                continue;
-            }
-            get_file_path(path, dir_info->d_name, file_path);
-            for_each_file(file_path,std::forward<FUNC>(func));
-        }
-        closedir(dir);
-        return;
-    }
-}
 static const char s_bom[] = "\xEF\xBB\xBF";
 void add_or_rm_bom(const char *file,bool rm_bom){
@@ -159,23 +125,26 @@ int main(int argc, char *argv[]) {
    bool no_filter = filter_set.find("*") != filter_set.end();
    //设置日志
    Logger::Instance().add(std::make_shared<ConsoleChannel>());
-    path = File::absolutePath(path, "");
+    File::scanDir(path, [&](const string &path, bool isDir) {
-    for_each_file(path.data(),[&](const char *path){
+        if (isDir) {
-        if(!no_filter){
+            return true;
+        }
+        if (!no_filter) {
            //开启了过滤器
-            auto pos = strstr(path,".");
+            auto pos = strstr(path.data(), ".");
-            if(pos == nullptr){
+            if (pos == nullptr) {
                //没有后缀
-                return;
+                return true;
            }
            auto ext = pos + 1;
-            if(filter_set.find(ext) == filter_set.end()){
+            if (filter_set.find(ext) == filter_set.end()) {
                //后缀不匹配
-                return;
+                return true;
            }
        }
        //该文件匹配
-        process_file(path,rm_bom);
+        process_file(path.data(), rm_bom);
-    });
+        return true;
+    }, true);
    return 0;
 }
--- a/tests/tab.cpp
+++ b/tests/tab.cpp
@@ -128,8 +128,6 @@ int main(int argc, char *argv[]) {
    bool no_filter = filter_set.find("*") != filter_set.end();
    //设置日志
    Logger::Instance().add(std::make_shared<ConsoleChannel>());
-    path = File::absolutePath(path, "");
-    DebugL << path;
    File::scanDir(path, [&](const string &path, bool isDir) {
        if (isDir) {
            return true;

--- a/tests/test_player.cpp
+++ b/tests/test_player.cpp
 /*
 * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).

--- a/tests/test_rtp.cpp
+++ b/tests/test_rtp.cpp
 /*
 * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
 *
 * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).