Release v0.8

* Add the ability to include additional flashable zip files * Display information when clicking on version number
dosomder · Dec 6, 2014 · c5a8ab8 · c5a8ab8
1 parent e5a1a92
commit c5a8ab8
Show file tree

Hide file tree

Showing 7 changed files with 150 additions and 10 deletions.
diff --git a/PrerootedCreator/ExtraFiles.cs b/PrerootedCreator/ExtraFiles.cs
@@ -27,6 +27,27 @@ public static void AddExtraFiles(BackgroundWorker worker, string name, string ft
             }
         }
 
+        public static void AddExtraFlashable(BackgroundWorker worker, string filename, string ftffile)
+        {
+            Logger.WriteLog("Adding flashable zip: " + Path.GetFileName(filename));
+            string fixedname = Path.GetFileName(filename).Replace(' ', '_');
+
+            string cmd = "\n# " + fixedname + "\n" +
+                "if\n" +
+                "\tpackage_extract_file(\"" + fixedname + "\", \"/tmp/" + fixedname + "\") == \"t\"\n" +
+                "then\n" +
+                "\trun_program(\"/tmp/busybox\", \"mkdir\", \"/tmp/" + Path.GetFileNameWithoutExtension(fixedname) + "_extracted" + "\");\n" +
+                "\trun_program(\"/tmp/busybox\", \"unzip\", \"-d\", \"/tmp/" + Path.GetFileNameWithoutExtension(fixedname) + "_extracted" + "\", \"/tmp/" + fixedname + "\");\n" +
+                "\tset_perm(0, 0, 0755, \"/tmp/" + Path.GetFileNameWithoutExtension(fixedname) + "_extracted" + "/META-INF/com/google/android/update-binary\");\n" +
+                "\trun_program(\"/tmp/" + Path.GetFileNameWithoutExtension(fixedname) + "_extracted" + "/META-INF/com/google/android/update-binary\", file_getprop(\"/tmp/prfargs\", \"version\"), file_getprop(\"/tmp/prfargs\", \"outfile\"), \"/tmp/" + fixedname + "\");\n" +
+                "\tdelete_recursive(\"/tmp/" + Path.GetFileNameWithoutExtension(fixedname) + "_extracted" + "\");\n" +
+                "\tdelete(\"/tmp/" + fixedname + "\");\n" +
+                "endif;\n" +
+                "#InsertExtra\n";
+            Utility.EditScript(worker, "#InsertExtra", cmd);
+            Zipping.AddToZip(worker, "flashable.zip", filename, fixedname, false);
+        }
+
         private static void AddKernel(BackgroundWorker worker, string ftffile)
         {
             ExtractAndAdd(worker, "kernel", ".elf", ftffile, "boot");
@@ -76,7 +97,6 @@ private static void ExtractAndAdd(BackgroundWorker worker, string name, string e
             Zipping.UnzipFile(worker, ftffile, name + ".sin", string.Empty, System.IO.Path.GetTempPath(), false);
             if (File.Exists(System.IO.Path.GetTempPath() + "\\" + name + ".sin"))
             {
-                //Logger.WriteLog("Adding " + name + " to zip");
                 Logger.WriteLog("   " + name);
                 SinExtract.ExtractSin(worker, System.IO.Path.GetTempPath() + "\\" + name + ".sin", System.IO.Path.GetTempPath() + "\\" + name + extension, false);
 

diff --git a/PrerootedCreator/Form1.Designer.cs b/PrerootedCreator/Form1.Designer.cs
diff --git a/PrerootedCreator/Form1.cs b/PrerootedCreator/Form1.cs
@@ -18,7 +18,7 @@ public Form1()
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            version_label.Text = "v0.7";
+            version_label.Text = "v0.8";
             openFileDialog1.FileName = string.Empty;
             openFileDialog1.Multiselect = false;
 
@@ -53,6 +53,12 @@ private void su_button_Click(object sender, EventArgs e)
             openFileDialog1.FileName = string.Empty;
         }
 
+        private void versionlbl_Click(object sender, EventArgs e)
+        {
+            MessageBox.Show("PRFCreator " + version_label.Text + "\n\nCreated by zxz0O0\nThanks to Androxyde, [NUT], E:V:A and dotnetzip developers\n" +
+                "See xda-developers.com for more informations", "PRFCreator");
+        }
+
         private void create_button_Click(object sender, EventArgs e)
         {
             if (isWorking)
@@ -116,6 +122,14 @@ public void ControlsEnabled(bool Enabled)
                 options_checklist.Invoke(new MethodInvoker(delegate { options_checklist.Enabled = Enabled; }));
             else
                 options_checklist.Enabled = Enabled;
+            if (add_extra_button.InvokeRequired)
+                add_extra_button.Invoke(new MethodInvoker(delegate { add_extra_button.Enabled = Enabled; }));
+            else
+                add_extra_button.Enabled = Enabled;
+            if (remove_extra_button.InvokeRequired)
+                remove_extra_button.Invoke(new MethodInvoker(delegate { remove_extra_button.Enabled = Enabled; }));
+            else
+                remove_extra_button.Enabled = Enabled;
         }
 
         private void dr_button_Click(object sender, EventArgs e)
@@ -131,5 +145,29 @@ private void dr_button_Click(object sender, EventArgs e)
             rec_textbox.Text = openFileDialog1.FileName;
             openFileDialog1.FileName = string.Empty;
         }
+
+        private void add_extra_button_Click(object sender, EventArgs e)
+        {
+            if (isWorking)
+                return;
+
+            openFileDialog1.Filter = "Zip Files|*.zip|All files|*";
+            DialogResult result = openFileDialog1.ShowDialog();
+            if (result != DialogResult.OK)
+                return;
+
+            if (!extra_listbox.Items.Contains(openFileDialog1.FileName))
+                extra_listbox.Items.Add(openFileDialog1.FileName);
+
+            openFileDialog1.FileName = string.Empty;
+        }
+
+        private void remove_extra_button_Click(object sender, EventArgs e)
+        {
+            if (isWorking)
+                return;
+
+            extra_listbox.Items.Remove(extra_listbox.SelectedItem);
+        }
     }
 }
diff --git a/PrerootedCreator/Job.cs b/PrerootedCreator/Job.cs
@@ -29,11 +29,13 @@ private static int GetJobCount()
                 count--;
             if (!File.Exists(form.rec_textbox.Text)) //if recovery is not included
                 count--;
+            if (form.extra_listbox.Items.Count < 1) //no additional zip files
+                count--;
 
             return count;
         }
 
-        private static Action<BackgroundWorker>[] jobs = { UnpackSystem, UnpackSystemEXT4, EditScript, AddSystem, AddExtras, AddSuperSU, AddRecovery, SignZip, Complete };
+        private static Action<BackgroundWorker>[] jobs = { UnpackSystem, UnpackSystemEXT4, EditScript, AddSystem, AddExtras, AddSuperSU, AddRecovery, AddExtraFlashable, SignZip, Complete };
         public static void Worker()
         {
             JobNum = 0;
@@ -130,6 +132,16 @@ private static void AddExtras(BackgroundWorker worker)
                 ExtraFiles.AddExtraFiles(worker, item.ToLower(), form.ftf_textbox.Text);
         }
 
+        private static void AddExtraFlashable(BackgroundWorker worker)
+        {
+            if (form.extra_listbox.Items.Count < 1)
+                return;
+
+            SetJobNum(++JobNum);
+            foreach (string file in form.extra_listbox.Items)
+                ExtraFiles.AddExtraFlashable(worker, file, form.ftf_textbox.Text);
+        }
+
         private static void AddSuperSU(BackgroundWorker worker)
         {
             SetJobNum(++JobNum);

diff --git a/PrerootedCreator/Resources/flashable.zip b/PrerootedCreator/Resources/flashable.zip
diff --git a/flashable.zip-files/META-INF/com/google/android/updater-script-names b/flashable.zip-files/META-INF/com/google/android/updater-script-names
@@ -142,3 +142,6 @@ then
 	delete_recursive("/tmp/dualrecovery_extracted");
 	delete("/tmp/dualrecovery.zip");
 endif;
+
+# ===================== Extra Flashable =====================
+#InsertExtra
diff --git a/flashable.zip-files/META-INF/com/google/android/updater-script-uuid b/flashable.zip-files/META-INF/com/google/android/updater-script-uuid
@@ -141,3 +141,6 @@ then
 	delete_recursive("/tmp/dualrecovery_extracted");
 	delete("/tmp/dualrecovery.zip");
 endif;
+
+# ===================== Extra Flashable =====================
+#InsertExtra