Merge branch 'master' of https://github.com/iodefog/VipVideo

# Conflicts: # README.md # VipVideo.xcodeproj/project.pbxproj # VipVideo.xcodeproj/xcshareddata/xcschemes/VipVideo.xcscheme # VipVideo/Base.lproj/Main.storyboard # VipVideo/Helper/MainMenu.m # VipVideo/Helper/VipURLManager.h # VipVideo/Helper/VipURLManager.m # VipVideo/Helper/vlist.json # VipVideo/Home/HLHomeViewController.m
iodefog · Feb 10, 2025 · 8a87420 · 8a87420
2 parents d3a9a51 + 52243b8
commit 8a87420
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/VipVideo/Home/HLHomeViewController.m b/VipVideo/Home/HLHomeViewController.m
@@ -431,7 +431,7 @@ - (void)refreshVideoModel:(VipUrlItem *)model{
     else if ([model.url isEqualToString:@"://edit"]) {
         [self showEidtViewWithType:EditType_Platform];
     }
-    else{
+    else {
         NSString *encodingString = [model.url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
         NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:encodingString]];
 

diff --git a/reeditgit.sh b/reeditgit.sh
@@ -0,0 +1,15 @@
+git filter-branch --env-filter '
+OLD_EMAIL="[email protected]"
+CORRECT_NAME="iodefog"
+CORRECT_EMAIL="[email protected]"
+if [ "$GIT_COMMITTER_EMAIL" = "$OLD_EMAIL" ]
+then
+    export GIT_COMMITTER_NAME="$CORRECT_NAME"
+    export GIT_COMMITTER_EMAIL="$CORRECT_EMAIL"
+fi
+if [ "$GIT_AUTHOR_EMAIL" = "$OLD_EMAIL" ]
+then
+    export GIT_AUTHOR_NAME="$CORRECT_NAME"
+    export GIT_AUTHOR_EMAIL="$CORRECT_EMAIL"
+fi
+' --tag-name-filter cat -- --branches --tags