change scripts position

PangBaiWork · Apr 27, 2024 · d478e87 · d478e87
1 parent a289c33
commit d478e87
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 84 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -79,7 +79,7 @@ git clone https://x-access-token:你的令牌@github.com/your-username/your-repo
 ```shell
 git config --global user.name "yourname"
 git config --global user.email "youremail"
-ssh-keygen -t rsa -C 你的邮箱
+ssh-keygen -t rsa -C  "youremail"
 ``` 
 连续回车两次   
 终端输出完信息后，再执行   

diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ Open the terminal at the bottom of WeBlog and type this.
 ```shell
 git config --global user.name "yourname"
 git config --global user.email "youremail"
-ssh-keygen -t rsa -C your email.
+ssh-keygen -t rsa -C "youremail"
 ```
 Enter twice .    
 After the terminal has finished outputting the message, run  

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
diff --git a/app/src/main/java/com/pangbai/weblog/activity/HomeActivity.java b/app/src/main/java/com/pangbai/weblog/activity/HomeActivity.java
@@ -81,7 +81,6 @@ public void onClick(View v) {
                     AlertDialog dialog = DialogUtils.showLoadingDialog(this);
                     ThreadUtil.thread(() -> {
                         boolean init = projectManager.createProject();
-                       if (init) projectManager.createScript(HomeActivity.this);
                         runOnUiThread(() -> {
                             dialog.dismiss();
                             if (init) {
@@ -117,7 +116,6 @@ public void onClick(View v) {
                                 return;
                             }
                             selectProject = new Project(file.getName(), file.getAbsolutePath(), type);
-                            new ProjectManager(selectProject).createScript(HomeActivity.this);
                         }
                         dialog.dismiss();
                         runOnUiThread(() -> {
@@ -142,7 +140,6 @@ public void onClick(View v) {
                     return;
                 }
                 selectProject = new Project(file.getName(), file.getAbsolutePath(), type);
-                new ProjectManager(selectProject).createScript(HomeActivity.this);
                 openProject(selectProject);
             });
         } else if (id == R.id.open_terminal) {

diff --git a/app/src/main/java/com/pangbai/weblog/activity/MainActivity.java b/app/src/main/java/com/pangbai/weblog/activity/MainActivity.java
@@ -25,7 +25,6 @@
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.navigation.NavigationView;
-import com.google.android.material.search.SearchView;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 
@@ -64,9 +63,7 @@
 
 import br.tiagohm.markdownview.MarkdownView;
 import br.tiagohm.markdownview.css.styles.Github;
-import io.github.rosemoe.sora.event.EventReceiver;
 import io.github.rosemoe.sora.event.PublishSearchResultEvent;
-import io.github.rosemoe.sora.event.Unsubscribe;
 import io.github.rosemoe.sora.text.Content;
 import io.github.rosemoe.sora.text.ContentIO;
 import io.github.rosemoe.sora.widget.EditorSearcher;
@@ -90,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         PrefManager.init(getApplicationContext());
         project = ProjectManager.getCurrentProject();
-        if (PrefManager.isFirstLaunch() || project == null || !new File(project.getProjectPath()).exists()) {
+        if (PrefManager.isFirstOrReinstall(this) || project == null || !new File(project.getProjectPath()).exists()) {
             util.startActivity(this, HomeActivity.class, false);
             finish();
             return;
@@ -202,14 +199,14 @@ void setLayout() {
 
             int id = item.getItemId();
             if (id == R.id.menu_run) {
-                File file = new File(project.scriptPath);
+                File file = new File(project.getScriptPath());
                 if (!file.exists()) return false;
                 DialogUtils.showMultiSelectDialog(this, getString(R.string.select_scripts), file.list(), selets -> {
                     binding.progressbar.setIndeterminate(true);
                     Snackbar.make(binding.getRoot(), "Excuting", Snackbar.LENGTH_SHORT).show();
 
                     ThreadUtil.thread(() -> {
-                        boolean cmd = cmdExer.executeScripts(selets, project.scriptPath, true) == 0;
+                        boolean cmd = cmdExer.executeScripts(selets, project.getScriptPath(), true) == 0;
                         runOnUiThread(() -> {
                             binding.progressbar.setIndeterminate(false);
                             if (cmd) {
@@ -415,7 +412,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
 
 
         } else if (id == R.id.project_script) {
-            new FileListSelect(this, getString(R.string.scripts_list), false, project.scriptPath, file -> {
+            new FileListSelect(this, getString(R.string.scripts_list), false, project.getScriptPath(), file -> {
                 setCodeText(file);
                 binding.drawerLayout.closeDrawer(GravityCompat.START);
             }).showChooseDialog();

diff --git a/app/src/main/java/com/pangbai/weblog/preference/PrefManager.java b/app/src/main/java/com/pangbai/weblog/preference/PrefManager.java
@@ -14,12 +14,14 @@ public enum Keys {
         category,
         current_project,
         current_file,
-        first_launch,
+        first_launch_mark,
         bl_interface_undo_button_display,
         bl_artical_title_to_md5
     }
 
     static SharedPreferences pref;
+    //1 for first installation , 2 for reinstalltation
+    public   static int isFirstOrReinstall_flag=0;
 
 
 
@@ -30,9 +32,13 @@ public static void init(Context context) {
 
     }
 
-    public static boolean isFirstLaunch() {
-        if (getBoolen(Keys.first_launch,true)) {
-            putBoolen(Keys.first_launch,false);
+    public static boolean isFirstOrReinstall(Context context) {
+        String mark= context.getApplicationInfo().nativeLibraryDir;
+        String defaults="defaults";
+        String marked=getString(Keys.first_launch_mark,defaults);
+        if (!mark.equals(marked)) {
+            putString(Keys.first_launch_mark,mark);
+            isFirstOrReinstall_flag=marked.equals(defaults)?1:2;
             return true;
         }
         return false;

diff --git a/app/src/main/java/com/pangbai/weblog/project/PostCreate.java b/app/src/main/java/com/pangbai/weblog/project/PostCreate.java
@@ -27,11 +27,11 @@ public void setParams(String title, String path, String category, String descrip
             File file = new File(path);
             if (file.exists()) return ;
             File dir = file.getParentFile();
-            if (!dir.exists()) dir.mkdirs();
+            if (!dir.exists())  dir.mkdirs();
             try {
                 file.createNewFile();
                 writer = new PrintWriter(new FileWriter(file), true);
-            } catch (Exception e) {
+            } catch (Exception ignored) {
             }
         }
 

diff --git a/app/src/main/java/com/pangbai/weblog/project/Project.java b/app/src/main/java/com/pangbai/weblog/project/Project.java
@@ -4,12 +4,13 @@
 import com.pangbai.weblog.execute.HexoExer;
 import com.pangbai.weblog.execute.HugoExer;
 import com.pangbai.weblog.project.ProjectManager;
+import com.pangbai.weblog.tool.Init;
 
 public class Project {
     String projectPath;
     String blogName;
   public   ProjectManager.Type blogType;
-  public  String scriptPath;
+  //public  String scriptPath;
   public BlogCmd blogCmd;
 
     public Project( String name,String path, ProjectManager.Type type) {
@@ -21,7 +22,7 @@ public Project( String name,String path, ProjectManager.Type type) {
         } else if (type== ProjectManager.Type.hugo) {
             blogCmd=new HugoExer(projectPath);
         }
-        scriptPath=projectPath+"/.scripts";
+    //    scriptPath=projectPath+"/.scripts";
     }
 
     public String getProjectPath() {
@@ -39,4 +40,7 @@ public String getBlogName() {
     public void setBlogName(String blogName) {
         this.blogName = blogName;
     }
+    public String getScriptPath(){
+        return Init.scriptsPath+blogType;
+    }
 }
diff --git a/app/src/main/java/com/pangbai/weblog/project/ProjectManager.java b/app/src/main/java/com/pangbai/weblog/project/ProjectManager.java
@@ -26,18 +26,19 @@ public ProjectManager(Project project) {
     }
 
 
+
     public boolean createProject() {
         boolean init = project.blogCmd.initBlog(project.projectPath);
         if (!init) return false;
         project.blogCmd.changeConfig("title", project.blogName);
         return true;
     }
 
-    public boolean createScript(Context context) {
+   /* public boolean createScript(Context context) {
         if (new File(project.scriptPath).exists()) return true;
         IO.copyAssetsDirToSDCard(context, "scripts/" + project.blogType.name(), project.scriptPath);
         return true;
-    }
+    }*/
 
     public static void saveCurrentProject(Project project) {
         String[] infor = new String[]{project.blogName, project.getProjectPath(), project.blogType.name()};

diff --git a/app/src/main/java/com/pangbai/weblog/tool/IO.java b/app/src/main/java/com/pangbai/weblog/tool/IO.java
@@ -40,6 +40,7 @@ public static void copyAssetsDirToSDCard(Context context, String assetsDirName,
                     fos.write(mByte, 0, bt);
                     // dealtByte+=bt;
                 }
+                fos.getFD().sync();
                 fos.flush();
                 inputStream.close();
                 fos.close();