bump to 1.7.1

-Made EncryptionManager a static class
-Made RipperBase an abstract class
-Fixed a fatal crash bug with downloadGenericAssets
-Fixed a bug with the downloading of BGs
-downloadGenericAssets now has a saveFolder param
-CompositeBG thumbs now download using downloadGenericAssets

Author: ItsJayPM

GoAnimateRipper2/Managers/AssetManager.cs

@@ -12,7 +12,6 @@ namespace GoAnimateRipper2
     public class AssetManager
     {
         MainControl mainControl;
-        EncryptionManager encryptionManager = new EncryptionManager();
         HttpClient httpClient = new HttpClient();
 
         List<string> pathes = new List<string>();
@@ -85,26 +84,26 @@ public async Task<bool> DownloadAsset(string path, bool isSupposedToHaveEncrypti
                 }
                 var data = await response.Content.ReadAsByteArrayAsync();
                 bool keySuccessfullyMatched = true;
-                bool isFileEncrypted = !encryptionManager.IsFlashPrefix(data);
+                bool isFileEncrypted = !EncryptionManager.IsFlashPrefix(data);
                 // If it's a SWF, deal with encryption jargon.
                 if (isSwf)
                 {
 
                     // If auto mode, try and figure out the key.
                     if (isSupposedToHaveEncryption && autoMode)
                     {
-                        key = encryptionManager.DetermineKey(data);
+                        key = EncryptionManager.DetermineKey(data);
                         if (key == null) keySuccessfullyMatched = false;
                     }
                     // If the key was found, decrypt. If it isn't auto mode, it will always work.
                     if (isSupposedToHaveEncryption && mainControl.doDecryption && keySuccessfullyMatched)
                     {
-                        data = encryptionManager.Decrypt(key, data);
+                        data = EncryptionManager.Decrypt(key, data);
                     }
                     // If re-encrypt is checked and everything succeeded (or a specific edge case occured where auto mode was on and the file was supposed to be encrypted but wasn't), do re-encryption.
                     if (mainControl.doReEncryption && isSupposedToHaveEncryption && (keySuccessfullyMatched || !isFileEncrypted))
                     {
-                        data = encryptionManager.Decrypt(Encoding.ASCII.GetBytes(mainControl.reEncryptionKey), data);
+                        data = EncryptionManager.Decrypt(Encoding.ASCII.GetBytes(mainControl.reEncryptionKey), data);
                     }
                 }
 

GoAnimateRipper2/Managers/EncryptionManager.cs

@@ -14,13 +14,8 @@ internal class EncryptionManager
             "g0o1a2n3i4m5a6t7e",
             "(auto)"
         };
-       public EncryptionManager() 
-        { 
-            // Anything to put here?
-            // I don't think you need to pass anything to this class tbh ...
-        }
 
-        public byte[] Decrypt(byte[] pwd, byte[] data)
+        static public byte[] Decrypt(byte[] pwd, byte[] data)
         {
             int a, i, j, k, tmp;
             int[] key, box;
@@ -61,7 +56,7 @@ public byte[] Decrypt(byte[] pwd, byte[] data)
         /// <summary>
         /// bool <c>IsFlashPrefix</c> returns if byte[] <c>data</c> has a valid SWF header.
         /// </summary>
-        public bool IsFlashPrefix(byte[] data)
+        static public bool IsFlashPrefix(byte[] data)
         {
             string prefix = Encoding.UTF8.GetString(data).Substring(0, 3);
             return prefix == "CWS" || prefix == "FWS";
@@ -70,7 +65,7 @@ public bool IsFlashPrefix(byte[] data)
         /// <summary>
         /// bool <c>DetermineKey</c> tries to determine the key. It returns true if it succeeds.
         /// </summary>
-        public byte[] DetermineKey(byte[] data)
+        static public byte[] DetermineKey(byte[] data)
         {
             if (!IsFlashPrefix(data))
             {

GoAnimateRipper2/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyVersion("1.7.1")]
 [assembly: AssemblyFileVersion("1.0")]

GoAnimateRipper2/Rippers/RipperBase.cs

@@ -10,7 +10,7 @@
 
 namespace GoAnimateRipper2
 {
-    public class RipperBase
+    public abstract class RipperBase
     {
         public MainControl mainControl;
         public AssetManager assetManager;
@@ -75,11 +75,8 @@ public void endRipper()
         }
 
         /// <summary>
-        /// void <c>StartRip</c> starts the ripper; Template function.
+        /// public abstract Task <c>StartRip</c> starts the ripper; Abstract function.
         /// </summary>
-        public virtual async Task StartRip()
-        {
-            // Bla
-        }
+        public abstract Task StartRip();
     }
 }

GoAnimateRipper2/Rippers/StandardRipper.cs

@@ -21,17 +21,21 @@ public StandardRipper(MainControl mainControl, string themeId) : base(mainContro
         /// Task <c>downloadGenericAssets</c> downloads assets that get generic and predictable types of assets.
         /// 
         /// </summary>
-        public async Task downloadGenericAssets(String elm, String targetProperty, String acceptFormat = null)
+        public async Task downloadGenericAssets(String elm, String targetProperty, String acceptFormat = null, String saveFolder = null)
         {
+            if (saveFolder == null)
+            {
+                saveFolder = elm;
+            }
             var elements = xmlDoc.Elements(elm);
             mainControl.setProgressBarMaximum(elements.Count());
             mainControl.resetProgressBar();
             foreach (var element in elements)
             {
                 var elementId = element.Attributes().Where(a => a.Name == targetProperty).Single().Value;
-                if (elementId.Contains(acceptFormat) || acceptFormat == null)
+                if (acceptFormat == null || elementId.Contains(acceptFormat))
                 {
-                    fileLocation = $"{themeId}\\{elm}\\{elementId}";
+                    fileLocation = $"{themeId}\\{saveFolder}\\{elementId}";
                     downloadSuccess = await assetManager.DownloadAsset(fileLocation, mainControl.doDecryption);
                     if (downloadSuccess) mainControl.writeMessage($"Downloaded {elm} '{elementId}'.");
                 }
@@ -79,7 +83,7 @@ public override async Task StartRip()
 
 
                 await downloadGenericAssets("effect","id",".swf");
-                await downloadGenericAssets("background", "id");
+                await downloadGenericAssets("background","id",null,"bg");
 
                 var chars = xmlDoc.Elements("char");
                 mainControl.setProgressBarMaximum(chars.Count());
@@ -191,18 +195,7 @@ public override async Task StartRip()
 
             if (!mainControl.skipNonFlash)
             {
-                var backgroundsthumb = xmlDoc.Elements("compositebg");
-                mainControl.setProgressBarMaximum(backgroundsthumb.Count());
-                mainControl.resetProgressBar();
-                foreach (var compositebg in backgroundsthumb)
-                {
-                    var bgThumb = compositebg.Attributes().Where(a => a.Name == "thumb").Single().Value;
-                    fileLocation = $"{themeId}\\bg\\{bgThumb}";
-
-                    await assetManager.DownloadAsset(fileLocation, false);
-                    if (downloadSuccess) mainControl.writeMessage($"Downloaded background thumbnail '{bgThumb}'.");
-                    mainControl.incrementProgressBar();
-                }
+                await downloadGenericAssets("compositebg", "thumb", null, "bg");
 
                 var starters = xmlDoc.Elements("starter");
                 mainControl.setProgressBarMaximum(starters.Count());