video_do.py

zhxhcoder · zhxhcoder · commit 0f47ea61ee3f · 2020-07-01T10:40:32.000+08:00
diff --git a/pyfile/file_unique_hash.py b/pyfile/file_unique_hash.py
@@ -29,8 +29,8 @@ def get_bytes_hash(src_file, Bytes=1024):
     return ret
 
 
-def water_mark(src_dir):
-    video = mp.VideoFileClip(src_dir)
+def water_mark(src_file):
+    video = mp.VideoFileClip(src_file)
 
     logo = (mp.ImageClip("watermark.png")
             .set_duration(video.duration)  # 时长
@@ -42,7 +42,7 @@ def water_mark(src_dir):
 
     print("开始写入水印。。。")
     # mp4文件默认用libx264编码， 比特率单位bps
-    result.write_videofile(re.sub(r'\.mp4$', "_mark.mp4", src_dir), codec="libx264", bitrate="10000000")
+    result.write_videofile(re.sub(r'\.mp4$', "_mark.mp4", src_file), codec="libx264", bitrate="10000000")
     print("写入完成")
 
 
diff --git a/pyregex/txt_regx.py b/pyregex/txt_regx.py
@@ -7,15 +7,15 @@
 
 print(text.group())
 
-print("###############################################")
+print("#######################findall########################")
 
 listMatch = regex.findall(strText)
 print(listMatch)
 
 for index, strMatch in enumerate(listMatch):
     print(str(index) + '--' + strMatch)
 
-print("###############################################")
+print("######################match#########################")
 
 m = re.match(r"(\w+)\s+(\w+)", "Isaac Newton, physicist")
 print(m.group())
@@ -27,15 +27,15 @@
 for strMatch in tGroup:
     print(strMatch)
 
-print("###############################################")
+print("########################search#######################")
 
 str1 = """# print(q)  #<img src="/img.ivsky.com/im.jpg" 
 alt="&#x65F6;&#x5C1A;&#x6444;&#x5F71;&#x56FE;&#x7247;"/> """
 regex1 = re.compile(r'/img.+jpg')  # 匹配6个字符的单词
 
 print(regex1.search(str1).group())
 
-print("###############################################")
+print("######################replace#########################")
 
 url = "https://mtl.gzhuibei.com/images/img/3273/1.jpg"
 finalU = re.sub(r'https.+img', "", url)
diff --git a/pyvideo/video_do.py b/pyvideo/video_do.py
@@ -5,8 +5,8 @@
 import moviepy.editor as mp
 
 
-def water_mark(src_dir):
-    video = mp.VideoFileClip(src_dir)
+def water_mark(src_file):
+    video = mp.VideoFileClip(src_file)
 
     logo = (mp.ImageClip("watermark.png")
             .set_duration(video.duration)  # 时长
@@ -16,10 +16,18 @@ def water_mark(src_dir):
 
     result = mp.CompositeVideoClip([video, logo])
 
-    print("开始写入水印。。。")
+    print(getFileName(src_file) + "-->开始写入水印。。。")
     # mp4文件默认用libx264编码， 比特率单位bps
-    result.write_videofile(re.sub(r'\.mp4$', "_mark.mp4", src_dir), codec="libx264", bitrate="10000000")
-    print("写入完成")
+    result.write_videofile(re.sub(r'\.mp4$', "_mark.mp4", src_file), codec="libx264", bitrate="10000000")
+    print(getFileName(src_file) + "-->写入水印完成")
+
+
+def getFileName(src_file):
+    return re.search(r'[^/]+$', src_file).group()
+
+
+def remove_water_mark(src_dir):
+    pass
 
 
 def traverse_file(src_dir):
diff --git a/pyvideo/watermark.png b/pyvideo/watermark.png
