clean utf8 truncated .torrent and .resume file-names (if desired).

ref:transmission/transmission#122 a7a259a
cfpp2p · Jul 26, 2017 · 5b7532f · 5b7532f
1 parent 5e660ae
commit 5b7532f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c
@@ -41,10 +41,11 @@
 
 
 char*
-tr_metainfoGetBasename( const tr_info * inf )
+tr_metainfoGetBasename( const tr_info * inf, const tr_session * session )
 {
     size_t i;
     char * shortName;
+    char * cleanName;
 
     if( !strlen( inf->name ) )
         // allow empty name -- substitute
@@ -55,11 +56,17 @@ tr_metainfoGetBasename( const tr_info * inf )
         // truncate
         shortName = tr_strndup( inf->name, MAX_NAME_LENGTH );
 
-    char * ret = tr_strdup_printf( "%s.%16.16s", shortName, inf->hashString );
-
-    const size_t name_len = strlen( shortName );
+    if( session && session->cleanUTFenabled )
+        cleanName = tr_utf8clean( shortName, -1 );
+    else
+        cleanName = tr_strdup( shortName );
     tr_free( shortName );
 
+    char * ret = tr_strdup_printf( "%s.%16.16s", cleanName, inf->hashString );
+
+    const size_t name_len = strlen( cleanName );
+    tr_free( cleanName );
+
     for( i=0; i<name_len; ++i )
         if( ret[i] == '/' )
             ret[i] = '_';
@@ -71,7 +78,7 @@ tr_metainfoGetBasename( const tr_info * inf )
 static char*
 getTorrentFilename( const tr_session * session, const tr_info * inf )
 {
-    char * base = tr_metainfoGetBasename( inf );
+    char * base = tr_metainfoGetBasename( inf, session );
     char * filename = tr_strdup_printf( "%s" TR_PATH_DELIMITER_STR "%s.torrent",
                                         tr_getTorrentDir( session ), base );
     tr_free( base );

diff --git a/libtransmission/metainfo.h b/libtransmission/metainfo.h
@@ -33,7 +33,7 @@ void tr_metainfoRemoveSaved( const tr_session * session,
 void tr_metainfoMigrate( tr_session * session,
                          tr_info    * inf );
 
-char* tr_metainfoGetBasename( const tr_info * );
+char* tr_metainfoGetBasename( const tr_info * baseName, const tr_session * session );
 
 
 #endif
diff --git a/libtransmission/resume.c b/libtransmission/resume.c
@@ -82,7 +82,7 @@ enum
 static char*
 getResumeFilename( const tr_torrent * tor )
 {
-    char * base = tr_metainfoGetBasename( tr_torrentInfo( tor ) );
+    char * base = tr_metainfoGetBasename( tr_torrentInfo( tor ), tor->session );
     char * filename = tr_strdup_printf( "%s" TR_PATH_DELIMITER_STR "%s.resume",
                                         tr_getResumeDir( tor->session ), base );
     tr_free( base );

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
@@ -1036,7 +1036,7 @@ torrentInit( tr_torrent * tor, const tr_ctor * ctor )
     if( tr_sessionIsIncompleteDirEnabled( session ) )
         tor->incompleteDir = tr_strdup( dir );
 
-    s = tr_metainfoGetBasename( &tor->info );
+    s = tr_metainfoGetBasename( &tor->info, session );
     tor->pieceTempDir = tr_buildPath( tr_sessionGetPieceTempDir( tor->session ), s, NULL );
     tr_free( s );